7 files changed, 14 insertions, 42 deletions
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index 5314f059e1f5..e575a837ec87 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -734,14 +734,10 @@ void ScDrawTransferObj::InitDocShell()
     pDocSh->UpdateOle(aViewData, true);
 }
 
-namespace
-{
-    class theScDrawTransferObjUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theScDrawTransferObjUnoTunnelId > {};
-}
-
 const css::uno::Sequence< sal_Int8 >& ScDrawTransferObj::getUnoTunnelId()
 {
-    return theScDrawTransferObjUnoTunnelId::get().getSeq();
+    static const UnoTunnelIdInit theScDrawTransferObjUnoTunnelId;
+    return theScDrawTransferObjUnoTunnelId.getSeq();
 }
 
 sal_Int64 SAL_CALL ScDrawTransferObj::getSomething( const css::uno::Sequence< sal_Int8 >& rId )
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index ad6e01df42e1..eaeb319dd1b8 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -906,14 +906,10 @@ void ScTransferObj::StripRefs( ScDocument& rDoc,
     }
 }
 
-namespace
-{
-    class theScTransferUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theScTransferUnoTunnelId> {};
-}
-
 const css::uno::Sequence< sal_Int8 >& ScTransferObj::getUnoTunnelId()
 {
-    return theScTransferUnoTunnelId::get().getSeq();
+    static const UnoTunnelIdInit theScTransferUnoTunnelId;
+    return theScTransferUnoTunnelId.getSeq();
 }
 
 sal_Int64 SAL_CALL ScTransferObj::getSomething( const css::uno::Sequence< sal_Int8 >& rId )
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 36c40bb3b60c..e65a6e8b559b 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -987,14 +987,10 @@ sal_Int64 SAL_CALL ScDataPilotDescriptorBase::getSomething(
     return 0;
 }
 
-namespace
-{
-    class theScDataPilotDescriptorBaseUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theScDataPilotDescriptorBaseUnoTunnelId> {};
-}
-
 const Sequence<sal_Int8>& ScDataPilotDescriptorBase::getUnoTunnelId()
 {
-    return theScDataPilotDescriptorBaseUnoTunnelId::get().getSeq();
+    static const UnoTunnelIdInit theScDataPilotDescriptorBaseUnoTunnelId;
+    return theScDataPilotDescriptorBaseUnoTunnelId.getSeq();
 }
 
 ScDataPilotTableObj::ScDataPilotTableObj(ScDocShell* pDocSh, SCTAB nT, const OUString& rN) :
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 6780821b6cab..1e531424a92c 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -3086,14 +3086,10 @@ sal_Int64 SAL_CALL ScModelObj::getSomething(
     return 0;
 }
 
-namespace
-{
-    class theScModelObjUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theScModelObjUnoTunnelId> {};
-}
-
 const uno::Sequence<sal_Int8>& ScModelObj::getUnoTunnelId()
 {
-    return theScModelObjUnoTunnelId::get().getSeq();
+    static const UnoTunnelIdInit theScModelObjUnoTunnelId;
+    return theScModelObjUnoTunnelId.getSeq();
 }
 
 // XChangesNotifier
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index ef322f64590d..bc15ba830316 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -433,14 +433,10 @@ sal_Int64 SAL_CALL ScNamedRangeObj::getSomething(
     return 0;
 }
 
-namespace
-{
-    class theScNamedRangeObjUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theScNamedRangeObjUnoTunnelId> {};
-}
-
 const uno::Sequence<sal_Int8>& ScNamedRangeObj::getUnoTunnelId()
 {
-    return theScNamedRangeObjUnoTunnelId::get().getSeq();
+    static const UnoTunnelIdInit theScNamedRangeObjUnoTunnelId;
+    return theScNamedRangeObjUnoTunnelId.getSeq();
 }
 
 ScNamedRangesObj::ScNamedRangesObj(ScDocShell* pDocSh) :
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index 18f40a764ce1..0d2ae5bd744e 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -142,14 +142,10 @@ sal_Int64 SAL_CALL ScHeaderFooterContentObj::getSomething(
     return 0;
 }
 
-namespace
-{
-    class theScHeaderFooterContentObjUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theScHeaderFooterContentObjUnoTunnelId> {};
-}
-
 const uno::Sequence<sal_Int8>& ScHeaderFooterContentObj::getUnoTunnelId()
 {
-    return theScHeaderFooterContentObjUnoTunnelId::get().getSeq();
+    static const UnoTunnelIdInit theScHeaderFooterContentObjUnoTunnelId;
+    return theScHeaderFooterContentObjUnoTunnelId.getSeq();
 }
 
 rtl::Reference<ScHeaderFooterContentObj> ScHeaderFooterContentObj::getImplementation(
diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx
index 6aea747b665a..f4ec5ca04e04 100644
--- a/sc/source/ui/vba/vbaworksheet.cxx
+++ b/sc/source/ui/vba/vbaworksheet.cxx
@@ -170,14 +170,10 @@ ScVbaWorksheet::~ScVbaWorksheet()
 {
 }
 
-namespace
-{
-    class theScVbaWorksheetUnoTunnelId  : public rtl::Static< UnoTunnelIdInit, theScVbaWorksheetUnoTunnelId > {};
-}
-
 const uno::Sequence<sal_Int8>& ScVbaWorksheet::getUnoTunnelId()
 {
-    return theScVbaWorksheetUnoTunnelId::get().getSeq();
+    static const UnoTunnelIdInit theScVbaWorksheetUnoTunnelId;
+    return theScVbaWorksheetUnoTunnelId.getSeq();
 }
 
 uno::Reference< ov::excel::XWorksheet >