summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--codemaker/source/javamaker/javatype.cxx1
-rw-r--r--framework/source/loadenv/loadenv.cxx3
-rw-r--r--framework/source/services/modulemanager.cxx6
3 files changed, 3 insertions, 7 deletions
diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx
index b762823ed311..b0edb7f103a6 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 b5dac0f25687..799a48ddb587 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 04158c0532e9..8860f0d56c23 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())