summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sc/source/ui/unoobj/afmtuno.cxx3
-rw-r--r--sc/source/ui/unoobj/appluno.cxx9
-rw-r--r--sc/source/ui/unoobj/funcuno.cxx3
-rw-r--r--sc/workben/addin.cxx3
-rw-r--r--stoc/source/typeconv/convert.cxx3
-rw-r--r--sw/source/uibase/uno/unoatxt.cxx3
-rw-r--r--sw/source/uibase/uno/unomod.cxx3
7 files changed, 9 insertions, 18 deletions
diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index 7dc224f98cbc..d518965ee6cc 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -178,8 +178,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScAutoFormatsObj_CreateInstance(
{
SolarMutexGuard aGuard;
ScDLL::Init();
- static uno::Reference< uno::XInterface > xInst((::cppu::OWeakObject*) new ScAutoFormatsObj);
- return xInst;
+ return (::cppu::OWeakObject*) new ScAutoFormatsObj;
}
OUString ScAutoFormatsObj::getImplementationName_Static()
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index d814831647ec..51a95910771d 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -314,8 +314,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScSpreadsheetSettings_CreateInstance(
{
SolarMutexGuard aGuard;
ScDLL::Init();
- static uno::Reference<uno::XInterface> xInst((cppu::OWeakObject*)new ScSpreadsheetSettings());
- return xInst;
+ return (cppu::OWeakObject*)new ScSpreadsheetSettings();
}
OUString ScSpreadsheetSettings::getImplementationName_Static()
@@ -602,8 +601,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScRecentFunctionsObj_CreateInstance(
{
SolarMutexGuard aGuard;
ScDLL::Init();
- static uno::Reference<uno::XInterface> xInst((cppu::OWeakObject*)new ScRecentFunctionsObj());
- return xInst;
+ return (cppu::OWeakObject*)new ScRecentFunctionsObj();
}
OUString ScRecentFunctionsObj::getImplementationName_Static()
@@ -679,8 +677,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScFunctionListObj_CreateInstance(
{
SolarMutexGuard aGuard;
ScDLL::Init();
- static uno::Reference<uno::XInterface> xInst((cppu::OWeakObject*)new ScFunctionListObj());
- return xInst;
+ return (cppu::OWeakObject*)new ScFunctionListObj();
}
OUString ScFunctionListObj::getImplementationName_Static()
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index aa13e66e227e..6f3b11d62390 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -205,8 +205,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScFunctionAccess_CreateInstance(
{
SolarMutexGuard aGuard;
ScDLL::Init();
- static uno::Reference< uno::XInterface > xInst((::cppu::OWeakObject*) new ScFunctionAccess);
- return xInst;
+ return (::cppu::OWeakObject*) new ScFunctionAccess;
}
OUString ScFunctionAccess::getImplementationName_Static()
diff --git a/sc/workben/addin.cxx b/sc/workben/addin.cxx
index f5784c50aca9..60089b318a19 100644
--- a/sc/workben/addin.cxx
+++ b/sc/workben/addin.cxx
@@ -120,8 +120,7 @@ UString ScTestAddIn::getImplementationName_Static()
uno::Reference<uno::XInterface> ScTestAddIn_CreateInstance(
const uno::Reference<lang::XMultiServiceFactory>& )
{
- static uno::Reference<uno::XInterface> xInst = (cppu::OWeakObject*)new ScTestAddIn();
- return xInst;
+ return (cppu::OWeakObject*)new ScTestAddIn();
}
// XAddIn
diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index e737f877e45b..544243b2540d 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -917,8 +917,7 @@ Reference< XInterface > SAL_CALL TypeConverter_Impl_CreateInstance(
SAL_UNUSED_PARAMETER const Reference< XComponentContext > & )
throw( RuntimeException )
{
- static Reference< XInterface > s_ref( (OWeakObject *) new stoc_tcv::TypeConverter_Impl() );
- return s_ref;
+ return (OWeakObject *) new stoc_tcv::TypeConverter_Impl();
}
}
diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx
index 9b237ffe2c1a..003e89dc35af 100644
--- a/sw/source/uibase/uno/unoatxt.cxx
+++ b/sw/source/uibase/uno/unoatxt.cxx
@@ -65,8 +65,7 @@ uno::Reference< uno::XInterface > SAL_CALL SwXAutoTextContainer_createInstance(
//the module may not be loaded
SolarMutexGuard aGuard;
SwGlobals::ensure();
- static uno::Reference< uno::XInterface > xAText = (cppu::OWeakObject*)new SwXAutoTextContainer();
- return xAText;
+ return (cppu::OWeakObject*)new SwXAutoTextContainer();
}
uno::Sequence< OUString > SAL_CALL SwXAutoTextContainer_getSupportedServiceNames() throw()
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index f1b4fb39565d..653cc8cba628 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -195,8 +195,7 @@ static ChainablePropertySetInfo * lcl_createPrintSettingsInfo()
Reference< uno::XInterface > SAL_CALL SwXModule_createInstance(
const Reference< XMultiServiceFactory > & /*rSMgr*/) throw( Exception )
{
- static Reference< uno::XInterface > xModule = (cppu::OWeakObject*)new SwXModule();
- return xModule;
+ return (cppu::OWeakObject*)new SwXModule();
}
Sequence< OUString > SAL_CALL SwXModule_getSupportedServiceNames() throw()