[ooo-build-commit] .: 5 commits - bin/unpack distro-configs/SUSE-10.1.conf.in patches/dev300

Petr Mladek pmladek at kemper.freedesktop.org
Wed Sep 8 05:44:42 PDT 2010


 bin/unpack                                       |    4 
 distro-configs/SUSE-10.1.conf.in                 |    1 
 patches/dev300/apply                             |    7 
 patches/dev300/build-java-1.4-accessibility.diff |   26 
 patches/dev300/build-java-1.4-qadevOOo.diff      | 1278 +++++++++++++++++++++-
 patches/dev300/build-java-1.4-wizards.diff       | 1311 ++++++++++++++++++-----
 patches/dev300/canvas-build-cairo-1.0.diff       |   19 
 patches/dev300/libxmlsec-system-nss.diff         |   16 
 8 files changed, 2348 insertions(+), 314 deletions(-)

New commits:
commit bbc382d55113507d7872e7949c13b8829ba2aa55
Author: Petr Mladek <pmladek at walk.suse.cz>
Date:   Wed Sep 8 14:43:59 2010 +0200

    Fix build with cairo-1.0.2 on SLED10

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5fff610..05d7634 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -70,7 +70,7 @@ SUSE-9.1  : NovellBase
 SUSE-9.2  : NovellBase
 SUSE-9.3  : NovellBase
 SUSE-10.0 : NovellBase
-SUSE-10.1 : NovellBase, BerkeleyDB43, EMFPlus, Java14, BrokenSystemNSS, SUSE101
+SUSE-10.1 : NovellBase, BerkeleyDB43, EMFPlus, Java14, BrokenSystemNSS, Cairo10, SUSE101
 SUSE-10.2 : NovellBase, BerkeleyDB43, EMFPlus, Java14, OpenGLTransitionsMesa703
 SUSE-10.3 : NovellBase, BerkeleyDB43, EMFPlus, Java14, GCC41
 SUSE-11.0 : NovellBase, BerkeleyDB43, EMFPlus, PostgreSQL
@@ -374,6 +374,10 @@ svx-ppt-tablerow-height-fix.diff, n#483951, i#100275, thorsten
 # set border treatment for cairocanvas correctly
 canvas-cairopattern.diff, n#629546, thorsten
 
+[ Cairo10 ]
+# CAIRO_EXTEND_PAD is not available in cairo-1.0.2
+canvas-build-cairo-1.0.diff, i#123456, pmladek
+
 [ NovellOnlyExtensionFixes ]
 # allow build with ant-1.6
 # IMPORTANT: the second part of the patch is build-ant-1.6.diff
diff --git a/patches/dev300/canvas-build-cairo-1.0.diff b/patches/dev300/canvas-build-cairo-1.0.diff
new file mode 100644
index 0000000..8b1f7d7
--- /dev/null
+++ b/patches/dev300/canvas-build-cairo-1.0.diff
@@ -0,0 +1,19 @@
+--- canvas/source/cairo/cairo_canvashelper.cxx.old	2010-09-06 15:29:06.000000000 +0200
++++ canvas/source/cairo/cairo_canvashelper.cxx	2010-09-07 20:26:02.000000000 +0200
+@@ -787,7 +787,7 @@ namespace cairocanvas
+             else if ( aTexture.RepeatModeX == rendering::TexturingMode::CLAMP &&
+                       aTexture.RepeatModeY == rendering::TexturingMode::CLAMP )
+             {
+-                cairo_pattern_set_extend( pPattern, CAIRO_EXTEND_PAD );
++                cairo_pattern_set_extend( pPattern, CAIRO_EXTEND_NONE );
+             }
+ 
+             aScaledTextureMatrix.x0 = basegfx::fround( aScaledTextureMatrix.x0 );
+@@ -1395,7 +1395,6 @@ namespace cairocanvas
+                 ::rtl::math::approxEqual( aMatrix.x0, 0 ) &&
+                 ::rtl::math::approxEqual( aMatrix.y0, 0 ) )
+                  cairo_set_operator( mpCairo.get(), CAIRO_OPERATOR_SOURCE );
+-            cairo_pattern_set_extend( cairo_get_source(mpCairo.get()), CAIRO_EXTEND_PAD );
+             cairo_rectangle( mpCairo.get(), 0, 0, aBitmapSize.Width, aBitmapSize.Height );
+             cairo_clip( mpCairo.get() );
+ 
commit 0df334f0af29f940d73b0fae683e0d778239fc92
Author: Petr Mladek <pmladek at walk.suse.cz>
Date:   Wed Sep 8 14:39:23 2010 +0200

    Fix accessibility, qadevOOo, and wizards build with java-1.4

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a4c059d..5fff610 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1066,6 +1066,7 @@ build-java-1.4-filter.diff, i#12345, pmladek
 # various build fixes for Sun Java 1.4; can't go upstream
 build-java-1.4-qadevOOo.diff, i#12345, pmladek
 build-java-1.4-wizards.diff, i#12345, pmladek
+build-java-1.4-accessibility.diff, i#12345, pmladek
 # Sun Java 1.4 does not know the -Xbootclasspath option, will not go upstream
 build-java-1.4-no-Xbootclasspath.diff, i#12345, pmladek
 # the new declaration was supported only by Java 1.5, see i#102469
diff --git a/patches/dev300/build-java-1.4-accessibility.diff b/patches/dev300/build-java-1.4-accessibility.diff
new file mode 100644
index 0000000..89ddfb2
--- /dev/null
+++ b/patches/dev300/build-java-1.4-accessibility.diff
@@ -0,0 +1,26 @@
+--- accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityNode.java.old	2010-08-25 22:34:06.000000000 +0200
++++ accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityNode.java	2010-09-07 20:15:45.000000000 +0200
+@@ -75,7 +75,7 @@ class AccessibilityNode extends DefaultM
+         if (xAccessibleContext != null) {
+             try {
+                 XAccessibleEventBroadcaster xAccessibleEventBroadcaster = 
+-                    UnoRuntime.queryInterface( XAccessibleEventBroadcaster.class, xAccessibleContext );
++                    (XAccessibleEventBroadcaster) UnoRuntime.queryInterface( XAccessibleEventBroadcaster.class, xAccessibleContext );
+                 if (xAccessibleEventBroadcaster != null) {
+                     if (attach) {
+                         xAccessibleEventBroadcaster.addEventListener(this);
+@@ -134,12 +134,12 @@ class AccessibilityNode extends DefaultM
+     
+     public void notifyEvent(AccessibleEventObject accessibleEventObject) {
+         if (accessibleEventObject.EventId == AccessibleEventId.CHILD) {
+-            XAccessible xAccessible = UnoRuntime.queryInterface( XAccessible.class, accessibleEventObject.OldValue );
++            XAccessible xAccessible = (XAccessible) UnoRuntime.queryInterface( XAccessible.class, accessibleEventObject.OldValue );
+             if (xAccessible != null) {
+                 handleChildRemoved(xAccessible);
+             }
+ 
+-            xAccessible = UnoRuntime.queryInterface( XAccessible.class, accessibleEventObject.NewValue );
++            xAccessible = (XAccessible) UnoRuntime.queryInterface( XAccessible.class, accessibleEventObject.NewValue );
+             if (xAccessible != null) {
+                 handleChildAdded(xAccessible);
+             }
diff --git a/patches/dev300/build-java-1.4-qadevOOo.diff b/patches/dev300/build-java-1.4-qadevOOo.diff
index bfcbdc7..840cb23 100644
--- a/patches/dev300/build-java-1.4-qadevOOo.diff
+++ b/patches/dev300/build-java-1.4-qadevOOo.diff
@@ -1,27 +1,292 @@
---- qadevOOo/runner/helper/CwsDataExchangeImpl.java.old	2009-02-12 14:55:56.000000000 +0100
-+++ qadevOOo/runner/helper/CwsDataExchangeImpl.java	2009-02-17 17:37:53.000000000 +0100
-@@ -78,7 +78,7 @@ public class CwsDataExchangeImpl impleme
+diff -purN qadevOOo.old/runner/convwatch/OfficePrint.java qadevOOo/runner/convwatch/OfficePrint.java
+--- qadevOOo.old/runner/convwatch/OfficePrint.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/runner/convwatch/OfficePrint.java	2010-09-07 13:52:50.000000000 +0200
+@@ -118,7 +118,7 @@ public class OfficePrint {
+      */
+     static String getDocumentType( XComponent _aDoc )
+         {
+-            XModel xModel =  UnoRuntime.queryInterface( XModel.class, _aDoc);
++            XModel xModel =  (XModel) UnoRuntime.queryInterface( XModel.class, _aDoc);
+             PropertyValue[] aArgs = xModel.getArgs();
+             for (int i=0;i<aArgs.length;i++)
+             {
+@@ -161,7 +161,7 @@ public class OfficePrint {
+                     return null;
+                 }
+                 Object oDsk = _aGTA.getMultiServiceFactory().createInstance("com.sun.star.frame.Desktop");
+-                XDesktop aDesktop = UnoRuntime.queryInterface(XDesktop.class, oDsk);
++                XDesktop aDesktop = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, oDsk);
+                 
+                 if (aDesktop != null)
+                 {
+@@ -175,7 +175,7 @@ public class OfficePrint {
+                     // set here the loadComponentFromURL() properties
+                     // at the moment only 'Hidden' is set, so no window is opened at work
  
-         final String[] outs = procHdl.getOutputText().split("\n");
+-                    ArrayList<PropertyValue> aPropertyList = new ArrayList<PropertyValue>();
++                    ArrayList aPropertyList = new ArrayList();
  
--        final ArrayList<String> moduleNames = new ArrayList<String>();
-+        final ArrayList moduleNames = new ArrayList();
-         boolean bStart = false;
-         for (int i = 0; i < outs.length; i++)
+                     // check which properties should set and count it.
+                     // if (_aGTA.isHidden())
+@@ -212,7 +212,7 @@ public class OfficePrint {
+                     GlobalLogWriter.get().println(DateHelper.getDateTimeForHumanreadableLog() + " Load document");
+                     // GlobalLogWriter.get().flush();
+                     
+-                    XComponentLoader aCompLoader = UnoRuntime.queryInterface( XComponentLoader.class, aDesktop);
++                    XComponentLoader aCompLoader = (XComponentLoader) UnoRuntime.queryInterface( XComponentLoader.class, aDesktop);
+                     
+                     // XComponent aDoc = null;
+ 
+@@ -254,11 +254,11 @@ public class OfficePrint {
+     static boolean exportToPDF(XComponent _xComponent, String _sDestinationName)
          {
---- 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 {
-      * @param xModel
-      * @deprecated
+             XServiceInfo xServiceInfo =
+-                 UnoRuntime.queryInterface(
++                 (XServiceInfo) UnoRuntime.queryInterface(
+                     XServiceInfo.class, _xComponent
+                     );
+             
+-            ArrayList<PropertyValue> aPropertyList = new ArrayList<PropertyValue>();
++            ArrayList aPropertyList = new ArrayList();
+             PropertyValue aFiltername = new PropertyValue();
+             aFiltername.Name = "FilterName";
+             aFiltername.Value = getFilterName_forPDF(xServiceInfo);
+@@ -269,7 +269,7 @@ public class OfficePrint {
+             try
+             {
+                 XStorable store =
+-                     UnoRuntime.queryInterface(
++                     (XStorable) UnoRuntime.queryInterface(
+                         XStorable.class, _xComponent
+                         );
+                 store.storeToURL(_sDestinationName, PropertyHelper.createPropertyValueArrayFormArrayList(aPropertyList));
+@@ -539,7 +539,7 @@ public class OfficePrint {
+                     if (_aGTA.isStoreAllowed())
+                     {
+                         // store the document in an other directory
+-                        XStorable aStorable = UnoRuntime.queryInterface( XStorable.class, _aDoc);
++                        XStorable aStorable = (XStorable) UnoRuntime.queryInterface( XStorable.class, _aDoc);
+                         if (aStorable != null)
+                         {
+                             PropertyValue [] szEmptyArgs = new PropertyValue [0];
+@@ -578,7 +578,7 @@ public class OfficePrint {
+                 // Change Pagesettings to DIN A4
+                 
+                 GlobalLogWriter.get().println(DateHelper.getDateTimeForHumanreadableLog() + " Print document.");
+-                XPrintable aPrintable =  UnoRuntime.queryInterface( XPrintable.class, _aDoc);
++                XPrintable aPrintable = (XPrintable) UnoRuntime.queryInterface( XPrintable.class, _aDoc);
+                 if (aPrintable != null)
+                 {
+                     // System.out.println("  Set PaperFormat to DIN A4");
+@@ -602,7 +602,7 @@ public class OfficePrint {
+                     {
+                         if (_aGTA.getPrinterName() != null)
+                         {
+-                            ArrayList<PropertyValue> aPropertyList = new ArrayList<PropertyValue>();
++                            ArrayList aPropertyList = new ArrayList();
+                             // PropertyValue [] aPrintProps = new PropertyValue[1];
+                             PropertyValue Arg = new PropertyValue();
+                             Arg.Name = "Name";
+@@ -626,20 +626,20 @@ public class OfficePrint {
+                     // int nPropsCount = 0;
+                     
+                     // If we are a SpreadSheet (calc), we need to set PrintAllSheets property to 'true'
+-                    XServiceInfo xServiceInfo = UnoRuntime.queryInterface( XServiceInfo.class, _aDoc );
++                    XServiceInfo xServiceInfo = (XServiceInfo) UnoRuntime.queryInterface( XServiceInfo.class, _aDoc );
+                     if ( xServiceInfo.supportsService( "com.sun.star.sheet.SpreadsheetDocument" ) )
+                     {
+                         XMultiServiceFactory xMSF = _aGTA.getMultiServiceFactory();
+                         Object aSettings = xMSF.createInstance( "com.sun.star.sheet.GlobalSheetSettings" );
+                         if (aSettings != null)
+                         {
+-                            XPropertySet xPropSet =  UnoRuntime.queryInterface( XPropertySet.class, aSettings );
++                            XPropertySet xPropSet = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, aSettings );
+                             xPropSet.setPropertyValue( "PrintAllSheets", new Boolean( true ) );
+                             GlobalLogWriter.get().println("PrintAllSheets := true");
+                         }
+                     }
+                     
+-                    ArrayList<PropertyValue> aPrintProps = new ArrayList<PropertyValue>();
++                    ArrayList aPrintProps = new ArrayList();
+                     // GlobalLogWriter.get().println("Property FileName:=" + _sPrintFileURL);
+ 
+                     // PropertyValue [] aPrintProps = new PropertyValue[nProperties];
+@@ -948,7 +948,7 @@ public class OfficePrint {
+             try
+             {
+                 Object oObj = _xMSF.createInstance("com.sun.star.document.TypeDetection");
+-                aTypeDetection = UnoRuntime.queryInterface(XTypeDetection.class, oObj);
++                aTypeDetection = (XTypeDetection) UnoRuntime.queryInterface(XTypeDetection.class, oObj);
+             }
+             catch(com.sun.star.uno.Exception e)
+             {
+@@ -990,7 +990,7 @@ public class OfficePrint {
+             }
+             if (aObj != null)
+             {
+-                XNameAccess aNameAccess = UnoRuntime.queryInterface(XNameAccess.class, aObj);
++                XNameAccess aNameAccess = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, aObj);
+                 if (aNameAccess != null)
+                 {
+                     
+@@ -1081,7 +1081,7 @@ public class OfficePrint {
+             }
+             if (aObj != null)
+             {
+-                XNameAccess aNameAccess = UnoRuntime.queryInterface(XNameAccess.class, aObj);
++                XNameAccess aNameAccess = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, aObj);
+                 if (aNameAccess != null)
+                 {                    
+                     if (! aNameAccess.hasByName(_sFilterName))
+@@ -1149,7 +1149,7 @@ public class OfficePrint {
+             try
+             {
+                 Object oObj = _xMSF.createInstance("com.sun.star.document.TypeDetection");
+-                aTypeDetection =UnoRuntime.queryInterface(XTypeDetection.class, oObj);
++                aTypeDetection = (XTypeDetection) UnoRuntime.queryInterface(XTypeDetection.class, oObj);
+             }
+             catch(com.sun.star.uno.Exception e)
+             {
+@@ -1158,7 +1158,7 @@ public class OfficePrint {
+             }
+             if (aTypeDetection != null)
+             {
+-                XNameAccess aNameAccess = UnoRuntime.queryInterface(XNameAccess.class, aTypeDetection);
++                XNameAccess aNameAccess = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, aTypeDetection);
+                 if (aNameAccess != null)
+                 {
+                     
+@@ -1257,12 +1257,12 @@ public class OfficePrint {
+ //  TODO: Do we need to wait?
+             TimeHelper.waitInSeconds(1, "wait after loadFromURL.");
+ 
+-            XServiceInfo xServiceInfo = UnoRuntime.queryInterface( XServiceInfo.class, aDoc );
++            XServiceInfo xServiceInfo = (XServiceInfo) UnoRuntime.queryInterface( XServiceInfo.class, aDoc );
+             // String sFilter = getFilterName_forExcel(xServiceInfo);
+             // System.out.println("Filter is " + sFilter);
+ 
+             // store the document in an other directory
+-            XStorable xStorable = UnoRuntime.queryInterface( XStorable.class, aDoc);
++            XStorable xStorable = (XStorable) UnoRuntime.queryInterface( XStorable.class, aDoc);
+             if (xStorable == null)
+             {
+                 GlobalLogWriter.get().println("com.sun.star.frame.XStorable is null");
+@@ -1281,7 +1281,7 @@ public class OfficePrint {
+             // initialize PropertyArray
+             // PropertyValue [] aStoreProps = new PropertyValue[ nPropertyCount ];
+             // int nPropertyIndex = 0;
+-            ArrayList<PropertyValue> aPropertyList = new ArrayList<PropertyValue>();
++            ArrayList aPropertyList = new ArrayList();
+             
+             String sExtension = "";
+ 
+diff -purN qadevOOo.old/runner/graphical/DirectoryHelper.java qadevOOo/runner/graphical/DirectoryHelper.java
+--- qadevOOo.old/runner/graphical/DirectoryHelper.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/runner/graphical/DirectoryHelper.java	2010-09-07 13:52:50.000000000 +0200
+@@ -38,7 +38,7 @@ import java.util.ArrayList;
+  */
+ public class DirectoryHelper
+ {    
+-    ArrayList<String> m_aFileList = new ArrayList<String>();
++    ArrayList m_aFileList = new ArrayList();
+     boolean m_bRecursiveIsAllowed = true;
+ 
+     void setRecursiveIsAllowed(boolean _bValue)
+diff -purN qadevOOo.old/runner/graphical/EnhancedComplexTestCase.java qadevOOo/runner/graphical/EnhancedComplexTestCase.java
+--- qadevOOo.old/runner/graphical/EnhancedComplexTestCase.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/runner/graphical/EnhancedComplexTestCase.java	2010-09-07 13:52:50.000000000 +0200
+@@ -233,7 +233,7 @@ private void callEntry(String _sEntry, P
+             {
+                 // special case for odb files
+                 int nFileCount = aIniFile.getIntValue(_sBasename, "reportcount", 0);
+-                ArrayList<String> aList = new ArrayList<String>();
++                ArrayList aList = new ArrayList();
+                 for (int i=0;i<nFileCount;i++)
+                 {
+                     String sValue = aIniFile.getValue(_sBasename, "report" + i);
+@@ -253,7 +253,7 @@ private void callEntry(String _sEntry, P
+                 // get the bad status and store it into the 
+                 for (int i=0;i<aList.size();i++)
+                 {
+-                    String sEntry = aList.get(i);
++                    String sEntry = (String) aList.get(i);
+                     callEntry(sEntry, _aParam);
+                     
+                     // we want to know the current status of the run through
+@@ -447,7 +447,7 @@ private void callEntry(String _sEntry, P
+                     {
+                         // special case for odb files
+                         int nFileCount = aIniFile.getIntValue(sBasename, "reportcount", 0);
+-                        ArrayList<String> aList = new ArrayList<String>();
++                        ArrayList aList = new ArrayList();
+                         for (int i=0;i<nFileCount;i++)
+                         {
+                             String sValue = aIniFile.getValue(sBasename, "report" + i);
+@@ -467,7 +467,7 @@ private void callEntry(String _sEntry, P
+         
+                             for (int i=0;i<aList.size();i++)
+                             {
+-                                String sPSFile = aList.get(i);
++                                String sPSFile = (String) aList.get(i);
+ 
+                                 // TODO: this information has to come out of the ini files
+                                 String sStatusRunThrough = "";
+diff -purN qadevOOo.old/runner/graphical/IniFile.java qadevOOo/runner/graphical/IniFile.java
+--- qadevOOo.old/runner/graphical/IniFile.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/runner/graphical/IniFile.java	2010-09-07 13:52:50.000000000 +0200
+@@ -44,7 +44,7 @@ public class IniFile implements Enumerat
+      * Problem, if ini file changed why other write something difference, we don't realise this.
       */
--    @Deprecated
-     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
+     private String m_sFilename;
+-    private ArrayList<String> m_aList;
++    private ArrayList m_aList;
+     boolean m_bListContainUnsavedChanges = false;
+     private int m_aEnumerationPos = 0;
+ 
+@@ -76,10 +76,10 @@ public class IniFile implements Enumerat
+             }
+         }
+ 
+-    private ArrayList<String> loadLines()
++    private ArrayList loadLines()
+         {
+             File aFile = new File(m_sFilename);
+-            ArrayList<String> aLines = new ArrayList<String>();
++            ArrayList aLines = new ArrayList();
+             if (!aFile.exists())
+             {
+                 // GlobalLogWriter.println("couldn't find file '" + m_sFilename + "', will be created.");
+@@ -165,7 +165,7 @@ public class IniFile implements Enumerat
+ 
+     private String getItem(int i)
+         {
+-            return m_aList.get(i);
++            return (String) m_aList.get(i);
+         }
+ 
+     private String buildSectionName(String _sSectionName)
+@@ -642,7 +642,7 @@ public class IniFile implements Enumerat
+             {
+                 while (i < m_aList.size())
+                 {
+-                    String sLine =  m_aList.get(i);
++                    String sLine = (String) m_aList.get(i);
+                     if (sLine.startsWith("["))
+                     {
+                         return i;
+@@ -662,7 +662,7 @@ public class IniFile implements Enumerat
+             int nLineWithSection = findNextSection(m_aEnumerationPos);
+             if (nLineWithSection != -1)
+             {
+-                String sSection =  m_aList.get(nLineWithSection);
++                String sSection = (String) m_aList.get(nLineWithSection);
+                 m_aEnumerationPos = findNextSection(nLineWithSection + 1);
+                 sSection = sectionToString(sSection);
+                 return sSection;
+diff -purN qadevOOo.old/runner/graphical/JPEGComparator.java qadevOOo/runner/graphical/JPEGComparator.java
+--- qadevOOo.old/runner/graphical/JPEGComparator.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/runner/graphical/JPEGComparator.java	2010-09-07 13:52:32.000000000 +0200
+@@ -255,7 +255,7 @@ public class JPEGComparator extends Enha
          int good = 0;
          int bad = 0;
          int ugly = 0;
@@ -30,7 +295,7 @@
  
          IniFile aResultIniFile = new IniFile(sResultIniFile);
          int nPages = aResultIniFile.getIntValue("global", "pages", 0);
-@@ -200,12 +200,12 @@ public class JPEGComparator extends Enha
+@@ -270,12 +270,12 @@ public class JPEGComparator extends Enha
              else if (nPercent <= 5)
              {
                  bad++;
@@ -45,11 +310,524 @@
              }
          }
  
---- 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,16 +416,18 @@ public class OfficeProvider implements A
+diff -purN qadevOOo.old/runner/graphical/MSOfficePostscriptCreator.java qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
+--- qadevOOo.old/runner/graphical/MSOfficePostscriptCreator.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/runner/graphical/MSOfficePostscriptCreator.java	2010-09-07 13:52:50.000000000 +0200
+@@ -191,7 +191,7 @@ public class MSOfficePostscriptCreator i
+         {
+             String sDocumentSuffix = FileHelper.getSuffix(_sInputFile);
+             String sFilterName = _aGTA.getExportFilterName();
+-            ArrayList<String> aStartCommand = new ArrayList<String>();
++            ArrayList aStartCommand = new ArrayList();
+             if (isWordDocument(sDocumentSuffix))
+             {
+                 aStartCommand = createWordStoreHelper();
+@@ -263,7 +263,7 @@ public class MSOfficePostscriptCreator i
+ 
+             setPrinterName(_aGTA.getPrinterName());
+ 
+-            ArrayList<String> aStartCommand = new ArrayList<String>();
++            ArrayList aStartCommand = new ArrayList();
+             if (isWordDocument(sDocumentSuffix))
+             {
+                 aStartCommand = createWordPrintHelper();
+@@ -379,7 +379,7 @@ public class MSOfficePostscriptCreator i
+         return sPerlExe;
+     }
+ 
+-    ArrayList<String> createWordPrintHelper() throws java.io.IOException
++    ArrayList createWordPrintHelper() throws java.io.IOException
+         {
+             // create a program in tmp file
+             String sTmpPath = util.utils.getUsersTempDir();
+@@ -387,7 +387,7 @@ public class MSOfficePostscriptCreator i
+ 
+             String sPrintViaWord = "printViaWord.pl";
+ 
+-            ArrayList<String> aList = searchLocalFile(sPrintViaWord);
++            ArrayList aList = searchLocalFile(sPrintViaWord);
+             if (aList.isEmpty() == false)
+             {
+                 return aList;
+@@ -483,11 +483,11 @@ public class MSOfficePostscriptCreator i
+ 
+     // TODO: Maybe give a possibility to say where search the script from outside
+ 
+-    ArrayList<String> searchLocalFile(String _sScriptName)
++    ArrayList searchLocalFile(String _sScriptName)
+         {
+             String userdir = System.getProperty("user.dir");
+ 
+-            ArrayList<String> aList = new ArrayList<String>();
++            ArrayList aList = new ArrayList();
+             String sFileName = FileHelper.appendPath(userdir, _sScriptName);
+             File aPerlScript = new File(sFileName);
+             if (FileHelper.isDebugEnabled())
+@@ -512,7 +512,7 @@ public class MSOfficePostscriptCreator i
+             return aList;
+         }
+     
+-    ArrayList<String> createWordStoreHelper() throws java.io.IOException
++    ArrayList createWordStoreHelper() throws java.io.IOException
+         {
+             // create a program in tmp file
+             String sTmpPath = util.utils.getUsersTempDir();
+@@ -521,7 +521,7 @@ public class MSOfficePostscriptCreator i
+             // ArrayList aList = new ArrayList();
+             String sSaveViaWord = "saveViaWord.pl";
+ 
+-            ArrayList<String> aList = searchLocalFile(sSaveViaWord);
++            ArrayList aList = searchLocalFile(sSaveViaWord);
+             if (aList.isEmpty() == false)
+             {
+                 return aList;
+@@ -594,7 +594,7 @@ public class MSOfficePostscriptCreator i
+         }
+     
+ 
+-    ArrayList<String> createExcelPrintHelper() throws java.io.IOException
++    ArrayList createExcelPrintHelper() throws java.io.IOException
+         {
+             // create a program in tmp file
+             String sTmpPath = util.utils.getUsersTempDir();
+@@ -602,7 +602,7 @@ public class MSOfficePostscriptCreator i
+ 
+             String sPrintViaExcel = "printViaExcel.pl";
+ 
+-            ArrayList<String> aList = searchLocalFile(sPrintViaExcel);
++            ArrayList aList = searchLocalFile(sPrintViaExcel);
+             if (aList.isEmpty() == false)
+             {
+                 return aList;
+@@ -697,7 +697,7 @@ public class MSOfficePostscriptCreator i
+             return aList;
+         }
+ 
+-    ArrayList<String> createExcelStoreHelper() throws java.io.IOException
++    ArrayList createExcelStoreHelper() throws java.io.IOException
+         {
+             // create a program in tmp file
+             String sTmpPath = util.utils.getUsersTempDir();
+@@ -705,7 +705,7 @@ public class MSOfficePostscriptCreator i
+ 
+             String sSaveViaExcel = "saveViaExcel.pl";
+ 
+-            ArrayList<String> aList = searchLocalFile(sSaveViaExcel);
++            ArrayList aList = searchLocalFile(sSaveViaExcel);
+             if (aList.isEmpty() == false)
+             {
+                 return aList;
+@@ -786,7 +786,7 @@ public class MSOfficePostscriptCreator i
+             return aList;
+         }
+     
+-    ArrayList<String> createPowerPointPrintHelper() throws java.io.IOException
++    ArrayList createPowerPointPrintHelper() throws java.io.IOException
+         {
+             // create a program in tmp file
+             String sTmpPath = util.utils.getUsersTempDir();
+@@ -794,7 +794,7 @@ public class MSOfficePostscriptCreator i
+ 
+             String sPrintViaPowerPoint = "printViaPowerPoint.pl";
+             
+-            ArrayList<String> aList = searchLocalFile(sPrintViaPowerPoint);
++            ArrayList aList = searchLocalFile(sPrintViaPowerPoint);
+             if (aList.isEmpty() == false)
+             {
+                 return aList;
+diff -purN qadevOOo.old/runner/graphical/OpenOfficeDatabaseReportExtractor.java qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java
+--- qadevOOo.old/runner/graphical/OpenOfficeDatabaseReportExtractor.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java	2010-09-07 13:52:50.000000000 +0200
+@@ -64,7 +64,7 @@ class PropertySetHelper
+     XPropertySet m_xPropertySet;
+     public PropertySetHelper(Object _aObj)
+         {
+-            m_xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, _aObj);
++            m_xPropertySet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, _aObj);
+         }
+     
+     /**
+@@ -115,7 +115,7 @@ public class OpenOfficeDatabaseReportExt
+                 try 
+                 {
+                     XInterface xInterface = (XInterface) getMultiServiceFactory().createInstance( "com.sun.star.frame.Desktop" );
+-                    m_xDesktop =  UnoRuntime.queryInterface(XDesktop.class, xInterface);
++                    m_xDesktop = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, xInterface);
+                 }
+                 catch (com.sun.star.uno.Exception e) 
+                 {
+@@ -196,7 +196,7 @@ public class OpenOfficeDatabaseReportExt
+      * @return
+      */
+        
+-    public ArrayList<String> load(String _sDocument /*, int _nType*/)
++    public ArrayList load(String _sDocument /*, int _nType*/)
+         {
+             // We need to copy the database file to a place where we have write access, NEVER use the docpool for this
+             String sOutputPath = m_aParameterHelper.getOutputPath();
+@@ -213,7 +213,7 @@ public class OpenOfficeDatabaseReportExt
+             String sFileURL = URLHelper.getFileURLFromSystemPath(sDestinationFile);
+             GlobalLogWriter.println("File URL: " + sFileURL);
+             
+-            ArrayList<PropertyValue> aPropertyList = new ArrayList<PropertyValue>();
++            ArrayList aPropertyList = new ArrayList();
+ 
+             // FYI: it is not allowed to open the document read only
+ //            PropertyValue aReadOnly = new PropertyValue(); // always overwrite already exist files
+@@ -234,7 +234,7 @@ public class OpenOfficeDatabaseReportExt
+ // 	reportContainer = oDBDoc.getReportDocuments()
+ //     report = reportContainer.loadComponentFromURL("Report40","",0,args)
+                     
+-            ArrayList<String> aList = null;
++            ArrayList aList = null;
+             try
+             {
+ //                XInterface x = (XInterface)getMultiServiceFactory().createInstance("com.sun.star.sdb.DatabaseContext");
+@@ -251,18 +251,18 @@ public class OpenOfficeDatabaseReportExt
+ //                Object aDatabaseDocument = aHelper.getPropertyValueAsObject("DatabaseDocument");
+ //                XOfficeDatabaseDocument xOfficeDBDoc = xDataSource.getDatabaseDocument();
+                 
+-                XOfficeDatabaseDocument xOfficeDBDoc = UnoRuntime.queryInterface(XOfficeDatabaseDocument.class, xDocComponent);
++                XOfficeDatabaseDocument xOfficeDBDoc = (XOfficeDatabaseDocument) UnoRuntime.queryInterface(XOfficeDatabaseDocument.class, xDocComponent);
+                 
+ //                XOfficeDatabaseDocument xOfficeDBDoc = (XOfficeDatabaseDocument)UnoRuntime.queryInterface(XOfficeDatabaseDocument.class, xDataSource);
+                 assure("can't access DatabaseDocument", xOfficeDBDoc != null);
+ //                GlobalLogWriter.println("2");
+                 
+-                XModel xDBSource = UnoRuntime.queryInterface(XModel.class, xOfficeDBDoc);
++                XModel xDBSource = (XModel) UnoRuntime.queryInterface(XModel.class, xOfficeDBDoc);
+                 Object aController = xDBSource.getCurrentController();
+                 assure("Controller of xOfficeDatabaseDocument is empty!", aController != null);
+ //                GlobalLogWriter.println("3");
+                 
+-                XDatabaseDocumentUI aDBDocUI = UnoRuntime.queryInterface(XDatabaseDocumentUI.class, aController);
++                XDatabaseDocumentUI aDBDocUI = (XDatabaseDocumentUI) UnoRuntime.queryInterface(XDatabaseDocumentUI.class, aController);
+                 aDBDocUI.connect();
+                 boolean isConnect = aDBDocUI.isConnected();
+                 if (isConnect)
+@@ -276,7 +276,7 @@ public class OpenOfficeDatabaseReportExt
+                 
+                 // aHelper = new PropertySetHelper(aController);              
+                 
+-                XReportDocumentsSupplier xSupplier = UnoRuntime.queryInterface(XReportDocumentsSupplier.class, xOfficeDBDoc);
++                XReportDocumentsSupplier xSupplier = (XReportDocumentsSupplier) UnoRuntime.queryInterface(XReportDocumentsSupplier.class, xOfficeDBDoc);
+                 XNameAccess xNameAccess = xSupplier.getReportDocuments();
+                 assure("xOfficeDatabaseDocument returns no Report Document", xNameAccess != null);
+ //                     GlobalLogWriter.println("5");
+@@ -288,7 +288,7 @@ public class OpenOfficeDatabaseReportExt
+                 assure("ActiveConnection is empty", aActiveConnectionObj != null);
+ //                     GlobalLogWriter.println("5");
+ 
+-                ArrayList<PropertyValue> aPropertyList2 = new ArrayList<PropertyValue>();
++                ArrayList aPropertyList2 = new ArrayList();
+                 
+                 PropertyValue aActiveConnection = new PropertyValue();
+                 aActiveConnection.Name = "ActiveConnection";
+@@ -363,9 +363,9 @@ public class OpenOfficeDatabaseReportExt
+             }
+         }
+     
+-    private ArrayList<String> loadAndStoreReports(XNameAccess _xNameAccess, ArrayList<PropertyValue> _aPropertyList /*, int _nType*/ )
++    private ArrayList loadAndStoreReports(XNameAccess _xNameAccess, ArrayList _aPropertyList /*, int _nType*/ )
+         {
+-            ArrayList<String> aList = new ArrayList<String>();
++            ArrayList aList = new ArrayList();
+             if (_xNameAccess != null)
+             {
+                 String[] sElementNames = _xNameAccess.getElementNames();
+@@ -389,7 +389,7 @@ public class OpenOfficeDatabaseReportExt
+     private String getFormatExtension(Object _xComponent /* int _nType*/ )
+          {
+              String sExtension;
+-             XServiceInfo xServiceInfo =  UnoRuntime.queryInterface( XServiceInfo.class, _xComponent );
++             XServiceInfo xServiceInfo = (XServiceInfo) UnoRuntime.queryInterface( XServiceInfo.class, _xComponent );
+              if ( xServiceInfo.supportsService( "com.sun.star.sheet.SpreadsheetDocument" ) )
+              {
+                  // calc
+@@ -483,7 +483,7 @@ public class OpenOfficeDatabaseReportExt
+ 
+             String sOutputURL = URLHelper.getFileURLFromSystemPath(sOutputPath);
+ 
+-            ArrayList<PropertyValue> aPropertyList = new ArrayList<PropertyValue>(); // set some properties for storeAsURL
++            ArrayList aPropertyList = new ArrayList(); // set some properties for storeAsURL
+ 
+             // PropertyValue aFileFormat = new PropertyValue();
+             // aFileFormat.Name = "FilterName";
+@@ -496,7 +496,7 @@ public class OpenOfficeDatabaseReportExt
+             aPropertyList.add(aOverwrite);
+ 
+             // store the document in an other directory
+-            XStorable aStorable = UnoRuntime.queryInterface( XStorable.class, _xComponent);
++            XStorable aStorable = (XStorable) UnoRuntime.queryInterface( XStorable.class, _xComponent);
+             if (aStorable != null)
+             {
+                 GlobalLogWriter.println("store document as URL: '" + sOutputURL + "'");
+@@ -517,7 +517,7 @@ public class OpenOfficeDatabaseReportExt
+     private XComponent loadComponent(String _sName, Object _xComponent, ArrayList _aPropertyList)
+         {
+             XComponent xDocComponent = null;
+-            XComponentLoader xComponentLoader =  UnoRuntime.queryInterface( XComponentLoader.class, _xComponent );
++            XComponentLoader xComponentLoader = (XComponentLoader) UnoRuntime.queryInterface( XComponentLoader.class, _xComponent );
+ 
+             try
+             {
+@@ -544,7 +544,7 @@ public class OpenOfficeDatabaseReportExt
+     private void closeComponent(XComponent _xDoc)
          {
+             // Close the document
+-            XCloseable xCloseable =  UnoRuntime.queryInterface(XCloseable.class, _xDoc);
++            XCloseable xCloseable = (XCloseable) UnoRuntime.queryInterface(XCloseable.class, _xDoc);
+             try
+             {
+                 xCloseable.close(true);
+diff -purN qadevOOo.old/runner/graphical/OpenOfficePostscriptCreator.java qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
+--- qadevOOo.old/runner/graphical/OpenOfficePostscriptCreator.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java	2010-09-07 13:52:50.000000000 +0200
+@@ -161,7 +161,7 @@ public class OpenOfficePostscriptCreator
+      */
+     private String getDocumentType( XComponent _aDoc )
+         {
+-            XModel xModel = UnoRuntime.queryInterface( XModel.class, _aDoc);
++            XModel xModel = (XModel) UnoRuntime.queryInterface( XModel.class, _aDoc);
+             PropertyValue[] aArgs = xModel.getArgs();
+             for (int i=0;i<aArgs.length;i++)
+             {
+@@ -201,7 +201,7 @@ public class OpenOfficePostscriptCreator
+                     return null;
+                 }
+                 Object oDsk = _aGTA.getMultiServiceFactory().createInstance("com.sun.star.frame.Desktop");
+-                XDesktop aDesktop = UnoRuntime.queryInterface(XDesktop.class, oDsk);
++                XDesktop aDesktop = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, oDsk);
+                 
+                 if (aDesktop != null)
+                 {
+@@ -215,7 +215,7 @@ public class OpenOfficePostscriptCreator
+                     // set here the loadComponentFromURL() properties
+                     // at the moment only 'Hidden' is set, so no window is opened at work
+ 
+-                    ArrayList<PropertyValue> aPropertyList = new ArrayList<PropertyValue>();
++                    ArrayList aPropertyList = new ArrayList();
+ 
+                     // check which properties should set and count it.
+                     // if (_aGTA.isHidden())
+@@ -257,7 +257,7 @@ public class OpenOfficePostscriptCreator
+                     GlobalLogWriter.println(DateHelper.getDateTimeForHumanreadableLog() + " Load document");
+                     // GlobalLogWriter.flush();
+                     
+-                    XComponentLoader aCompLoader = UnoRuntime.queryInterface( XComponentLoader.class, aDesktop);
++                    XComponentLoader aCompLoader = (XComponentLoader) UnoRuntime.queryInterface( XComponentLoader.class, aDesktop);
+                     
+                     // XComponent aDoc = null;
+ 
+@@ -300,11 +300,11 @@ public class OpenOfficePostscriptCreator
+     private boolean exportToPDF(XComponent _xComponent, String _sDestinationName)
+         {
+             XServiceInfo xServiceInfo =
+-                 UnoRuntime.queryInterface(
++                 (XServiceInfo) UnoRuntime.queryInterface(
+                     XServiceInfo.class, _xComponent
+                     );
              
+-            ArrayList<PropertyValue> aPropertyList = new ArrayList<PropertyValue>();
++            ArrayList aPropertyList = new ArrayList();
+             PropertyValue aFiltername = new PropertyValue();
+             aFiltername.Name = "FilterName";
+             aFiltername.Value = getFilterName_forPDF(xServiceInfo);
+@@ -316,7 +316,7 @@ public class OpenOfficePostscriptCreator
+             try
+             {
+                 XStorable store =
+-                     UnoRuntime.queryInterface(
++                     (XStorable) UnoRuntime.queryInterface(
+                         XStorable.class, _xComponent
+                         );
+                 store.storeToURL(_sDestinationName, PropertyHelper.createPropertyValueArrayFormArrayList(aPropertyList));
+@@ -485,7 +485,7 @@ public class OpenOfficePostscriptCreator
+                     if (isStoreAllowed())
+                     {
+                         // store the document in an other directory
+-                        XStorable aStorable = UnoRuntime.queryInterface( XStorable.class, _aDoc);
++                        XStorable aStorable = (XStorable) UnoRuntime.queryInterface( XStorable.class, _aDoc);
+                         if (aStorable != null)
+                         {
+                             PropertyValue [] szEmptyArgs = new PropertyValue [0];
+@@ -505,7 +505,7 @@ public class OpenOfficePostscriptCreator
+                             }
+                             else
+                             {
+-                                XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, aDoc);
++                                XCloseable xClose = (XCloseable) UnoRuntime.queryInterface(XCloseable.class, aDoc);
+                                 if (xClose != null)
+                                 {
+                                     xClose.close(true);
+@@ -545,7 +545,7 @@ public class OpenOfficePostscriptCreator
+                 // Change Pagesettings to DIN A4
+                 
+                 GlobalLogWriter.println(DateHelper.getDateTimeForHumanreadableLog() + " Print document.");
+-                XPrintable aPrintable =  UnoRuntime.queryInterface( XPrintable.class, _aDoc);
++                XPrintable aPrintable = (XPrintable) UnoRuntime.queryInterface( XPrintable.class, _aDoc);
+                 if (aPrintable != null)
+                 {
+                     // System.out.println("  Set PaperFormat to DIN A4");
+@@ -569,7 +569,7 @@ public class OpenOfficePostscriptCreator
+                     {
+                         if (_aGTA.getPrinterName() != null)
+                         {
+-                            ArrayList<PropertyValue> aPropertyList = new ArrayList<PropertyValue>();
++                            ArrayList aPropertyList = new ArrayList();
+                             // PropertyValue [] aPrintProps = new PropertyValue[1];
+                             PropertyValue Arg = new PropertyValue();
+                             Arg.Name = "Name";
+@@ -593,20 +593,20 @@ public class OpenOfficePostscriptCreator
+                     // int nPropsCount = 0;
+                     
+                     // If we are a SpreadSheet (calc), we need to set PrintAllSheets property to 'true'
+-                    XServiceInfo xServiceInfo =  UnoRuntime.queryInterface( XServiceInfo.class, _aDoc );
++                    XServiceInfo xServiceInfo = (XServiceInfo) UnoRuntime.queryInterface( XServiceInfo.class, _aDoc );
+                     if ( xServiceInfo.supportsService( "com.sun.star.sheet.SpreadsheetDocument" ) )
+                     {
+                         XMultiServiceFactory xMSF = _aGTA.getMultiServiceFactory();
+                         Object aSettings = xMSF.createInstance( "com.sun.star.sheet.GlobalSheetSettings" );
+                         if (aSettings != null)
+                         {
+-                            XPropertySet xPropSet = UnoRuntime.queryInterface( XPropertySet.class, aSettings );
++                            XPropertySet xPropSet = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, aSettings );
+                             xPropSet.setPropertyValue( "PrintAllSheets", new Boolean( true ) );
+                             GlobalLogWriter.println("PrintAllSheets := true");
+                         }
+                     }
+                     
+-                    ArrayList<PropertyValue> aPrintProps = new ArrayList<PropertyValue>();
++                    ArrayList aPrintProps = new ArrayList();
+                     // GlobalLogWriter.println("Property FileName:=" + _sPrintFileURL);
+ 
+                     // PropertyValue [] aPrintProps = new PropertyValue[nProperties];
+@@ -912,7 +912,7 @@ public class OpenOfficePostscriptCreator
+             try
+             {
+                 Object oObj = _xMSF.createInstance("com.sun.star.document.TypeDetection");
+-                aTypeDetection = UnoRuntime.queryInterface(XTypeDetection.class, oObj);
++                aTypeDetection = (XTypeDetection) UnoRuntime.queryInterface(XTypeDetection.class, oObj);
+             }
+             catch(com.sun.star.uno.Exception e)
+             {
+@@ -954,7 +954,7 @@ public class OpenOfficePostscriptCreator
+             }
+             if (aObj != null)
+             {
+-                XNameAccess aNameAccess = UnoRuntime.queryInterface(XNameAccess.class, aObj);
++                XNameAccess aNameAccess = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, aObj);
+                 if (aNameAccess != null)
+                 {
+                     
+@@ -1045,7 +1045,7 @@ public class OpenOfficePostscriptCreator
+             }
+             if (aObj != null)
+             {
+-                XNameAccess aNameAccess = UnoRuntime.queryInterface(XNameAccess.class, aObj);
++                XNameAccess aNameAccess = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, aObj);
+                 if (aNameAccess != null)
+                 {                    
+                     if (! aNameAccess.hasByName(_sFilterName))
+@@ -1113,7 +1113,7 @@ public class OpenOfficePostscriptCreator
+             try
+             {
+                 Object oObj = _xMSF.createInstance("com.sun.star.document.TypeDetection");
+-                aTypeDetection = UnoRuntime.queryInterface(XTypeDetection.class, oObj);
++                aTypeDetection = (XTypeDetection) UnoRuntime.queryInterface(XTypeDetection.class, oObj);
+             }
+             catch(com.sun.star.uno.Exception e)
+             {
+@@ -1122,7 +1122,7 @@ public class OpenOfficePostscriptCreator
+             }
+             if (aTypeDetection != null)
+             {
+-                XNameAccess aNameAccess = UnoRuntime.queryInterface(XNameAccess.class, aTypeDetection);
++                XNameAccess aNameAccess = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, aTypeDetection);
+                 if (aNameAccess != null)
+                 {
+                     
+@@ -1221,12 +1221,12 @@ public class OpenOfficePostscriptCreator
+ //  TODO: Do we need to wait?
+ //            TimeHelper.waitInSeconds(1, "wait after loadFromURL.");
+ 
+-            XServiceInfo xServiceInfo =  UnoRuntime.queryInterface( XServiceInfo.class, aDoc );
++            XServiceInfo xServiceInfo = (XServiceInfo) UnoRuntime.queryInterface( XServiceInfo.class, aDoc );
+             // String sFilter = getFilterName_forExcel(xServiceInfo);
+             // System.out.println("Filter is " + sFilter);
+ 
+             // store the document in an other directory
+-            XStorable xStorable =  UnoRuntime.queryInterface( XStorable.class, aDoc);
++            XStorable xStorable = (XStorable) UnoRuntime.queryInterface( XStorable.class, aDoc);
+             if (xStorable == null)
+             {
+                 GlobalLogWriter.println("com.sun.star.frame.XStorable is null");
+@@ -1245,7 +1245,7 @@ public class OpenOfficePostscriptCreator
+             // initialize PropertyArray
+             // PropertyValue [] aStoreProps = new PropertyValue[ nPropertyCount ];
+             // int nPropertyIndex = 0;
+-            ArrayList<PropertyValue> aPropertyList = new ArrayList<PropertyValue>();
++            ArrayList aPropertyList = new ArrayList();
+             
+             String sExtension = "";
+ 
+diff -purN qadevOOo.old/runner/graphical/PostscriptCreator.java qadevOOo/runner/graphical/PostscriptCreator.java
+--- qadevOOo.old/runner/graphical/PostscriptCreator.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/runner/graphical/PostscriptCreator.java	2010-09-07 13:52:32.000000000 +0200
+@@ -51,7 +51,7 @@ public class PostscriptCreator extends E
+         GlobalLogWriter.set(log);
+         ParameterHelper aParam = new ParameterHelper(param);
+         
+-        param.put(util.PropertyName.OFFICE_CLOSE_TIME_OUT, 2000);
++        param.put(util.PropertyName.OFFICE_CLOSE_TIME_OUT, new Integer(2000));
+         // run through all documents found in Inputpath
+         foreachDocumentinInputPath(aParam);
+     }
+diff -purN qadevOOo.old/runner/helper/CwsDataExchangeImpl.java qadevOOo/runner/helper/CwsDataExchangeImpl.java
+--- qadevOOo.old/runner/helper/CwsDataExchangeImpl.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/runner/helper/CwsDataExchangeImpl.java	2010-09-07 13:52:32.000000000 +0200
+@@ -84,7 +84,7 @@ public class CwsDataExchangeImpl impleme
+ 
+         final String[] outs = procHdl.getOutputText().split("\n");
+ 
+-        final ArrayList<String> moduleNames = new ArrayList<String>();
++        final ArrayList moduleNames = new ArrayList();
+         boolean bStart = false;
+         for (int i = 0; i < outs.length; i++)
+         {
+diff -purN qadevOOo.old/runner/helper/OfficeProvider.java qadevOOo/runner/helper/OfficeProvider.java
+--- qadevOOo.old/runner/helper/OfficeProvider.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/runner/helper/OfficeProvider.java	2010-09-07 13:52:50.000000000 +0200
+@@ -130,7 +130,7 @@ public class OfficeProvider implements A
+ 
+             try
+             {
+-                desk = UnoRuntime.queryInterface(XDesktop.class, msf.createInstance("com.sun.star.frame.Desktop"));
++                desk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, msf.createInstance("com.sun.star.frame.Desktop"));
+             }
+             catch (com.sun.star.uno.Exception ue)
+             {
+@@ -347,7 +347,7 @@ public class OfficeProvider implements A
+         // create a connector, so that it can contact the office
+ //        XUnoUrlResolver urlResolver = UnoUrlResolver.create(xcomponentcontext);
+         final Object xUrlResolver = xLocalServiceManager.createInstanceWithContext("com.sun.star.bridge.UnoUrlResolver", xcomponentcontext);
+-        final XUnoUrlResolver urlResolver = UnoRuntime.queryInterface(XUnoUrlResolver.class, xUrlResolver);
++        final XUnoUrlResolver urlResolver = (XUnoUrlResolver) UnoRuntime.queryInterface(XUnoUrlResolver.class, xUrlResolver);
+ 
+         final Object rInitialObject = urlResolver.resolve(connectStr);
+ 
+@@ -358,7 +358,7 @@ public class OfficeProvider implements A
+             debug = true;
+             dbg("resolved url");
+ 
+-            xMSF = UnoRuntime.queryInterface(XMultiServiceFactory.class, rInitialObject);
++            xMSF = (XMultiServiceFactory) UnoRuntime.queryInterface(XMultiServiceFactory.class, rInitialObject);
+         }
+ 
+         return xMSF;
+@@ -476,20 +476,22 @@ public class OfficeProvider implements A
+         {
+ 
              // disable QuickStarter
 -            try
 -            {
@@ -73,12 +851,258 @@
 +//            {
 +//                dbg("ERROR: Could not disable QuickStarter: " + ex.toString());
 +//            }
-             
+ 
              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
+-                desk = UnoRuntime.queryInterface(XDesktop.class, msf.createInstance("com.sun.star.frame.Desktop"));
++                desk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, msf.createInstance("com.sun.star.frame.Desktop"));
+                 msf = null;
+ 
+                 if (desk != null)
+@@ -608,7 +610,7 @@ public class OfficeProvider implements A
+         {
+             while (compEnum.hasMoreElements())
+             {
+-                final XCloseable closer = UnoRuntime.queryInterface(XCloseable.class, compEnum.nextElement());
++                final XCloseable closer = (XCloseable) UnoRuntime.queryInterface(XCloseable.class, compEnum.nextElement());
+ 
+                 if (closer != null)
+                 {
+@@ -648,7 +650,7 @@ public class OfficeProvider implements A
+ 
+         if (xPathSubst != null)
+         {
+-            return UnoRuntime.queryInterface(XStringSubstitution.class, xPathSubst);
++            return (XStringSubstitution) UnoRuntime.queryInterface(XStringSubstitution.class, xPathSubst);
+         }
+         else
+         {
+@@ -779,7 +781,10 @@ public class OfficeProvider implements A
+             this.ow = ow;
+         }
+ 
+-        @Override
++        // @Override is optional; It just helps the compiler to catch errors, see. 
++        // http://java.sun.com/docs/books/tutorial/java/javaOO/annotations.html. 
++        // We will disable to to be able to compile with JRE 1.4. 
++        // @Override
+         public void run()
+         {
+             System.out.println(utils.getDateTime() + "OfficeProvider:Owp: start ");
+diff -purN qadevOOo.old/runner/org/openoffice/Runner.java qadevOOo/runner/org/openoffice/Runner.java
+--- qadevOOo.old/runner/org/openoffice/Runner.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/runner/org/openoffice/Runner.java	2010-09-07 13:52:50.000000000 +0200
+@@ -182,7 +182,7 @@ public class Runner
+         }
+     }
+ 
+-    public static boolean run(String... args)
++    public static boolean run(String[] args)
+     {
+         System.out.println("OOoRunner Main() version from 20100323 (yyyymmdd)");
+ 
+diff -purN qadevOOo.old/runner/util/AccessibilityTools.java qadevOOo/runner/util/AccessibilityTools.java
+--- qadevOOo.old/runner/util/AccessibilityTools.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/runner/util/AccessibilityTools.java	2010-09-07 13:52:50.000000000 +0200
+@@ -51,7 +51,7 @@ public class AccessibilityTools {
+     }
+     
+     public static XAccessible getAccessibleObject(XInterface xObject) {
+-        return UnoRuntime.queryInterface(XAccessible.class, xObject);
++        return (XAccessible) UnoRuntime.queryInterface(XAccessible.class, xObject);
+     }
+     
+     public static XWindow getCurrentContainerWindow(XMultiServiceFactory msf,
+diff -purN qadevOOo.old/runner/util/db/DataSource.java qadevOOo/runner/util/db/DataSource.java
+--- qadevOOo.old/runner/util/db/DataSource.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/runner/util/db/DataSource.java	2010-09-07 13:52:50.000000000 +0200
+@@ -114,7 +114,7 @@ public class DataSource
+         try
+         {
+             doing = "creating database context";
+-            XNamingService dbContext = UnoRuntime.queryInterface( XNamingService.class,
++            XNamingService dbContext = (XNamingService) UnoRuntime.queryInterface( XNamingService.class,
+                 m_orb.createInstance( "com.sun.star.sdb.DatabaseContext" ) );
+ 
+             if ( _revokeIfRegistered )
+diff -purN qadevOOo.old/runner/util/DesktopTools.java qadevOOo/runner/util/DesktopTools.java
+--- qadevOOo.old/runner/util/DesktopTools.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/runner/util/DesktopTools.java	2010-09-07 13:52:32.000000000 +0200
+@@ -479,7 +479,6 @@ public class DesktopTools
+      * @param xModel
+      * @deprecated
+      */
+-    @Deprecated
+     public static void bringWindowToFromt(XModel xModel)
+     {
+         bringWindowToFront(xModel);
+diff -purN qadevOOo.old/tests/java/ifc/awt/_XMessageBoxFactory.java qadevOOo/tests/java/ifc/awt/_XMessageBoxFactory.java
+--- qadevOOo.old/tests/java/ifc/awt/_XMessageBoxFactory.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/tests/java/ifc/awt/_XMessageBoxFactory.java	2010-09-07 13:52:50.000000000 +0200
+@@ -60,7 +60,7 @@ public class _XMessageBoxFactory extends
+             "The Message");
+         final UITools tools = new UITools(
+             (XMultiServiceFactory) tParam.getMSF(),
+-            UnoRuntime.queryInterface(XWindow.class, mb));
++            (XWindow)UnoRuntime.queryInterface(XWindow.class, mb));
+         final boolean[] done = new boolean[] { false };
+         final boolean[] good = new boolean[] { false };
+         XRequestCallback async = AsyncCallback.create(
+diff -purN qadevOOo.old/tests/java/ifc/awt/_XToolkit.java qadevOOo/tests/java/ifc/awt/_XToolkit.java
+--- qadevOOo.old/tests/java/ifc/awt/_XToolkit.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/tests/java/ifc/awt/_XToolkit.java	2010-09-07 13:52:50.000000000 +0200
+@@ -89,7 +89,7 @@ public class _XToolkit extends MultiMeth
+             if (cWin == null) {
+                 log.println("createWindow() create a NULL Object");
+             } else {
+-                UnoRuntime.queryInterface(XComponent.class, cWin).dispose();
++                ((XWindowPeer)UnoRuntime.queryInterface(XComponent.class, cWin)).dispose();
+                 res = true;
+             }
+         } catch (com.sun.star.lang.IllegalArgumentException ex) {
+@@ -114,8 +114,8 @@ public class _XToolkit extends MultiMeth
+             if ( (cWins[0] == null) || (cWins[1] == null) ) {
+                 log.println("createWindows() creates NULL Windows");
+             } else {
+-                UnoRuntime.queryInterface(XComponent.class, cWins[0]).dispose();
+-                UnoRuntime.queryInterface(XComponent.class, cWins[1]).dispose();
++                ((XWindowPeer)UnoRuntime.queryInterface(XComponent.class, cWins[0])).dispose();
++                ((XWindowPeer)UnoRuntime.queryInterface(XComponent.class, cWins[1])).dispose();
+                 res = true;
+             }
+         } catch (com.sun.star.lang.IllegalArgumentException ex) {
+diff -purN qadevOOo.old/tests/java/ifc/beans/_XPropertySet.java qadevOOo/tests/java/ifc/beans/_XPropertySet.java
+--- qadevOOo.old/tests/java/ifc/beans/_XPropertySet.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/tests/java/ifc/beans/_XPropertySet.java	2010-09-07 13:52:50.000000000 +0200
+@@ -105,9 +105,9 @@ public class _XPropertySet extends Multi
+     * Constrained, Bound and Normal.
+     */
+     private final class PropsToTest {
+-        Vector< String > constrained = new Vector< String >();
+-        Vector< String > bound = new Vector< String >();
+-        Vector< String > normal = new Vector< String >();
++        Vector constrained = new Vector();
++        Vector bound = new Vector();
++        Vector normal = new Vector();
+     }
+ 
+     private final PropsToTest PTT = new PropsToTest();
+@@ -170,7 +170,7 @@ public class _XPropertySet extends Multi
+         } else {
+             boolean error = false;
+             for (int i = 0; i < count; i++) {
+-                String propertyName = PTT.bound.get(i);
++                String propertyName = (String)PTT.bound.get(i);
+                 propertyChanged = false;
+                 try {
+                     oObj.addPropertyChangeListener(propertyName,PClistener);
+@@ -231,7 +231,7 @@ public class _XPropertySet extends Multi
+         } else {
+             boolean error = false;
+             for (int i = 0; i < count; i++) {
+-                String propertyName = PTT.constrained.get(i);
++                String propertyName = (String)PTT.constrained.get(i);
+                 vetoableChanged = false;
+                 try {
+                     oObj.addVetoableChangeListener(propertyName,VClistener);
+@@ -295,7 +295,7 @@ public class _XPropertySet extends Multi
+         } else {
+             boolean error = false;
+             for (int i = 0; i < count; i++) {
+-                String propertyName = PTT.normal.get(i);
++                String propertyName = (String)PTT.normal.get(i);
+                 try {
+                     log.println("try to change value of property '" + propertyName + "'" );
+                     gValue = oObj.getPropertyValue(propertyName);
+@@ -385,7 +385,7 @@ public class _XPropertySet extends Multi
+         } else {
+             boolean error = false;
+             for (int i = 0; i < count; i++) {
+-                String propertyName = PTT.normal.get(i);
++                String propertyName = (String)PTT.normal.get(i);
+                 boolean runOk = getSinglePropertyValue( propertyName );
+                 if( !runOk )
+                 {
+@@ -423,7 +423,7 @@ public class _XPropertySet extends Multi
+             
+             //remove all listeners first
+             for (int i = 0; i < count; i++) {
+-                String propertyName = PTT.bound.get(i);
++                String propertyName = (String)PTT.bound.get(i);
+                 try {
+                     oObj.removePropertyChangeListener(propertyName,PClistener);
+                 } catch (Exception e) {
+@@ -435,7 +435,7 @@ public class _XPropertySet extends Multi
+             
+             boolean error = false;
+             for (int i = 0; i < count; i++) {
+-                String propertyName = PTT.bound.get(i);
++                String propertyName = (String)PTT.bound.get(i);
+                 try {
+                     propertyChanged = false;
+                     oObj.addPropertyChangeListener(propertyName,PClistener);
+@@ -499,7 +499,7 @@ public class _XPropertySet extends Multi
+         
+             //remove all listeners first
+             for (int i = 0; i < count; i++) {
+-                String propertyName = PTT.constrained.get(i);
++                String propertyName = (String)PTT.constrained.get(i);
+                 try {
+                     oObj.removeVetoableChangeListener(propertyName,VClistener);
+                 } catch (Exception e) {
+@@ -511,7 +511,7 @@ public class _XPropertySet extends Multi
+             
+             boolean error = false;
+             for (int i = 0; i < count; i++) {
+-                String propertyName = PTT.constrained.get(i);
++                String propertyName = (String)PTT.constrained.get(i);
+                 vetoableChanged = false;
+                 try {
+                     oObj.addVetoableChangeListener(propertyName,VClistener);
+diff -purN qadevOOo.old/tests/java/ifc/sdbc/_XWarningsSupplier.java qadevOOo/tests/java/ifc/sdbc/_XWarningsSupplier.java
+--- qadevOOo.old/tests/java/ifc/sdbc/_XWarningsSupplier.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/tests/java/ifc/sdbc/_XWarningsSupplier.java	2010-09-07 13:52:50.000000000 +0200
+@@ -60,9 +60,9 @@ public class _XWarningsSupplier extends
+     * Has OK status if the method return not empty value.
+     */
+     public void _getWarnings() {
+-        final XRowUpdate rowUpdate = UnoRuntime.queryInterface(XRowUpdate.class, oObj);
+-        final XResultSetUpdate resultSetUpdate = UnoRuntime.queryInterface(XResultSetUpdate.class, rowUpdate);
+-        final XRow row = UnoRuntime.queryInterface(XRow.class, resultSetUpdate);
++        final XRowUpdate rowUpdate = (XRowUpdate) UnoRuntime.queryInterface(XRowUpdate.class, oObj);
++        final XResultSetUpdate resultSetUpdate = (XResultSetUpdate) UnoRuntime.queryInterface(XResultSetUpdate.class, rowUpdate);
++        final XRow row = (XRow) UnoRuntime.queryInterface(XRow.class, resultSetUpdate);
+         if ( row == null)
+             throw new StatusException(Status.failed("Test must be modified"));
+ 
+diff -purN qadevOOo.old/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java
+--- qadevOOo.old/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java	2010-09-07 13:52:50.000000000 +0200
+@@ -347,7 +347,7 @@ public class ConnectionLineAccessibility
+         
+         util.utils.shortWait(1000);
+         
+-        xWindow = UnoRuntime.queryInterface(XModel.class, QueryComponent).
++        xWindow = ((XModel)UnoRuntime.queryInterface(XModel.class, QueryComponent)).
+             getCurrentController().getFrame().getContainerWindow();
+         
+         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
+diff -purN qadevOOo.old/tests/java/mod/_dbaccess/JoinViewAccessibility.java qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java
+--- qadevOOo.old/tests/java/mod/_dbaccess/JoinViewAccessibility.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java	2010-09-07 13:52:50.000000000 +0200
+@@ -326,7 +326,7 @@ public class JoinViewAccessibility exten
+         
+         QueryComponent = DesktopTools.loadDoc ((XMultiServiceFactory) Param.getMSF (),".component:DB/QueryDesign",loadProps);
+         
+-        xWindow = UnoRuntime.queryInterface(XModel.class, QueryComponent).
++        xWindow = ((XModel) UnoRuntime.queryInterface(XModel.class, QueryComponent)).
+             getCurrentController().getFrame().getContainerWindow();
+         
+         XAccessible xRoot = AccessibilityTools.getAccessibleObject (xWindow);
+diff -purN qadevOOo.old/tests/java/mod/_dbaccess/OQueryDesign.java qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java
+--- qadevOOo.old/tests/java/mod/_dbaccess/OQueryDesign.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java	2010-09-07 13:52:32.000000000 +0200
+@@ -294,7 +294,10 @@ public class OQueryDesign extends TestCa
          
      }
      
@@ -90,14 +1114,192 @@
      protected void cleanup(TestParameters tParam, PrintWriter log) {
          try {
              xConn.close() ;
---- qadevOOo/runner/graphical/PostscriptCreator.java.old	2009-02-12 14:55:56.000000000 +0100
-+++ qadevOOo/runner/graphical/PostscriptCreator.java	2009-02-18 12:23:32.000000000 +0100
-@@ -54,7 +54,7 @@ public class PostscriptCreator extends E
-         GlobalLogWriter.set(log);
-         ParameterHelper aParam = new ParameterHelper(param);
+diff -purN qadevOOo.old/tests/java/mod/_dbaccess/ORowSet.java qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
+--- qadevOOo.old/tests/java/mod/_dbaccess/ORowSet.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/tests/java/mod/_dbaccess/ORowSet.java	2010-09-07 13:52:50.000000000 +0200
+@@ -301,7 +301,7 @@ public class ORowSet extends TestCase {
+         {
+             m_rowSet = orb.createInstance("com.sun.star.sdb.RowSet");
+ 
+-            XPropertySet rowSetProps = UnoRuntime.queryInterface( XPropertySet.class, m_rowSet );
++            XPropertySet rowSetProps = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, m_rowSet );
+ 
+             log.println("Trying to open: " + tableName);
+ 
+@@ -310,11 +310,11 @@ public class ORowSet extends TestCase {
+             rowSetProps.setPropertyValue("CommandType",
+                 new Integer(CommandType.TABLE));
+ 
+-            final XRowSet rowSet = UnoRuntime.queryInterface( XRowSet.class, m_rowSet);                   
++            final XRowSet rowSet = (XRowSet) UnoRuntime.queryInterface( XRowSet.class, m_rowSet);                   
+             rowSet.execute();
+-            m_connection = UnoRuntime.queryInterface( XConnection.class, rowSetProps.getPropertyValue("ActiveConnection") );
++            m_connection = (XConnection) UnoRuntime.queryInterface( XConnection.class, rowSetProps.getPropertyValue("ActiveConnection") );
+ 
+-            XResultSet xRes = UnoRuntime.queryInterface( XResultSet.class, m_rowSet );
++            XResultSet xRes = (XResultSet) UnoRuntime.queryInterface( XResultSet.class, m_rowSet );
+             xRes.first();
+ 
+             log.println( "creating a new environment for object" );
+@@ -322,9 +322,9 @@ public class ORowSet extends TestCase {
+ 
+             // Adding obj relation for XRowSetApproveBroadcaster test
+             {
+-                final XResultSet resultSet = UnoRuntime.queryInterface( XResultSet.class, m_rowSet );
+-                final XResultSetUpdate resultSetUpdate = UnoRuntime.queryInterface( XResultSetUpdate.class, m_rowSet );
+-                final XRowUpdate rowUpdate = UnoRuntime.queryInterface(XRowUpdate.class, m_rowSet );
++                final XResultSet resultSet = (XResultSet) UnoRuntime.queryInterface( XResultSet.class, m_rowSet );
++                final XResultSetUpdate resultSetUpdate = (XResultSetUpdate) UnoRuntime.queryInterface( XResultSetUpdate.class, m_rowSet );
++                final XRowUpdate rowUpdate = (XRowUpdate) UnoRuntime.queryInterface(XRowUpdate.class, m_rowSet );
+                 final PrintWriter logF = log ;
+                 tEnv.addObjRelation( "XRowSetApproveBroadcaster.ApproveChecker",
+                     new ifc.sdb._XRowSetApproveBroadcaster.RowSetApproveChecker()
+@@ -371,7 +371,7 @@ public class ORowSet extends TestCase {
+                                 // since we gave the row set a parametrized statement, we need to ensure the
+                                 // parameter is actually filled, otherwise we would get an empty result set,
+                                 // which would imply some further tests failing
+-                                XParameters rowSetParams = UnoRuntime.queryInterface( XParameters.class, resultSet );
++                                XParameters rowSetParams = (XParameters) UnoRuntime.queryInterface( XParameters.class, resultSet );
+                                 rowSetParams.setString( 1, "String2" );
+                                 rowSet.execute();
+                                 resultSet.first();
+@@ -425,13 +425,13 @@ public class ORowSet extends TestCase {
+             tEnv.addObjRelation( "XParameters.ParamValues", new Vector() );
+ 
+             // Adding relation for XRowUpdate
+-            final XRow row = UnoRuntime.queryInterface( XRow.class, m_rowSet );
++            final XRow row = (XRow) UnoRuntime.queryInterface( XRow.class, m_rowSet );
+             tEnv.addObjRelation("XRowUpdate.XRow", row);
+ 
+             // Adding relation for XResultSetUpdate
+             {
+-                final XResultSet resultSet = UnoRuntime.queryInterface( XResultSet.class, m_rowSet );
+-                final XRowUpdate rowUpdate = UnoRuntime.queryInterface( XRowUpdate.class, m_rowSet );
++                final XResultSet resultSet = (XResultSet) UnoRuntime.queryInterface( XResultSet.class, m_rowSet );
++                final XRowUpdate rowUpdate = (XRowUpdate) UnoRuntime.queryInterface( XRowUpdate.class, m_rowSet );
+ 
+                 tEnv.addObjRelation("XResultSetUpdate.UpdateTester",
+                     new ifc.sdbc._XResultSetUpdate.UpdateTester()
+@@ -517,11 +517,11 @@ public class ORowSet extends TestCase {
+ 
+             doing = "closing database document";
+             log.println( doing );
+-            XModel databaseDocModel = UnoRuntime.queryInterface( XModel.class,
++            XModel databaseDocModel = (XModel) UnoRuntime.queryInterface( XModel.class,
+                 m_dataSource.getDatabaseDocument().getDatabaseDocument() );
+             String documentFile = databaseDocModel.getURL();
+ 
+-            XCloseable closeModel = UnoRuntime.queryInterface( XCloseable.class,
++            XCloseable closeModel = (XCloseable) UnoRuntime.queryInterface( XCloseable.class,
+                 m_dataSource.getDatabaseDocument().getDatabaseDocument() );
+             closeModel.close( true );
+ 
+@@ -529,7 +529,7 @@ public class ORowSet extends TestCase {
+             {
+                 doing = "disposing row set";
+                 log.println( doing );
+-                XComponent rowSetComponent = UnoRuntime.queryInterface( XComponent.class, m_rowSet );
++                XComponent rowSetComponent = (XComponent) UnoRuntime.queryInterface( XComponent.class, m_rowSet );
+                 rowSetComponent.dispose();
+             }
+ 
+@@ -608,13 +608,13 @@ public class ORowSet extends TestCase {
+             for(int i=0; i<xCont.length; i++) {
+                 if (abort) {
+                     XInteractionAbort xAbort = null;
+-                    xAbort = UnoRuntime.queryInterface(XInteractionAbort.class, xCont[i]);
++                    xAbort = (XInteractionAbort) UnoRuntime.queryInterface(XInteractionAbort.class, xCont[i]);
+                     if (xAbort != null)
+                         xAbort.select();
+                         return;
+                 }
+                 else {
+-                    xParamCallback = UnoRuntime.queryInterface(XInteractionSupplyParameters.class, xCont[i]);
++                    xParamCallback = (XInteractionSupplyParameters) UnoRuntime.queryInterface(XInteractionSupplyParameters.class, xCont[i]);
+                     if (xParamCallback != null)
+                         break;
+                 }
+diff -purN qadevOOo.old/tests/java/mod/_dbaccess/TableWindowAccessibility.java qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java
+--- qadevOOo.old/tests/java/mod/_dbaccess/TableWindowAccessibility.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java	2010-09-07 13:52:50.000000000 +0200
+@@ -300,7 +300,7 @@ public class TableWindowAccessibility ex
          
--        param.put(util.PropertyName.OFFICE_CLOSE_TIME_OUT, 2000);
-+        param.put(util.PropertyName.OFFICE_CLOSE_TIME_OUT, new Integer(2000));
-         // run through all documents found in Inputpath
-         foreachDocumentinInputPath(aParam);
-     }
+         QueryComponent = DesktopTools.loadDoc((XMultiServiceFactory) Param.getMSF (),".component:DB/QueryDesign",loadProps);
+         
+-        xWindow = UnoRuntime.queryInterface(XModel.class, QueryComponent).
++        xWindow = ((XModel) UnoRuntime.queryInterface(XModel.class, QueryComponent)).
+             getCurrentController().getFrame().getContainerWindow();
+ 
+         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);        
+diff -purN qadevOOo.old/tests/java/mod/_svtools/AccessibleTabBar.java qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java
+--- qadevOOo.old/tests/java/mod/_svtools/AccessibleTabBar.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java	2010-09-07 13:52:50.000000000 +0200
+@@ -112,7 +112,7 @@ public class AccessibleTabBar extends Te
+ 
+         shortWait();
+ 
+-        XWindow xWindow = UnoRuntime.queryInterface(XModel.class, xDoc).
++        XWindow xWindow = ((XModel) UnoRuntime.queryInterface(XModel.class, xDoc)).
+             getCurrentController().getFrame().getContainerWindow();
+ 
+         XAccessible xRoot = at.getAccessibleObject(xWindow);
+diff -purN qadevOOo.old/tests/java/mod/_toolkit/AccessibleMenuBar.java qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java
+--- qadevOOo.old/tests/java/mod/_toolkit/AccessibleMenuBar.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java	2010-09-07 13:52:50.000000000 +0200
+@@ -87,7 +87,7 @@ public class AccessibleMenuBar extends T
+ 
+         AccessibilityTools at = new AccessibilityTools();
+ 
+-        XWindow xWindow = UnoRuntime.queryInterface(XModel.class, xTextDoc).
++        XWindow xWindow = ((XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc)).
+             getCurrentController().getFrame().getContainerWindow();
+ 
+         XAccessible xRoot = at.getAccessibleObject(xWindow);
+diff -purN qadevOOo.old/tests/java/mod/_toolkit/AccessibleMenu.java qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java
+--- qadevOOo.old/tests/java/mod/_toolkit/AccessibleMenu.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java	2010-09-07 13:52:50.000000000 +0200
+@@ -104,7 +104,7 @@ public class AccessibleMenu extends Test
+ 
+         shortWait();
+ 
+-        XWindow xWindow = UnoRuntime.queryInterface(XModel.class, xTextDoc).
++        XWindow xWindow = ((XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc)).
+             getCurrentController().getFrame().getContainerWindow();
+ 
+         AccessibilityTools at = new AccessibilityTools();
+diff -purN qadevOOo.old/tests/java/mod/_toolkit/AccessibleMenuSeparator.java qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java
+--- qadevOOo.old/tests/java/mod/_toolkit/AccessibleMenuSeparator.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java	2010-09-07 13:52:50.000000000 +0200
+@@ -87,7 +87,7 @@ public class AccessibleMenuSeparator ext
+ 
+         AccessibilityTools at = new AccessibilityTools();
+ 
+-        XWindow xWindow = UnoRuntime.queryInterface(XModel.class, xTextDoc).
++        XWindow xWindow = ((XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc)).
+             getCurrentController().getFrame().getContainerWindow();
+ 
+         XAccessible xRoot = at.getAccessibleObject(xWindow);
+diff -purN qadevOOo.old/tests/java/mod/_toolkit/AccessibleStatusBar.java qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java
+--- qadevOOo.old/tests/java/mod/_toolkit/AccessibleStatusBar.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java	2010-09-07 13:52:50.000000000 +0200
+@@ -149,7 +149,7 @@ public class AccessibleStatusBar extends
+         AccessibilityTools at = new AccessibilityTools();
+ 
+         final XWindow xWindow =
+-            UnoRuntime.queryInterface(XModel.class, xTextDoc).
++            ((XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc)).
+             getCurrentController().getFrame().getContainerWindow();
+ 
+         XAccessible xRoot = at.getAccessibleObject(xWindow);
+diff -purN qadevOOo.old/tests/java/mod/_toolkit/AccessibleToolBox.java qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java
+--- qadevOOo.old/tests/java/mod/_toolkit/AccessibleToolBox.java	2010-08-24 17:01:40.000000000 +0200
++++ qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java	2010-09-07 13:52:50.000000000 +0200
+@@ -141,7 +141,7 @@ public class AccessibleToolBox extends T
+         
+         XInterface oObj = null;
+         
+-        XWindow xWindow = UnoRuntime.queryInterface(XModel.class, xTextDoc).
++        XWindow xWindow = ((XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc)).
+             getCurrentController().getFrame().getContainerWindow();
+         
+         AccessibilityTools at = new AccessibilityTools();
diff --git a/patches/dev300/build-java-1.4-wizards.diff b/patches/dev300/build-java-1.4-wizards.diff
index 5ee3928..c617ca4 100644
--- a/patches/dev300/build-java-1.4-wizards.diff
+++ b/patches/dev300/build-java-1.4-wizards.diff
@@ -1,31 +1,202 @@
---- wizards/com/sun/star/wizards/db/TypeInspector.java.old	2009-09-10 19:49:19.000000000 +0200
-+++ wizards/com/sun/star/wizards/db/TypeInspector.java	2009-10-01 20:13:53.000000000 +0200
-@@ -80,14 +80,14 @@ public class TypeInspector
+diff -purN wizards.old/com/sun/star/wizards/common/Desktop.java wizards/com/sun/star/wizards/common/Desktop.java
+--- wizards.old/com/sun/star/wizards/common/Desktop.java	2010-08-25 22:34:06.000000000 +0200
++++ wizards/com/sun/star/wizards/common/Desktop.java	2010-09-07 20:11:52.000000000 +0200
+@@ -181,8 +181,8 @@ public class Desktop
+     {
+         XMultiComponentFactory componentFactory = getMultiComponentFactory();
+         Object xUrlResolver = componentFactory.createInstanceWithContext( "com.sun.star.bridge.UnoUrlResolver", null );
+-        XUnoUrlResolver urlResolver = UnoRuntime.queryInterface(XUnoUrlResolver.class, xUrlResolver);
+-        XMultiServiceFactory orb = UnoRuntime.queryInterface(XMultiServiceFactory.class, urlResolver.resolve( connectStr ) );
++        XUnoUrlResolver urlResolver = (XUnoUrlResolver) UnoRuntime.queryInterface(XUnoUrlResolver.class, xUrlResolver);
++        XMultiServiceFactory orb = (XMultiServiceFactory) UnoRuntime.queryInterface(XMultiServiceFactory.class, urlResolver.resolve( connectStr ) );
+         return orb;
+     }
+ 
+diff -purN wizards.old/com/sun/star/wizards/common/FileAccess.java wizards/com/sun/star/wizards/common/FileAccess.java
+--- wizards.old/com/sun/star/wizards/common/FileAccess.java	2010-08-25 22:34:06.000000000 +0200
++++ wizards/com/sun/star/wizards/common/FileAccess.java	2010-09-07 20:11:37.000000000 +0200
+@@ -213,12 +213,12 @@ public class FileAccess
+         return ResultPath;
+     }
+ 
+-    public static ArrayList<String> getOfficePaths(XMultiServiceFactory xMSF, String _sPath, String sType, String sSearchDir) throws NoValidPathException
++    public static ArrayList getOfficePaths(XMultiServiceFactory xMSF, String _sPath, String sType, String sSearchDir) throws NoValidPathException
+     {
+         //This method currently only works with sPath="Template"
+ 
+         // String ResultPath = "";
+-        ArrayList<String> aPathList = new ArrayList<String>();
++        ArrayList aPathList = new ArrayList();
+         String Template_writable = "";
+         String[] Template_internal;
+         String[] Template_user;
+@@ -607,8 +607,8 @@ public class FileAccess
+         String[][] LocLayoutFiles = new String[2][]; //{"",""}{""};
          try
          {
-             xResultSet = _xResultSet;
--            Vector<String> aTypeNameVector = new Vector<String>();
--            Vector<Integer> aTypeVector = new Vector<Integer>();
--            Vector<Integer> aNullableVector = new Vector<Integer>();
--            Vector<Boolean> aAutoIncrementVector = new Vector<Boolean>();
--            Vector<Integer> aPrecisionVector = new Vector<Integer>();
--            Vector<Integer> aMinScaleVector = new Vector<Integer>();
--            Vector<Integer> aMaxScaleVector = new Vector<Integer>();
--            Vector<Integer> aSearchableVector = new Vector<Integer>();
-+            Vector aTypeNameVector = new Vector();
-+            Vector aTypeVector = new Vector();
-+            Vector aNullableVector = new Vector();
-+            Vector aAutoIncrementVector = new Vector();
-+            Vector aPrecisionVector = new Vector();
-+            Vector aMinScaleVector = new Vector();
-+            Vector aMaxScaleVector = new Vector();
-+            Vector aSearchableVector = new Vector();
-             // Integer[] aIntegerDataTypes = null;
- //      XResultSet xResultSet = xDBMetaDagetTypeInfo();
-             XRow xRow = (XRow) UnoRuntime.queryInterface(XRow.class, xResultSet);
---- wizards/com/sun/star/wizards/db/CommandMetaData.java.old	2009-09-10 19:49:19.000000000 +0200
-+++ wizards/com/sun/star/wizards/db/CommandMetaData.java	2009-10-01 20:12:40.000000000 +0200
-@@ -298,7 +298,7 @@ public class CommandMetaData extends DBM
+-            java.util.Vector<String> TitleVector = null;
+-            java.util.Vector<String> NameVector = null;
++            java.util.Vector TitleVector = null;
++            java.util.Vector NameVector = null;
+ 
+             XInterface xDocInterface = (XInterface) xMSF.createInstance("com.sun.star.document.DocumentProperties");
+             XDocumentProperties xDocProps = (XDocumentProperties) UnoRuntime.queryInterface(XDocumentProperties.class, xDocInterface);
+@@ -618,8 +618,8 @@ public class FileAccess
+ 
+             String[] nameList = xSimpleFileAccess.getFolderContents(FolderName, false);
+ 
+-            TitleVector = new java.util.Vector<String>(/*nameList.length*/);
+-            NameVector = new java.util.Vector<String>(nameList.length);
++            TitleVector = new java.util.Vector(/*nameList.length*/);
++            NameVector = new java.util.Vector(nameList.length);
+ 
+             FilterName = FilterName == null || FilterName.equals("") ? null : FilterName + "-";
+ 
+@@ -737,8 +737,8 @@ public class FileAccess
+         {
+             throw new NoValidPathException(null, "Path not given.");
+         }
+-        ArrayList<String> TitleVector = new ArrayList<String>();
+-        ArrayList<String> URLVector = new ArrayList<String>();
++        ArrayList TitleVector = new ArrayList();
++        ArrayList URLVector = new ArrayList();
+ 
+         com.sun.star.ucb.XSimpleFileAccess xSimpleFileAccess = null;
+         try
+@@ -1138,7 +1138,7 @@ public class FileAccess
+         String[] sFileData = null;
+         try
+         {
+-            Vector<String> oDataVector = new Vector<String>();
++            Vector oDataVector = new Vector();
+             Object oSimpleFileAccess = _xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess");
+             XSimpleFileAccess xSimpleFileAccess = (XSimpleFileAccess) com.sun.star.uno.UnoRuntime.queryInterface(XSimpleFileAccess.class, oSimpleFileAccess);
+             if (xSimpleFileAccess.exists(_filepath))
+diff -purN wizards.old/com/sun/star/wizards/common/JavaTools.java wizards/com/sun/star/wizards/common/JavaTools.java
+--- wizards.old/com/sun/star/wizards/common/JavaTools.java	2010-08-25 22:34:06.000000000 +0200
++++ wizards/com/sun/star/wizards/common/JavaTools.java	2010-09-07 20:11:37.000000000 +0200
+@@ -139,7 +139,7 @@ public class JavaTools
+      * @param _aIntegerVector
+      * @return
+      */
+-    public static int[] IntegerTointList(Vector<Integer> _aIntegerVector)
++    public static int[] IntegerTointList(Vector _aIntegerVector)
+     {
+         try
+         {
+@@ -165,7 +165,7 @@ public class JavaTools
+      * @param _aBooleanVector
+      * @return
+      */
+-    public static boolean[] BooleanTobooleanList(Vector<Boolean> _aBooleanVector)
++    public static boolean[] BooleanTobooleanList(Vector _aBooleanVector)
+     {
+         try
+         {
+diff -purN wizards.old/com/sun/star/wizards/common/NamedValueCollection.java wizards/com/sun/star/wizards/common/NamedValueCollection.java
+--- wizards.old/com/sun/star/wizards/common/NamedValueCollection.java	2010-08-25 22:34:06.000000000 +0200
++++ wizards/com/sun/star/wizards/common/NamedValueCollection.java	2010-09-07 20:11:52.000000000 +0200
+@@ -20,7 +20,7 @@ import java.util.Map.Entry;
+  */
+ public class NamedValueCollection
+ {
+-    final private HashMap< String, Object >    m_values = new HashMap< String, Object >();
++    final private HashMap    m_values = new HashMap();
+ 
+     public NamedValueCollection()
+     {
+@@ -37,28 +37,26 @@ public class NamedValueCollection
+         m_values.put( i_name, i_value );
+     }
+ 
+-    @SuppressWarnings("unchecked")
+-    public final < T extends Object > T getOrDefault( final String i_key, final T i_default )
++    public final Object getOrDefault( final String i_key, final Object i_default )
+     {
+         if ( m_values.containsKey( i_key ) )
+         {
+             final Object value = m_values.get( i_key );
+             try
+             {
+-                return (T)value;
++                return value;
+             }
+             catch ( ClassCastException e ) { }
+         }
+         return i_default;
+     }
+ 
+-    @SuppressWarnings("unchecked")
+-    public final < T extends XInterface > T queryOrDefault( final String i_key, final T i_default, Class i_interfaceClass )
++    public final XInterface queryOrDefault( final String i_key, final XInterface i_default, Class i_interfaceClass )
+     {
+         if ( m_values.containsKey( i_key ) )
+         {
+             final Object value = m_values.get( i_key );
+-            return (T)UnoRuntime.queryInterface( i_interfaceClass, value );
++            return (XInterface) UnoRuntime.queryInterface( i_interfaceClass, value );
+         }
+         return i_default;
+     }
+@@ -72,15 +70,15 @@ public class NamedValueCollection
+     {
+         PropertyValue[] values = new PropertyValue[ m_values.size() ];
+ 
+-        Iterator< Entry< String, Object > > iter = m_values.entrySet().iterator();
++        Iterator iter = m_values.entrySet().iterator();
+         int i = 0;
+         while ( iter.hasNext() )
+         {
+-            Entry< String, Object > entry = iter.next();
++            Entry entry = (Entry) iter.next();
+             values[i++] = new PropertyValue(
+-                entry.getKey(),
++                (String) entry.getKey(),
+                 0,
+-                entry.getValue(),
++                (String) entry.getValue(),
+                 PropertyState.DIRECT_VALUE
+             );
+         }
+diff -purN wizards.old/com/sun/star/wizards/common/PropertySetHelper.java wizards/com/sun/star/wizards/common/PropertySetHelper.java
+--- wizards.old/com/sun/star/wizards/common/PropertySetHelper.java	2010-08-25 22:34:06.000000000 +0200
++++ wizards/com/sun/star/wizards/common/PropertySetHelper.java	2010-09-07 20:11:37.000000000 +0200
+@@ -41,7 +41,7 @@ public class PropertySetHelper
+ {
+ 
+     protected XPropertySet m_xPropertySet;
+-    private HashMap<String, Object> m_aHashMap;
++    private HashMap m_aHashMap;
+ 
+     public PropertySetHelper(Object _aObj)
+     {
+@@ -52,11 +52,11 @@ public class PropertySetHelper
+         m_xPropertySet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, _aObj);
+     }
+ 
+-    private HashMap<String, Object> getHashMap()
++    private HashMap getHashMap()
+     {
+         if (m_aHashMap == null)
+         {
+-            m_aHashMap = new HashMap<String, Object>();
++            m_aHashMap = new HashMap();
+         }
+         return m_aHashMap;
+     }
+diff -purN wizards.old/com/sun/star/wizards/db/CommandMetaData.java wizards/com/sun/star/wizards/db/CommandMetaData.java
+--- wizards.old/com/sun/star/wizards/db/CommandMetaData.java	2010-08-25 22:34:06.000000000 +0200
++++ wizards/com/sun/star/wizards/db/CommandMetaData.java	2010-09-07 20:11:52.000000000 +0200
+@@ -149,7 +149,7 @@ public class CommandMetaData extends DBM
+                 String CurCommandName = CurFieldColumn.getCommandName();
+                 CommandObject oCommand = getTableByName(CurCommandName);
+                 Object oColumn = oCommand.getColumns().getByName(CurFieldColumn.getFieldName());
+-                XPropertySet xColumn = UnoRuntime.queryInterface( XPropertySet.class, oColumn );
++                XPropertySet xColumn = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, oColumn );
+                 return xColumn;
+             } 
+             catch (Exception exception) 
+@@ -293,7 +293,7 @@ public class CommandMetaData extends DBM
              try 
              {
                  // Object oField;
@@ -34,7 +205,7 @@
                  String[] FieldNames;
                  CommandObject oCommand = this.getCommandByName(_commandname, _commandtype);
                  FieldNames = oCommand.getColumns().getElementNames();
-@@ -347,7 +347,7 @@ public class CommandMetaData extends DBM
+@@ -342,7 +342,7 @@ public class CommandMetaData extends DBM
  
      public String[] getOrderableColumns(String[] _fieldnames)
          {
@@ -43,7 +214,7 @@
              int ncount = 0;
              for (int i = 0; i < _fieldnames.length; i++)
              {
-@@ -424,7 +424,7 @@ public class CommandMetaData extends DBM
+@@ -419,7 +419,7 @@ public class CommandMetaData extends DBM
          {
              try 
              {
@@ -52,7 +223,7 @@
                  for (int i = 0; i < FieldColumns.length; i++) 
                  {
                      if (isnumeric(FieldColumns[i]))
-@@ -445,7 +445,7 @@ public class CommandMetaData extends DBM
+@@ -440,7 +440,7 @@ public class CommandMetaData extends DBM
  
      public String[] getFieldNames(String[] _sDisplayFieldNames, String _sCommandName)
          {
@@ -61,7 +232,7 @@
              for (int i = 0; i < FieldColumns.length; i++) 
              {
                  if (_sCommandName.equals(FieldColumns[i].getCommandName())) 
-@@ -488,7 +488,7 @@ public class CommandMetaData extends DBM
+@@ -483,7 +483,7 @@ public class CommandMetaData extends DBM
          {
              try 
              {
@@ -70,18 +241,463 @@
                  for (int i = 0; i < FieldColumns.length; i++) 
                  {
                      if (JavaTools.FieldInTable(AggregateFieldNames, FieldColumns[i].getDisplayFieldName()) == -1)
-@@ -689,7 +689,7 @@ public class CommandMetaData extends DBM
+@@ -626,13 +626,13 @@ public class CommandMetaData extends DBM
                  {
                      if (xDBMetaData.supportsIntegrityEnhancementFacility())
                      {
 -                        java.util.Vector<String> TableVector = new java.util.Vector<String>();
 +                        java.util.Vector TableVector = new java.util.Vector();
                          Object oTable = getTableNamesAsNameAccess().getByName(_stablename);
-                         XKeysSupplier xKeysSupplier = UnoRuntime.queryInterface( XKeysSupplier.class, oTable );
+-                        XKeysSupplier xKeysSupplier = UnoRuntime.queryInterface( XKeysSupplier.class, oTable );
++                        XKeysSupplier xKeysSupplier = (XKeysSupplier) UnoRuntime.queryInterface( XKeysSupplier.class, oTable );
                          xIndexKeys = xKeysSupplier.getKeys();
---- wizards/com/sun/star/wizards/form/FieldLinker.java.old	2009-09-10 19:49:19.000000000 +0200
-+++ wizards/com/sun/star/wizards/form/FieldLinker.java	2009-10-01 20:50:58.000000000 +0200
-@@ -121,7 +121,7 @@ public class FieldLinker extends DBLimit
+                         for (int i = 0; i < xIndexKeys.getCount(); i++)
+                         {
+-                            XPropertySet xPropertySet = UnoRuntime.queryInterface( XPropertySet.class, xIndexKeys.getByIndex( i ) );
++                            XPropertySet xPropertySet = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, xIndexKeys.getByIndex( i ) );
+                             int curtype = AnyConverter.toInt(xPropertySet.getPropertyValue("Type"));
+                             if (curtype == KeyType.FOREIGN)
+                             {
+@@ -671,7 +671,7 @@ public class CommandMetaData extends DBM
+             {
+                 for (int i = 0; i < xIndexKeys.getCount(); i++)
+                 {
+-                    XPropertySet xPropertySet = UnoRuntime.queryInterface( XPropertySet.class, xIndexKeys.getByIndex( i ) );
++                    XPropertySet xPropertySet = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, xIndexKeys.getByIndex( i ) );
+                     int curtype = AnyConverter.toInt(xPropertySet.getPropertyValue("Type"));
+                     if (curtype == KeyType.FOREIGN)
+                     {
+@@ -680,14 +680,14 @@ public class CommandMetaData extends DBM
+                         {
+                             if (scurreftablename.equals(_sreferencedtablename))
+                             {
+-                                XColumnsSupplier xColumnsSupplier = UnoRuntime.queryInterface( XColumnsSupplier.class, xPropertySet );
++                                XColumnsSupplier xColumnsSupplier = (XColumnsSupplier) UnoRuntime.queryInterface( XColumnsSupplier.class, xPropertySet );
+                                 String[] smastercolnames = xColumnsSupplier.getColumns().getElementNames();
+                                 skeycolumnnames = new String[2][smastercolnames.length];
+                                 skeycolumnnames[0] = smastercolnames;
+                                 skeycolumnnames[1] = new String[smastercolnames.length];
+                                 for (int n = 0; n < smastercolnames.length; n++)
+                                 {
+-                                    XPropertySet xcolPropertySet = UnoRuntime.queryInterface( XPropertySet.class, xColumnsSupplier.getColumns().getByName( smastercolnames[n] ) );
++                                    XPropertySet xcolPropertySet = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, xColumnsSupplier.getColumns().getByName( smastercolnames[n] ) );
+                                     skeycolumnnames[1][n] = AnyConverter.toString(xcolPropertySet.getPropertyValue("RelatedColumn"));
+                                 }
+                                 return skeycolumnnames;
+diff -purN wizards.old/com/sun/star/wizards/db/DatabaseObjectWizard.java wizards/com/sun/star/wizards/db/DatabaseObjectWizard.java
+--- wizards.old/com/sun/star/wizards/db/DatabaseObjectWizard.java	2010-08-25 22:34:06.000000000 +0200
++++ wizards/com/sun/star/wizards/db/DatabaseObjectWizard.java	2010-09-07 20:11:52.000000000 +0200
+@@ -36,16 +36,16 @@ public abstract class DatabaseObjectWiza
+         m_wizardContext = i_wizardContext;
+ 
+         final NamedValueCollection wizardContext = new NamedValueCollection( m_wizardContext );
+-        m_docUI = wizardContext.queryOrDefault( "DocumentUI", (XDatabaseDocumentUI)null, XDatabaseDocumentUI.class );
++        m_docUI = (XDatabaseDocumentUI) wizardContext.queryOrDefault( "DocumentUI", (XDatabaseDocumentUI)null, XDatabaseDocumentUI.class );
+ 
+         if ( m_docUI != null )
+         {
+-            XController docController = UnoRuntime.queryInterface( XController.class, m_docUI );
++            XController docController = (XController) UnoRuntime.queryInterface( XController.class, m_docUI );
+             m_frame = docController.getFrame();
+         }
+         else
+         {
+-            XFrame parentFrame = wizardContext.queryOrDefault( "ParentFrame", (XFrame)null, XFrame.class );
++            XFrame parentFrame = (XFrame) wizardContext.queryOrDefault( "ParentFrame", (XFrame)null, XFrame.class );
+             if ( parentFrame != null )
+                 m_frame = parentFrame;
+             else
+diff -purN wizards.old/com/sun/star/wizards/db/DBMetaData.java wizards/com/sun/star/wizards/db/DBMetaData.java
+--- wizards.old/com/sun/star/wizards/db/DBMetaData.java	2010-08-25 22:34:06.000000000 +0200
++++ wizards/com/sun/star/wizards/db/DBMetaData.java	2010-09-07 20:11:52.000000000 +0200
+@@ -218,9 +218,9 @@ public class DBMetaData
+         {
+             this.xMSF = xMSF;
+             xDatabaseContext = (XInterface) xMSF.createInstance("com.sun.star.sdb.DatabaseContext");
+-            xNameAccess = UnoRuntime.queryInterface( XNameAccess.class, xDatabaseContext );
++            xNameAccess = (XNameAccess) UnoRuntime.queryInterface( XNameAccess.class, xDatabaseContext );
+             XInterface xInteractionHandler = (XInterface) xMSF.createInstance("com.sun.star.task.InteractionHandler");
+-            oInteractionHandler = UnoRuntime.queryInterface( XInteractionHandler.class, xInteractionHandler );
++            oInteractionHandler = (XInteractionHandler) UnoRuntime.queryInterface( XInteractionHandler.class, xInteractionHandler );
+             DataSourceNames = xNameAccess.getElementNames();
+         }
+         catch (Exception exception)
+@@ -261,7 +261,6 @@ public class DBMetaData
+         return getTableNamesAsNameAccess().hasByName(_stablename);
+     }
+ 
+-    @SuppressWarnings("unchecked")
+     public void setTableByName(String _tableName)
+     {
+         CommandObject oTableObject = new CommandObject(_tableName, com.sun.star.sdb.CommandType.TABLE);
+@@ -330,10 +329,10 @@ public class DBMetaData
+                 {
+                     oCommand = getQueryNamesAsNameAccess().getByName(Name);
+                 }

... etc. - the rest is truncated


More information about the ooo-build-commit mailing list