3 files changed, 6 insertions, 22 deletions
diff --git a/starmath/source/mathml/mathmlexport.cxx b/starmath/source/mathml/mathmlexport.cxx
index d125e49be6a2..e6de9b285f4c 100644
--- a/starmath/source/mathml/mathmlexport.cxx
+++ b/starmath/source/mathml/mathmlexport.cxx
@@ -329,16 +329,10 @@ sal_Int64 SAL_CALL SmXMLExport::getSomething(const uno::Sequence<sal_Int8>& rId)
     return SvXMLExport::getSomething(rId);
 }
 
-namespace
-{
-class theSmXMLExportUnoTunnelId : public rtl::Static<UnoTunnelIdInit, theSmXMLExportUnoTunnelId>
-{
-};
-}
-
 const uno::Sequence<sal_Int8>& SmXMLExport::getUnoTunnelId() throw()
 {
-    return theSmXMLExportUnoTunnelId::get().getSeq();
+    static const UnoTunnelIdInit theSmXMLExportUnoTunnelId;
+    return theSmXMLExportUnoTunnelId.getSeq();
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/starmath/source/mathml/mathmlimport.cxx b/starmath/source/mathml/mathmlimport.cxx
index 33eb25b9b8d7..6b7659074005 100644
--- a/starmath/source/mathml/mathmlimport.cxx
+++ b/starmath/source/mathml/mathmlimport.cxx
@@ -406,16 +406,10 @@ SmXMLImport::SmXMLImport(const css::uno::Reference<css::uno::XComponentContext>&
 {
 }
 
-namespace
-{
-class theSmXMLImportUnoTunnelId : public rtl::Static<UnoTunnelIdInit, theSmXMLImportUnoTunnelId>
-{
-};
-}
-
 const uno::Sequence<sal_Int8>& SmXMLImport::getUnoTunnelId() throw()
 {
-    return theSmXMLImportUnoTunnelId::get().getSeq();
+    static const UnoTunnelIdInit theSmXMLImportUnoTunnelId;
+    return theSmXMLImportUnoTunnelId.getSeq();
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index d75c96ea626d..de29e8260812 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -353,14 +353,10 @@ uno::Sequence< uno::Type > SAL_CALL SmModel::getTypes(  )
             cppu::UnoType<XRenderable>::get() });
 }
 
-namespace
-{
-    class theSmModelUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSmModelUnoTunnelId> {};
-}
-
 const uno::Sequence< sal_Int8 > & SmModel::getUnoTunnelId()
 {
-    return theSmModelUnoTunnelId::get().getSeq();
+    static const UnoTunnelIdInit theSmModelUnoTunnelId;
+    return theSmModelUnoTunnelId.getSeq();
 }
 
 sal_Int64 SAL_CALL SmModel::getSomething( const uno::Sequence< sal_Int8 >& rId )