Merge commit 'ooo/DEV300_m106' into libreoffice-3-4

Conflicts:
extensions/source/svg/svgaction.cxx
extensions/source/svg/svgaction.hxx
extensions/source/svg/svgcom.hxx
extensions/source/svg/svgprinter.cxx
extensions/source/svg/svgprinter.hxx
extensions/source/svg/svguno.cxx
extensions/source/svg/svgwriter.cxx
extensions/source/svg/svgwriter.hxx
javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationOngoingCtrl.java
javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java
javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java
package/inc/ZipFile.hxx
package/inc/ZipOutputStream.hxx
package/inc/ZipPackage.hxx
package/inc/ZipPackageStream.hxx
package/source/manifest/ManifestExport.cxx
package/source/manifest/ManifestImport.cxx
package/source/manifest/UnoRegister.cxx
package/source/xstor/owriteablestream.cxx
package/source/xstor/xstorage.cxx
package/source/xstor/xstorage.hxx
package/source/zipapi/EntryInputStream.cxx
package/source/zipapi/EntryInputStream.hxx
package/source/zipapi/XFileStream.cxx
package/source/zipapi/XFileStream.hxx
package/source/zipapi/XMemoryStream.cxx
package/source/zipapi/XUnbufferedStream.cxx
package/source/zipapi/XUnbufferedStream.hxx
package/source/zipapi/ZipFile.cxx
package/source/zipapi/ZipOutputStream.cxx
package/source/zipapi/sha1context.hxx
package/source/zippackage/ZipPackage.cxx
package/source/zippackage/ZipPackageFolder.cxx
package/source/zippackage/ZipPackageStream.cxx
setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
xmlsecurity/prj/build.lst
xmlsecurity/source/helper/xmlsignaturehelper.cxx
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx

1 files changed, 36 insertions, 44 deletions

diff --git a/wizards/com/sun/star/wizards/common/Desktop.java b/wizards/com/sun/star/wizards/common/Desktop.java
index 8902696c37b4..13de04381155 100644
--- a/wizards/com/sun/star/wizards/common/Desktop.java
+++ b/wizards/com/sun/star/wizards/common/Desktop.java
@@ -76,7 +76,7 @@ public class Desktop
             try
             {
                 xInterface = (com.sun.star.uno.XInterface) xMSF.createInstance("com.sun.star.frame.Desktop");
-                xDesktop = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, xInterface);
+                xDesktop = UnoRuntime.queryInterface(XDesktop.class, xInterface);
             }
             catch (Exception exception)
             {
@@ -93,27 +93,26 @@ public class Desktop
     public static XFrame getActiveFrame(XMultiServiceFactory xMSF)
     {
         XDesktop xDesktop = getDesktop(xMSF);
-        XFramesSupplier xFrameSuppl = (XFramesSupplier) UnoRuntime.queryInterface(XFramesSupplier.class, xDesktop);
-        XFrame xFrame = xFrameSuppl.getActiveFrame();
-        return xFrame;
+        XFramesSupplier xFrameSuppl = UnoRuntime.queryInterface(XFramesSupplier.class, xDesktop);
+        return xFrameSuppl.getActiveFrame();
     }
 
     public static XComponent getActiveComponent(XMultiServiceFactory _xMSF)
     {
         XFrame xFrame = getActiveFrame(_xMSF);
-        return (XComponent) UnoRuntime.queryInterface(XComponent.class, xFrame.getController().getModel());
+        return UnoRuntime.queryInterface(XComponent.class, xFrame.getController().getModel());
     }
 
     public static XTextDocument getActiveTextDocument(XMultiServiceFactory _xMSF)
     {
         XComponent xComponent = getActiveComponent(_xMSF);
-        return (XTextDocument) UnoRuntime.queryInterface(XTextDocument.class, xComponent);
+        return UnoRuntime.queryInterface(XTextDocument.class, xComponent);
     }
 
     public static XSpreadsheetDocument getActiveSpreadsheetDocument(XMultiServiceFactory _xMSF)
     {
         XComponent xComponent = getActiveComponent(_xMSF);
-        return (XSpreadsheetDocument) UnoRuntime.queryInterface(XSpreadsheetDocument.class, xComponent);
+        return UnoRuntime.queryInterface(XSpreadsheetDocument.class, xComponent);
     }
 
     public static XDispatch getDispatcher(XMultiServiceFactory xMSF, XFrame xFrame, String _stargetframe, com.sun.star.util.URL oURL)
@@ -122,9 +121,8 @@ public class Desktop
         {
             com.sun.star.util.URL[] oURLArray = new com.sun.star.util.URL[1];
             oURLArray[0] = oURL;
-            XDispatchProvider xDispatchProvider = (XDispatchProvider) UnoRuntime.queryInterface(XDispatchProvider.class, xFrame);
-            XDispatch xDispatch = xDispatchProvider.queryDispatch(oURLArray[0], _stargetframe, FrameSearchFlag.ALL); // "_self"
-            return xDispatch;
+            XDispatchProvider xDispatchProvider = UnoRuntime.queryInterface(XDispatchProvider.class, xFrame);
+            return xDispatchProvider.queryDispatch(oURLArray[0], _stargetframe, FrameSearchFlag.ALL); // "_self"
         }
         catch (Exception e)
         {
@@ -138,7 +136,7 @@ public class Desktop
         try
         {
             Object oTransformer = xMSF.createInstance("com.sun.star.util.URLTransformer");
-            XURLTransformer xTransformer = (XURLTransformer) UnoRuntime.queryInterface(XURLTransformer.class, oTransformer);
+            XURLTransformer xTransformer = UnoRuntime.queryInterface(XURLTransformer.class, oTransformer);
             com.sun.star.util.URL[] oURL = new com.sun.star.util.URL[1];
             oURL[0] = new com.sun.star.util.URL();
             oURL[0].Complete = _sURL;
@@ -161,7 +159,7 @@ public class Desktop
 
     public static void dispatchURL(XMultiServiceFactory xMSF, String sURL, XFrame xFrame)
     {
-        dispatchURL(xMSF, sURL, xFrame, "");
+        dispatchURL(xMSF, sURL, xFrame, PropertyNames.EMPTY_STRING);
     }
 
     public static void dispatchURL(XDispatch _xDispatch, com.sun.star.util.URL oURL)
@@ -182,20 +180,19 @@ 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 ) );
-        return orb;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, urlResolver.resolve( connectStr ) );
     }
 
     public static String getIncrementSuffix(XNameAccess xElementContainer, String ElementName)
     {
         boolean bElementexists = true;
         int i = 1;
-        String sIncSuffix = "";
+        String sIncSuffix = PropertyNames.EMPTY_STRING;
         String BaseName = ElementName;
-        while (bElementexists == true)
+        while (bElementexists)
         {
             bElementexists = xElementContainer.hasByName(ElementName);
-            if (bElementexists == true)
+            if (bElementexists)
             {
                 i += 1;
                 ElementName = BaseName + Integer.toString(i);
@@ -212,12 +209,12 @@ public class Desktop
     {
         boolean bElementexists = true;
         int i = 1;
-        String sIncSuffix = "";
+        String sIncSuffix = PropertyNames.EMPTY_STRING;
         String BaseName = ElementName;
-        while (bElementexists == true)
+        while (bElementexists)
         {
             bElementexists = xElementContainer.hasByHierarchicalName(ElementName);
-            if (bElementexists == true)
+            if (bElementexists)
             {
                 i += 1;
                 ElementName = BaseName + Integer.toString(i);
@@ -235,10 +232,9 @@ public class Desktop
         try
         {
             int nStartFlags = com.sun.star.i18n.KParseTokens.ANY_LETTER_OR_NUMBER + com.sun.star.i18n.KParseTokens.ASC_UNDERSCORE;
-            int nContFlags = nStartFlags;
             Object ocharservice = _xMSF.createInstance("com.sun.star.i18n.CharacterClassification");
-            XCharacterClassification xCharacterClassification = (XCharacterClassification) UnoRuntime.queryInterface(XCharacterClassification.class, ocharservice);
-            ParseResult aResult = xCharacterClassification.parsePredefinedToken(KParseType.IDENTNAME, _sString, 0, _aLocale, nStartFlags, "", nContFlags, " ");
+            XCharacterClassification xCharacterClassification = UnoRuntime.queryInterface(XCharacterClassification.class, ocharservice);
+            ParseResult aResult = xCharacterClassification.parsePredefinedToken(KParseType.IDENTNAME, _sString, 0, _aLocale, nStartFlags, PropertyNames.EMPTY_STRING, nStartFlags, PropertyNames.SPACE);
             return aResult.EndPos;
         }
         catch (Exception e)
@@ -258,7 +254,7 @@ public class Desktop
             if (i < snewname.length())
             {
                 String sspecialchar = snewname.substring(i, i + 1);
-                snewname = JavaTools.replaceSubString(snewname, "", sspecialchar);
+                snewname = JavaTools.replaceSubString(snewname, PropertyNames.EMPTY_STRING, sspecialchar);
             }
         }
         return snewname;
@@ -311,7 +307,7 @@ public class Desktop
         {
             return _sElementName;
         }
-        while (bElementexists == true)
+        while (bElementexists)
         {
             for (int i = 0; i < _slist.length; i++)
             {
@@ -322,7 +318,7 @@ public class Desktop
             }
             scompname = _sElementName + _sSuffixSeparator + a++;
         }
-        return "";
+        return PropertyNames.EMPTY_STRING;
     }
 
     /**
@@ -342,8 +338,8 @@ public class Desktop
             aNodePath[0] = new PropertyValue();
             aNodePath[0].Name = "nodepath";
             aNodePath[0].Value = KeyName;
-            XMultiServiceFactory xMSFConfig = (XMultiServiceFactory) UnoRuntime.queryInterface(XMultiServiceFactory.class, oConfigProvider);
-            if (bForUpdate == true)
+            XMultiServiceFactory xMSFConfig = UnoRuntime.queryInterface(XMultiServiceFactory.class, oConfigProvider);
+            if (bForUpdate)
             {
                 return (XInterface) xMSFConfig.createInstanceWithArguments("com.sun.star.configuration.ConfigurationUpdateAccess", aNodePath);
             }
@@ -377,9 +373,9 @@ public class Desktop
             try
             {
                 TemplatePath = FileAccess.getOfficePath(xMSF, "Template", "share", "/wizard");
-                UserTemplatePath = FileAccess.getOfficePath(xMSF, "Template", "user", "");
+                UserTemplatePath = FileAccess.getOfficePath(xMSF, "Template", "user", PropertyNames.EMPTY_STRING);
                 BitmapPath = FileAccess.combinePaths(xMSF, TemplatePath, "/../wizard/bitmap");
-                WorkPath = FileAccess.getOfficePath(xMSF, "Work", "", "");
+                WorkPath = FileAccess.getOfficePath(xMSF, "Work", PropertyNames.EMPTY_STRING, PropertyNames.EMPTY_STRING);
             }
             catch (NoValidPathException nopathexception)
             {
@@ -391,52 +387,48 @@ public class Desktop
     {
         try
         {
-            String sTemplatePath = FileAccess.getOfficePath(_xMSF, "Template", "share", "/wizard");
-            return sTemplatePath;
+            return FileAccess.getOfficePath(_xMSF, "Template", "share", "/wizard");
         }
         catch (NoValidPathException nopathexception)
         {
         }
-        return "";
+        return PropertyNames.EMPTY_STRING;
     }
 
     public static String getUserTemplatePath(XMultiServiceFactory _xMSF)
     {
         try
         {
-            String sUserTemplatePath = FileAccess.getOfficePath(_xMSF, "Template", "user", "");
-            return sUserTemplatePath;
+            return FileAccess.getOfficePath(_xMSF, "Template", "user", PropertyNames.EMPTY_STRING);
         }
         catch (NoValidPathException nopathexception)
         {
         }
-        return "";
+        return PropertyNames.EMPTY_STRING;
     }
 
     public static String getBitmapPath(XMultiServiceFactory _xMSF)
     {
         try
         {
-            String sBitmapPath = FileAccess.combinePaths(_xMSF, getTemplatePath(_xMSF), "/../wizard/bitmap");
-            return sBitmapPath;
+            return FileAccess.combinePaths(_xMSF, getTemplatePath(_xMSF), "/../wizard/bitmap");
         }
         catch (NoValidPathException nopathexception)
         {
         }
-        return "";
+        return PropertyNames.EMPTY_STRING;
     }
 
     public static String getWorkPath(XMultiServiceFactory _xMSF)
     {
         try
         {
-            String sWorkPath = FileAccess.getOfficePath(_xMSF, "Work", "", "");
-            return sWorkPath;
+            return FileAccess.getOfficePath(_xMSF, "Work", PropertyNames.EMPTY_STRING, PropertyNames.EMPTY_STRING);
         }
         catch (NoValidPathException nopathexception)
         {
         }
-        return "";
+        return PropertyNames.EMPTY_STRING;
     }
 
     public static XStringSubstitution createStringSubstitution(XMultiServiceFactory xMSF)
@@ -452,7 +444,7 @@ public class Desktop
         }
         if (xPathSubst != null)
         {
-            return (XStringSubstitution) UnoRuntime.queryInterface(XStringSubstitution.class, xPathSubst);
+            return UnoRuntime.queryInterface(XStringSubstitution.class, xPathSubst);
         }
         else
         {
@@ -495,7 +487,7 @@ public class Desktop
             {
 
                 Object comp = ((Any) e.nextElement()).getObject();
-                XModel xModel = (XModel) UnoRuntime.queryInterface(XModel.class, comp);
+                XModel xModel = UnoRuntime.queryInterface(XModel.class, comp);
                 XFrame xFrame = xModel.getCurrentController().getFrame();
 
                 if (xFrame != null && xFrame.getComponentWindow() != null)