[ooo-build-commit] patches/dev300

[Petr Mladek]

 patches/dev300/build-java-1.4-qadevOOo.diff |   32 ++++++++++++++++------------
 1 file changed, 19 insertions(+), 13 deletions(-)

New commits:
commit 4787b2a7777e05ca76322f1082784ca95266cf33
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Oct 1 14:04:18 2009 +0200

    Update for dev300-m58
    
    * patches/dev300/build-java-1.4-qadevOOo.diff: updated for dev300-m58

diff --git a/patches/dev300/build-java-1.4-qadevOOo.diff b/patches/dev300/build-java-1.4-qadevOOo.diff
index 0c0a7cb..d62fb94 100644
--- a/patches/dev300/build-java-1.4-qadevOOo.diff
+++ b/patches/dev300/build-java-1.4-qadevOOo.diff
@@ -6,9 +6,9 @@
  
 -        final ArrayList<String> moduleNames = new ArrayList<String>();
 +        final ArrayList moduleNames = new ArrayList();
-         boolean start = false;
-         for (int i = 0; i < outs.length; i++) {
-             final String line = outs[i];
+         boolean bStart = false;
+         for (int i = 0; i < outs.length; i++)
+         {
 --- qadevOOo/runner/util/DesktopTools.java.old	2009-02-12 14:55:56.000000000 +0100
 +++ qadevOOo/runner/util/DesktopTools.java	2009-02-17 17:30:22.000000000 +0100
 @@ -411,7 +411,6 @@ public class DesktopTools {
@@ -16,9 +16,9 @@
       * @deprecated
       */
 -    @Deprecated
-     public static void bringWindowToFromt(XModel xModel){    
+     public static void bringWindowToFromt(XModel xModel)
+     {
          bringWindowToFront(xModel);
-     }
 --- qadevOOo/runner/graphical/JPEGComparator.java.old	2009-02-18 11:59:04.000000000 +0100
 +++ qadevOOo/runner/graphical/JPEGComparator.java	2009-02-18 12:22:16.000000000 +0100
 @@ -185,7 +185,7 @@ public class JPEGComparator extends Enha
@@ -47,29 +47,35 @@
  
 --- qadevOOo/runner/helper/OfficeProvider.java.old	2009-02-12 14:55:56.000000000 +0100
 +++ qadevOOo/runner/helper/OfficeProvider.java	2009-02-18 11:55:52.000000000 +0100
-@@ -416,13 +416,15 @@ public class OfficeProvider implements A
-         if (msf != null) {
+@@ -416,16 +416,18 @@ public class OfficeProvider implements A
+         {
              
              // disable QuickStarter
--            try {
+-            try
+-            {
 -                Object quickStarter = msf.createInstance("com.sun.star.office.Quickstart");
 -                XFastPropertySet fps = (XFastPropertySet) UnoRuntime.queryInterface(XFastPropertySet.class, quickStarter);
 -                fps.setFastPropertyValue(0, false);
--            } catch (com.sun.star.uno.Exception ex) {
+-            }
+-            catch (com.sun.star.uno.Exception ex)
+-            {
 -                dbg("ERROR: Could not disable QuickStarter: " + ex.toString());
 -            }
 +            // can't be compiled with Sun Java 1.4
 +            // anyway, we do not have enabled the quickstarter by default
-+//            try {
++//            try
++//            {
 +//                Object quickStarter = msf.createInstance("com.sun.star.office.Quickstart");
 +//                XFastPropertySet fps = (XFastPropertySet) UnoRuntime.queryInterface(XFastPropertySet.class, quickStarter);
 +//                fps.setFastPropertyValue(0, false);
-+//            } catch (com.sun.star.uno.Exception ex) {
++//            }
++//            catch (com.sun.star.uno.Exception ex)
++//            {
 +//                dbg("ERROR: Could not disable QuickStarter: " + ex.toString());
 +//            }
              
-             try {
-                 desk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class,
+             try
+             {
 --- qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java.old	2009-02-12 14:55:51.000000000 +0100
 +++ qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java	2009-02-18 12:10:23.000000000 +0100
 @@ -298,7 +298,10 @@ public class OQueryDesign extends TestCa