rtl::Static -> function local static

Change-Id: I2071c27bdf074403ec24e67f9278ac27f9491303
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113698
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

8 files changed, 16 insertions, 48 deletions

diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 37b6379d7904..d05aba6be19b 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -743,14 +743,10 @@ std::shared_ptr<SdTransferable::UserData> SdTransferable::GetUserData (const sal
         return std::shared_ptr<UserData>();
 }
 
-namespace
-{
-    class theSdTransferableUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSdTransferableUnoTunnelId > {};
-}
-
 const css::uno::Sequence< sal_Int8 >& SdTransferable::getUnoTunnelId()
 {
-    return theSdTransferableUnoTunnelId::get().getSeq();
+    static const UnoTunnelIdInit theSdTransferableUnoTunnelId;
+    return theSdTransferableUnoTunnelId.getSeq();
 }
 
 SdTransferable* SdTransferable::getImplementation( const Reference< XInterface >& rxData ) throw()
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index e170c30f64c2..d50dd9dc83d3 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -126,14 +126,10 @@ sal_Int64 SAL_CALL SdPageObjsTLV::SdPageObjsTransferable::getSomething( const cs
     return nRet;
 }
 
-namespace
-{
-    class theSdPageObjsTLBUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSdPageObjsTLBUnoTunnelId > {};
-}
-
 const css::uno::Sequence<sal_Int8>& SdPageObjsTLV::SdPageObjsTransferable::getUnoTunnelId()
 {
-    return theSdPageObjsTLBUnoTunnelId::get().getSeq();
+    static const UnoTunnelIdInit theSdPageObjsTLBUnoTunnelId;
+    return theSdPageObjsTLBUnoTunnelId.getSeq();
 }
 
 SdPageObjsTLV::SdPageObjsTransferable* SdPageObjsTLV::SdPageObjsTransferable::getImplementation( const css::uno::Reference< css::uno::XInterface >& rxData )
diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx
index 631cc072edb3..25d1bcb40e29 100644
--- a/sd/source/ui/framework/factories/Pane.cxx
+++ b/sd/source/ui/framework/factories/Pane.cxx
@@ -138,14 +138,10 @@ sal_Bool SAL_CALL Pane::isAnchorOnly()
 
 //----- XUnoTunnel ------------------------------------------------------------
 
-namespace
-{
-    class thePaneUnoTunnelId : public rtl::Static< UnoTunnelIdInit, thePaneUnoTunnelId > {};
-}
-
 const Sequence<sal_Int8>& Pane::getUnoTunnelId()
 {
-    return thePaneUnoTunnelId::get().getSeq();
+    static const UnoTunnelIdInit thePaneUnoTunnelId;
+    return thePaneUnoTunnelId.getSeq();
 }
 
 sal_Int64 SAL_CALL Pane::getSomething (const Sequence<sal_Int8>& rId)
diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
index dc801bb90bf8..4e285eeae9cb 100644
--- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx
+++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
@@ -211,14 +211,10 @@ sal_Bool SAL_CALL ViewShellWrapper::relocateToAnchor (
 
 //----- XUnoTunnel ------------------------------------------------------------
 
-namespace
-{
-    class theViewShellWrapperUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theViewShellWrapperUnoTunnelId> {};
-}
-
 const Sequence<sal_Int8>& ViewShellWrapper::getUnoTunnelId()
 {
-    return theViewShellWrapperUnoTunnelId::get().getSeq();
+    static const UnoTunnelIdInit theViewShellWrapperUnoTunnelId;
+    return theViewShellWrapperUnoTunnelId.getSeq();
 }
 
 sal_Int64 SAL_CALL ViewShellWrapper::getSomething (const Sequence<sal_Int8>& rId)
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index 66ed80851852..019d00221802 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -557,14 +557,10 @@ Reference<XModuleController> SAL_CALL
 
 //===== XUnoTunnel ============================================================
 
-namespace
-{
-    class theDrawControllerUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theDrawControllerUnoTunnelId> {};
-}
-
 const Sequence<sal_Int8>& DrawController::getUnoTunnelId()
 {
-    return theDrawControllerUnoTunnelId::get().getSeq();
+    static const UnoTunnelIdInit theDrawControllerUnoTunnelId;
+    return theDrawControllerUnoTunnelId.getSeq();
 }
 
 sal_Int64 SAL_CALL DrawController::getSomething (const Sequence<sal_Int8>& rId)
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index c8812900cb93..662477a28367 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -332,15 +332,11 @@ void SAL_CALL SdXImpressDocument::release() throw ( )
     SfxBaseModel::release();
 }
 
-namespace
-{
-    class theSdXImpressDocumentUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSdXImpressDocumentUnoTunnelId> {};
-}
-
 // XUnoTunnel
 const css::uno::Sequence< sal_Int8 > & SdXImpressDocument::getUnoTunnelId() throw()
 {
-    return theSdXImpressDocumentUnoTunnelId::get().getSeq();
+    static const UnoTunnelIdInit theSdXImpressDocumentUnoTunnelId;
+    return theSdXImpressDocumentUnoTunnelId.getSeq();
 }
 
 sal_Int64 SAL_CALL SdXImpressDocument::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier )
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 0eed74c000ab..0aef28437972 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -321,14 +321,10 @@ static const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKin
     return pRet;
 }
 
-namespace
-{
-    class theSdGenericDrawPageUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSdGenericDrawPageUnoTunnelId> {};
-}
-
 const css::uno::Sequence< sal_Int8 > & SdGenericDrawPage::getUnoTunnelId() throw()
 {
-    return theSdGenericDrawPageUnoTunnelId::get().getSeq();
+    static const UnoTunnelIdInit theSdGenericDrawPageUnoTunnelId;
+    return theSdGenericDrawPageUnoTunnelId.getSeq();
 }
 
 sal_Int64 SAL_CALL SdGenericDrawPage::getSomething( const css::uno::Sequence< sal_Int8 >& rId )
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index e2a42434e6f4..cd09d77d479a 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -274,14 +274,10 @@ sal_Bool SAL_CALL ViewTabBar::isAnchorOnly()
 
 //----- XUnoTunnel ------------------------------------------------------------
 
-namespace
-{
-    class theViewTabBarUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theViewTabBarUnoTunnelId > {};
-}
-
 const Sequence<sal_Int8>& ViewTabBar::getUnoTunnelId()
 {
-    return theViewTabBarUnoTunnelId::get().getSeq();
+    static const UnoTunnelIdInit theViewTabBarUnoTunnelId;
+    return theViewTabBarUnoTunnelId.getSeq();
 }
 
 sal_Int64 SAL_CALL ViewTabBar::getSomething (const Sequence<sal_Int8>& rId)