svn commit: r816864 - in /ofbiz/branches/release09.04: ./ applications/content/src/org/ofbiz/content/openoffice/OpenOfficeServices.java

Author: jleroux
Date: Sat Sep 19 07:21:54 2009
New Revision: 816864

URL: http://svn.apache.org/viewvc?rev=816864&view=rev
Log:
"Applied fix from trunk for revision: 816863  "
------------------------------------------------------------------------
r816863 | jleroux | 2009-09-19 09:18:21 +0200 (sam. 19 sept. 2009) | 4 lignes

A patch from Wickersheimer Jeremy "compilation error with uno libs" (https://issues.apache.org/jira/browse/OFBIZ-2940) - OFBIZ-2940
The OpenOfficeServices.java does not build due to some errors after the ByteWrapper refactoring.
Since it is an optional package and not built by default it got unnoticed.

------------------------------------------------------------------------


Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeServices.java

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 19 07:21:54 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810
 832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810
 832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863

Modified: ofbiz/branches/release09.04/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeServices.java?rev=816864&r1=816863&r2=816864&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeServices.java (original)
+++ ofbiz/branches/release09.04/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeServices.java Sat Sep 19 07:21:54 2009
@@ -91,7 +91,7 @@
 
         try {
             xmulticomponentfactory = OpenOfficeWorker.getRemoteServer(oooHost, oooPort);
-            byte[] inByteArray = inByteBuffer.getBytes();
+            byte[] inByteArray = inByteBuffer.array();
 
             // The following line work in linux, but not Windows or Mac environment. It is preferred because it does not use temporary files
             //OpenOfficeByteArrayInputStream oobais = new OpenOfficeByteArrayInputStream(inByteArray);
@@ -115,7 +115,7 @@
             }
             fis.close();
 
-            results.put("outByteBuffer", new ByteBuffer(baos.toByteArray()));
+            results.put("outByteBuffer", ByteBuffer.wrap(baos.toByteArray()));
             baos.close();
 
         } catch (MalformedURLException e) {