[Libreoffice-commits] .: codemaker/source framework/source

[Libreoffice Gerrit user]

 codemaker/source/javamaker/javatype.cxx     |    1 -
 framework/source/loadenv/loadenv.cxx        |    3 +--
 framework/source/services/modulemanager.cxx |    6 ++----
 3 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 586895f8fa09e006a4cbef31f675585a5b6e42e9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 11 17:36:33 2012 +0100

    loplugin: more unused OUString and misleading indentation
    
    Change-Id: Ic21ca9e14520f4f16c2d665a07a79ee1a46ab91d

diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx
index b762823..b0edb7f 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -171,7 +171,6 @@ SpecialType translateUnoTypeToDescriptor(
     }
     if (sort == codemaker::UnoType::SORT_COMPLEX) {
         //TODO: check that nucleus is a valid (Java-modified UTF-8) identifier
-        rtl::OString superClass;
         if (typeClass == RT_TYPE_INTERFACE
             && (nucleus
                 == rtl::OString(
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index b5dac0f..799a48d 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1141,8 +1141,7 @@ sal_Bool LoadEnv::impl_loadContent()
 
         return sal_True;
     }
-    else
-    if (xSyncLoader.is())
+    else if (xSyncLoader.is())
     {
         sal_Bool bResult = xSyncLoader->load(lDescriptor, xTargetFrame);
         // react for the result here, so the outside waiting
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index 04158c0..8860f0d 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -153,11 +153,9 @@ css::uno::Sequence< rtl::OUString > ModuleManager::getSupportedServiceNames()
     ::rtl::OUString sModule;
     if (xModel.is())
         sModule = implts_identify(xModel);
-    else
-    if (xController.is())
+    else if (xController.is())
         sModule = implts_identify(xController);
-    else
-    if (xWindow.is())
+    else if (xWindow.is())
         sModule = implts_identify(xWindow);
 
     if (sModule.isEmpty())