summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-02-16 20:47:23 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-02-16 22:59:53 +0000
commit52b25c1adf3a70819aea2080b0ad50a14a3c104b (patch)
tree7cea76303d3bfcd29b138b903241d79c6ff08a77 /sc
parent0ae82ba5d2b0ab81cac27efbb0226ed0f15d3b96 (diff)
we shouldn't need a static ref in these createOneInstance factory helpers
at least not to ensure that they are singletons anyway Change-Id: I08176afa67ac5f8e4f479b70ca5d71c52d0bb9af
Diffstat (limited to 'sc')
-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
4 files changed, 6 insertions, 12 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