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>

5 files changed, 10 insertions, 30 deletions

diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx
index 81ec1e93ef00..5b709d1bc588 100644
--- a/xmloff/source/core/unoatrcn.cxx
+++ b/xmloff/source/core/unoatrcn.cxx
@@ -86,14 +86,10 @@ sal_uInt16 SvUnoAttributeContainer::getIndexByName(const OUString& aName ) const
     return USHRT_MAX;
 }
 
-namespace
-{
-    class theSvUnoAttributeContainerUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSvUnoAttributeContainerUnoTunnelId> {};
-}
-
 const css::uno::Sequence< sal_Int8 > & SvUnoAttributeContainer::getUnoTunnelId() throw()
 {
-    return theSvUnoAttributeContainerUnoTunnelId::get().getSeq();
+    static const UnoTunnelIdInit theSvUnoAttributeContainerUnoTunnelId;
+    return theSvUnoAttributeContainerUnoTunnelId.getSeq();
 }
 
 sal_Int64 SAL_CALL SvUnoAttributeContainer::getSomething( const css::uno::Sequence< sal_Int8 >& rId )
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 7e904af3e7dc..af6bf27a13c9 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -465,14 +465,10 @@ bool SvXMLImport::addEmbeddedFont(const css::uno::Reference< css::io::XInputStre
     return mxEmbeddedFontHelper->addEmbeddedFont(stream, fontName, extra, key, eot);
 }
 
-namespace
-{
-    class theSvXMLImportUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSvXMLImportUnoTunnelId> {};
-}
-
 const css::uno::Sequence<sal_Int8>& SvXMLImport::getUnoTunnelId() throw()
 {
-    return theSvXMLImportUnoTunnelId::get().getSeq();
+    static const UnoTunnelIdInit theSvXMLImportUnoTunnelId;
+    return theSvXMLImportUnoTunnelId.getSeq();
 }
 
 // XUnoTunnel
diff --git a/xmloff/source/transform/MutableAttrList.cxx b/xmloff/source/transform/MutableAttrList.cxx
index abf19c69a2bc..a8a55990a59c 100644
--- a/xmloff/source/transform/MutableAttrList.cxx
+++ b/xmloff/source/transform/MutableAttrList.cxx
@@ -57,14 +57,10 @@ XMLMutableAttributeList::~XMLMutableAttributeList()
     m_xAttrList = nullptr;
 }
 
-namespace
-{
-    class theXMLMutableAttributeListUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theXMLMutableAttributeListUnoTunnelId> {};
-}
-
 const css::uno::Sequence<sal_Int8>& XMLMutableAttributeList::getUnoTunnelId() throw()
 {
-    return theXMLMutableAttributeListUnoTunnelId::get().getSeq();
+    static const UnoTunnelIdInit theXMLMutableAttributeListUnoTunnelId;
+    return theXMLMutableAttributeListUnoTunnelId.getSeq();
 }
 
 // XUnoTunnel
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx
index c2c5cdf0a16c..ff947c0731ef 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -1944,14 +1944,10 @@ void OOo2OasisTransformer::Initialize(
     }
 }
 
-namespace
-{
-    class theOOo2OasisTransformerUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theOOo2OasisTransformerUnoTunnelId> {};
-}
-
 const css::uno::Sequence<sal_Int8>& OOo2OasisTransformer::getUnoTunnelId() throw()
 {
-    return theOOo2OasisTransformerUnoTunnelId::get().getSeq();
+    static const UnoTunnelIdInit theOOo2OasisTransformerUnoTunnelId;
+    return theOOo2OasisTransformerUnoTunnelId.getSeq();
 }
 
 // XUnoTunnel
diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx
index 0fda0c3b61c2..c74013307d68 100644
--- a/xmloff/source/transform/Oasis2OOo.cxx
+++ b/xmloff/source/transform/Oasis2OOo.cxx
@@ -1943,14 +1943,10 @@ Oasis2OOoTransformer::~Oasis2OOoTransformer() throw()
     XMLEventOASISTransformerContext::FlushEventMap( m_pFormEventMap );
 }
 
-namespace
-{
-    class theOasis2OOoTransformerUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theOasis2OOoTransformerUnoTunnelId> {};
-}
-
 const css::uno::Sequence<sal_Int8>& Oasis2OOoTransformer::getUnoTunnelId() throw()
 {
-    return theOasis2OOoTransformerUnoTunnelId::get().getSeq();
+    static const class UnoTunnelIdInit theOasis2OOoTransformerUnoTunnelId;
+    return theOasis2OOoTransformerUnoTunnelId.getSeq();
 }
 
 // XUnoTunnel