improve function-local statics in sw

Change-Id: I36b0e9b2819a442f01182f551dbc2bf7d5c878f4
Reviewed-on: https://gerrit.libreoffice.org/63788
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 4 insertions, 6 deletions

diff --git a/sw/source/ui/dialog/swuiexp.cxx b/sw/source/ui/dialog/swuiexp.cxx
index ba351e57ced5..c016cc6189a4 100644
--- a/sw/source/ui/dialog/swuiexp.cxx
+++ b/sw/source/ui/dialog/swuiexp.cxx
@@ -52,12 +52,10 @@
 
 namespace swui
 {
-    static SwAbstractDialogFactory_Impl* pFactory=nullptr;
-    SwAbstractDialogFactory * GetFactory()
+    SwAbstractDialogFactory& GetFactory()
     {
-        if ( !pFactory )
-            pFactory = new SwAbstractDialogFactory_Impl;
-        return pFactory;
+        static SwAbstractDialogFactory_Impl aFactory;
+        return aFactory;
     }
 }
 
@@ -65,7 +63,7 @@ extern "C"
 {
     SAL_DLLPUBLIC_EXPORT SwAbstractDialogFactory* SwCreateDialogFactory()
     {
-        return ::swui::GetFactory();
+        return &::swui::GetFactory();
     }
 }