misc. cleanup.

8 files changed, 40 insertions, 55 deletions

diff --git a/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64.java b/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64.java
index fab9fc3e56db..49b4c75fbd82 100644
--- a/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64.java
+++ b/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64.java
@@ -1,5 +1,3 @@
-package com.sun.star.comp.xsltfilter;
-
 /*
  * This file is part of the LibreOffice project.
  *
@@ -17,6 +15,9 @@ package com.sun.star.comp.xsltfilter;
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
+package com.sun.star.comp.xsltfilter;
+
 /**
  * <p>Encodes and decodes to and from Base64 notation.</p>
  * <p>Homepage: <a href="http://iharder.net/base64">http://iharder.net/base64</a>.</p>
@@ -44,7 +45,7 @@ package com.sun.star.comp.xsltfilter;
  *   Base64.InputStream class to encode and decode on the fly which uses
  *   less memory than encoding/decoding an entire file into memory before writing.</li>
  *  <li>v2.2.1 - Fixed bug using URL_SAFE and ORDERED encodings. Fixed bug
- *   when using very small files (~< 40 bytes).</li>
+ *   when using very small files (~&lt; 40 bytes).</li>
  *  <li>v2.2 - Added some helper methods for encoding/decoding directly from
  *   one file to the next. Also added a main() method to support command line
  *   encoding/decoding from one file to the next. Also added these Base64 dialects:
diff --git a/i18npool/source/localedata/data/so_SO.xml b/i18npool/source/localedata/data/so_SO.xml
index 8a4fd490cc9a..73de63760d1c 100644
--- a/i18npool/source/localedata/data/so_SO.xml
+++ b/i18npool/source/localedata/data/so_SO.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <!--
  * This file is part of the LibreOffice project.
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 58ede7bb6f10..bbffc8c3983f 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -98,25 +98,17 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         }
     }
 
-    //Only do something if the sunjavaplugin created this JavaInfo
-    rtl::OUString sVendor1(RTL_CONSTASCII_USTRINGPARAM("Sun Microsystems Inc."));
-    rtl::OUString sVendor9(RTL_CONSTASCII_USTRINGPARAM("Oracle Corporation"));
-    rtl::OUString sVendor2(RTL_CONSTASCII_USTRINGPARAM("IBM Corporation"));
-    rtl::OUString sVendor3(RTL_CONSTASCII_USTRINGPARAM("Blackdown Java-Linux Team"));
-    rtl::OUString sVendor4(RTL_CONSTASCII_USTRINGPARAM("Apple Inc."));
-    rtl::OUString sVendor5(RTL_CONSTASCII_USTRINGPARAM("Apple Computer, Inc."));
-    rtl::OUString sVendor6(RTL_CONSTASCII_USTRINGPARAM("BEA Systems, Inc."));
-    rtl::OUString sVendor7(RTL_CONSTASCII_USTRINGPARAM("Free Software Foundation, Inc."));
-    rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD Foundation"));
-    if ( ! (sVendor1.equals(pInfo->sVendor) == sal_True
-            || sVendor2.equals(pInfo->sVendor) == sal_True
-            || sVendor9.equals(pInfo->sVendor) == sal_True
-            || sVendor3.equals(pInfo->sVendor) == sal_True
-            || sVendor4.equals(pInfo->sVendor) == sal_True
-            || sVendor5.equals(pInfo->sVendor) == sal_True
-            || sVendor6.equals(pInfo->sVendor) == sal_True
-            || sVendor7.equals(pInfo->sVendor) == sal_True
-            || sVendor8.equals(pInfo->sVendor) == sal_True))
+    rtl::OUString aVendor( pInfo->sVendor );
+    // Only do something if the sunjavaplugin created this JavaInfo
+    if ( aVendor != "Sun Microsystems Inc." &&
+         aVendor != "Oracle Corporation" &&
+         aVendor != "IBM Corporation" &&
+         aVendor != "Blackdown Java-Linux Team" &&
+         aVendor != "Apple Inc." &&
+         aVendor != "Apple Computer, Inc." &&
+         aVendor != "BEA Systems, Inc." &&
+         aVendor != "Free Software Foundation, Inc." &&
+         aVendor != "The FreeBSD Foundation" )
         return 0;
 
     rtl::OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData);
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index 9e40e8a37d3b..6c2bc0f6d82d 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -25,14 +25,11 @@
 
 using namespace std;
 
-using ::rtl::OUString;
-using ::rtl::Reference;
-
 #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
 namespace jfw_plugin
 {
 
-Reference<VendorBase> SunInfo::createInstance()
+rtl::Reference<VendorBase> SunInfo::createInstance()
 {
     return new SunInfo;
 }
@@ -50,7 +47,7 @@ char const* const* SunInfo::getJavaExePaths(int * size)
         "jre/bin/java"
 #endif
     };
-        *size = SAL_N_ELEMENTS(ar);
+    *size = SAL_N_ELEMENTS(ar);
     return ar;
 }
 
@@ -68,7 +65,6 @@ char const* const* SunInfo::getRuntimePaths(int * size)
         "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
         "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so"
 #endif
-
     };
     *size = SAL_N_ELEMENTS(ar);
     return ar;
@@ -78,12 +74,10 @@ char const* const* SunInfo::getLibraryPaths(int* size)
 {
 #ifdef UNX
     static char const * ar[] = {
-
         "/lib/" JFW_PLUGIN_ARCH "/client",
         "/lib/" JFW_PLUGIN_ARCH "/server",
         "/lib/" JFW_PLUGIN_ARCH "/native_threads",
         "/lib/" JFW_PLUGIN_ARCH
-
     };
     *size = SAL_N_ELEMENTS(ar);
     return ar;
@@ -95,7 +89,7 @@ char const* const* SunInfo::getLibraryPaths(int* size)
 
 int SunInfo::compareVersions(const rtl::OUString& sSecond) const
 {
-    OUString sFirst = getVersion();
+    rtl::OUString sFirst = getVersion();
 
     SunVersion version1(sFirst);
     JFW_ENSURE(version1, OUSTR("[Java framework] sunjavaplugin" SAL_DLLEXTENSION
@@ -105,9 +99,9 @@ int SunInfo::compareVersions(const rtl::OUString& sSecond) const
     if ( ! version2)
         throw MalformedVersionException();
 
-    if(version1 == version2)
+    if (version1 == version2)
         return 0;
-    if(version1 > version2)
+    if (version1 > version2)
         return 1;
     else
         return -1;
diff --git a/mysqlc/source/DataAccess.xcu b/mysqlc/source/DataAccess.xcu
index bcf2fd846183..2b652ec87649 100644
--- a/mysqlc/source/DataAccess.xcu
+++ b/mysqlc/source/DataAccess.xcu
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <!--
  * This file is part of the LibreOffice project.
  *
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 3b279bda524e..79ab70e16f7d 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -364,7 +364,8 @@ void DocxExport::OutputEndNode( const SwEndNode& rEndNode )
         if ( rNd.IsEndNode() && rNd.StartOfSectionNode()->IsSectionNode() )
             return;
 
-        if ( !rNd.IsSectionNode() && IsInTable() ) // No sections in table
+        bool isInTable = IsInTable();
+        if ( !rNd.IsSectionNode() && isInTable ) // No sections in table
         {
             const SwSectionFmt* pParentFmt = rSect.GetFmt()->GetParent();
             if( !pParentFmt )
diff --git a/wizards/com/sun/star/wizards/form/FormWizard.java b/wizards/com/sun/star/wizards/form/FormWizard.java
index 00e8326aa958..f1a2ad047f92 100644
--- a/wizards/com/sun/star/wizards/form/FormWizard.java
+++ b/wizards/com/sun/star/wizards/form/FormWizard.java
@@ -228,7 +228,10 @@ public class FormWizard extends DatabaseObjectWizard
         insertLabel("lblBinaryHelpText",
                 new String[]
                 {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_MULTILINE, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_WIDTH
+                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL,
+		    PropertyNames.PROPERTY_MULTILINE, PropertyNames.PROPERTY_POSITION_X,
+		    PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP,
+		    PropertyNames.PROPERTY_WIDTH
                 },
                 new Object[]
                 {
@@ -243,7 +246,10 @@ public class FormWizard extends DatabaseObjectWizard
         insertLabel("lblSubFormBinaryHelpText",
                 new String[]
                 {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_MULTILINE, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_WIDTH
+                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL,
+		    PropertyNames.PROPERTY_MULTILINE, PropertyNames.PROPERTY_POSITION_X,
+		    PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP,
+		    PropertyNames.PROPERTY_WIDTH
                 },
                 new Object[]
                 {
@@ -442,11 +448,11 @@ public class FormWizard extends DatabaseObjectWizard
         private boolean toggleSubFormSteps()
         {
             curSubFormFieldSelection.setModified(true);
-            boolean enabled = curSubFormFieldSelection.getSelectedFieldNames().length > 0;
-            enablefromStep(SOFIELDLINKER_PAGE, enabled);
-            if (enabled)
+            boolean benabled = curSubFormFieldSelection.getSelectedFieldNames().length > 0;
+            enablefromStep(SOFIELDLINKER_PAGE, benabled);
+            if (benabled)
                 curFieldLinker.enable(!curFormConfiguration.areexistingRelationsdefined());
-            return enabled;
+            return benabled;
         }
 
         private void toggleMainFormSteps()
diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java b/wizards/com/sun/star/wizards/form/StyleApplier.java
index 677f1277d9a0..d1a4df1ed1b2 100644
--- a/wizards/com/sun/star/wizards/form/StyleApplier.java
+++ b/wizards/com/sun/star/wizards/form/StyleApplier.java
@@ -38,9 +38,7 @@ import com.sun.star.wizards.document.DatabaseControl;
 import com.sun.star.wizards.document.GridControl;
 import com.sun.star.wizards.document.TimeStampControl;
 import com.sun.star.wizards.text.TextStyleHandler;
-import com.sun.star.wizards.ui.UIConsts;
-import com.sun.star.wizards.ui.UnoDialog;
-import com.sun.star.wizards.ui.WizardDialog;
+import com.sun.star.wizards.ui.*;
 
 public class StyleApplier
 {
@@ -51,6 +49,7 @@ public class StyleApplier
     private short curtabindex;
     private XRadioButton optNoBorder;
     private XRadioButton opt3DLook;
+    private XRadioButton optFlat;
     private XListBox lstStyles;
     private FormDocument curFormDocument;
     private short iOldLayoutPos;
@@ -67,8 +66,6 @@ public class StyleApplier
 
     public StyleApplier(WizardDialog _CurUnoDialog, FormDocument _curFormDocument) throws NoValidPathException
     {
-//        try
-//        {
             this.curFormDocument = _curFormDocument;
             xMSF = curFormDocument.xMSF;
 
@@ -129,7 +126,7 @@ public class StyleApplier
                         UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMD3DBORDER", s3DLook, 196, 53, new Short((short) 1), IStyleStep, new Short(curtabindex++), "1", 93
                     });
 
-            CurUnoDialog.insertRadioButton("otpFlat", SCHANGEBORDERTYPE, this,
+            optFlat = CurUnoDialog.insertRadioButton("otpFlat", SCHANGEBORDERTYPE, this,
                     new String[]
                     {
                         PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, "Tag", PropertyNames.PROPERTY_WIDTH
@@ -148,11 +145,6 @@ public class StyleApplier
                     {
                         UIConsts.INTEGERS[8], sFieldBorder, 192, 25, IStyleStep, new Short(curtabindex++), 98
                     });
-//        }
-//        catch (Exception e)
-//        {
-//            e.printStackTrace(System.err);
-//        }
     }
 
     private void setStyles()
@@ -202,7 +194,7 @@ public class StyleApplier
             if (iStyle > -1)
             {
                 iOldLayoutPos = iStyle;
-                String sFileName = FileNames[iStyle]; //Style =  lstStyles.getSelectedItem();
+                String sFileName = FileNames[iStyle];
                 int[] iStyles = getStyleColors(sFileName);
                 applyDBControlProperties(iStyles);
             }
@@ -215,7 +207,7 @@ public class StyleApplier
         if (iPos != iOldLayoutPos)
         {
             iOldLayoutPos = iPos;
-            String sFileName = FileNames[iPos]; //Style =  lstStyles.getSelectedItem();
+            String sFileName = FileNames[iPos];
             int[] iStyles = getStyleColors(sFileName);
             applyDBControlProperties(iStyles);
         }