no need to take a mutex when only dealing with stack-local data

Change-Id: Ie45e626aad55a8174a53b769a98601bf54dedf65
Reviewed-on: https://gerrit.libreoffice.org/19979
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

2 files changed, 4 insertions, 44 deletions

diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index a0e401beb0ef..903e451a9541 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -61,34 +61,14 @@ static const char sExtensionRootSubDirName[] = "/uno_packages";
 
 OUString OO3ExtensionMigration_getImplementationName()
 {
-    static OUString* pImplName = nullptr;
-    if ( !pImplName )
-    {
-        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-        if ( !pImplName )
-        {
-            static OUString aImplName( "com.sun.star.comp.desktop.migration.OOo3Extensions" );
-            pImplName = &aImplName;
-        }
-    }
-    return *pImplName;
+    return OUString( "com.sun.star.comp.desktop.migration.OOo3Extensions" );
 }
 
 
 
 Sequence< OUString > OO3ExtensionMigration_getSupportedServiceNames()
 {
-    static Sequence< OUString >* pNames = nullptr;
-    if ( !pNames )
-    {
-        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-        if ( !pNames )
-        {
-            static Sequence< OUString > aNames { "com.sun.star.migration.Extensions" };
-            pNames = &aNames;
-        }
-    }
-    return *pNames;
+    return Sequence< OUString > { "com.sun.star.migration.Extensions" };
 }
 
 
diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx
index 9ae35631b947..b289ee5f549a 100644
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -43,34 +43,14 @@ namespace migration
 
     OUString WordbookMigration_getImplementationName()
     {
-        static OUString* pImplName = nullptr;
-        if ( !pImplName )
-        {
-            ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-            if ( !pImplName )
-            {
-                static OUString aImplName( "com.sun.star.comp.desktop.migration.Wordbooks" );
-                pImplName = &aImplName;
-            }
-        }
-        return *pImplName;
+        return OUString( "com.sun.star.comp.desktop.migration.Wordbooks" );
     }
 
 
 
     Sequence< OUString > WordbookMigration_getSupportedServiceNames()
     {
-        static Sequence< OUString >* pNames = nullptr;
-        if ( !pNames )
-        {
-            ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-            if ( !pNames )
-            {
-                static Sequence< OUString > aNames { "com.sun.star.migration.Wordbooks" };
-                pNames = &aNames;
-            }
-        }
-        return *pNames;
+        return Sequence< OUString > { "com.sun.star.migration.Wordbooks" };
     }