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>

2 files changed, 11 insertions, 60 deletions

diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx
index 350f25f87b9e..20f7d59ad734 100644
--- a/sw/source/uibase/config/modcfg.cxx
+++ b/sw/source/uibase/config/modcfg.cxx
@@ -218,13 +218,8 @@ OUString SwModuleOptions::ConvertWordDelimiter(const OUString& rDelim, bool bFro
 
 const Sequence<OUString>& SwRevisionConfig::GetPropertyNames()
 {
-    static Sequence<OUString> aNames;
-    if(!aNames.getLength())
+    static Sequence<OUString> const aNames
     {
-        const int nCount = 8;
-        aNames.realloc(nCount);
-        static const char* aPropNames[] =
-        {
             "TextDisplay/Insert/Attribute",             // 0
             "TextDisplay/Insert/Color",                 // 1
             "TextDisplay/Delete/Attribute",             // 2
@@ -233,11 +228,7 @@ const Sequence<OUString>& SwRevisionConfig::GetPropertyNames()
             "TextDisplay/ChangedAttribute/Color",       // 5
             "LinesChanged/Mark",                        // 6
             "LinesChanged/Color"                        // 7
-        };
-        OUString* pNames = aNames.getArray();
-        for(int i = 0; i < nCount; i++)
-            pNames[i] = OUString::createFromAscii(aPropNames[i]);
-    }
+    };
     return aNames;
 }
 
@@ -466,12 +457,8 @@ enum InsertConfigProp
 };
 const Sequence<OUString>& SwInsertConfig::GetPropertyNames()
 {
-    static Sequence<OUString> aNames;
-    static Sequence<OUString> aWebNames;
-    if(!aNames.getLength())
+    static Sequence<OUString> aNames
     {
-        static const char* aPropNames[] =
-        {
             "Table/Header",                                                 // 0
             "Table/RepeatHeader",                                           // 1
             "Table/Border",                                                 // 2
@@ -566,19 +553,8 @@ const Sequence<OUString>& SwInsertConfig::GetPropertyNames()
             "Caption/OfficeObject/OLEMisc/Settings/Position",               //91
             "Caption/OfficeObject/OLEMisc/Settings/CharacterStyle",         //92
             "Caption/OfficeObject/OLEMisc/Settings/ApplyAttributes"         //93
-        };
-        const int nCount = INS_PROP_CAP_OBJECT_OLEMISC_APPLYATTRIBUTES + 1;
-        const int nWebCount = INS_PROP_TABLE_BORDER + 1;
-        aNames.realloc(nCount);
-        aWebNames.realloc(nWebCount);
-        OUString* pNames = aNames.getArray();
-        OUString* pWebNames = aWebNames.getArray();
-        int i;
-        for(i = 0; i < nCount; i++)
-            pNames[i] = OUString::createFromAscii(aPropNames[i]);
-        for(i = 0; i < nWebCount; i++)
-            pWebNames[i] = OUString::createFromAscii(aPropNames[i]);
-    }
+    };
+    static Sequence<OUString> const aWebNames(aNames.getArray(), INS_PROP_TABLE_BORDER + 1);
     return m_bIsWeb ? aWebNames : aNames;
 }
 
@@ -1089,9 +1065,7 @@ void SwInsertConfig::Load()
 
 const Sequence<OUString>& SwTableConfig::GetPropertyNames()
 {
-    const int nCount = 8;
-    static Sequence<OUString> aNames(nCount);
-    static const char* aPropNames[] =
+    static Sequence<OUString> const aNames
     {
         "Shift/Row",                    //  0
         "Shift/Column",                 //  1
@@ -1102,9 +1076,6 @@ const Sequence<OUString>& SwTableConfig::GetPropertyNames()
         "Input/NumberFormatRecognition",//  6
         "Input/Alignment"               //  7
     };
-    OUString* pNames = aNames.getArray();
-    for(int i = 0; i < nCount; i++)
-        pNames[i] = OUString::createFromAscii(aPropNames[i]);
     return aNames;
 }
 
@@ -1199,13 +1170,8 @@ SwMiscConfig::~SwMiscConfig()
 
 const Sequence<OUString>& SwMiscConfig::GetPropertyNames()
 {
-    static Sequence<OUString> aNames;
-    if(!aNames.getLength())
+    static Sequence<OUString> const aNames
     {
-        const int nCount = 12;
-        aNames.realloc(nCount);
-        static const char* aPropNames[] =
-        {
             "Statistics/WordNumber/Delimiter",          // 0
             "DefaultFont/Document",                     // 1
             "Index/ShowPreview",                        // 2
@@ -1218,11 +1184,7 @@ const Sequence<OUString>& SwMiscConfig::GetPropertyNames()
             "FormLetter/FileOutput/FileName/FromManualSetting",   // 9
             "FormLetter/FileOutput/FileName/Generation",//10
             "FormLetter/PrintOutput/AskForMerge"        //11
-        };
-        OUString* pNames = aNames.getArray();
-        for(int i = 0; i < nCount; i++)
-            pNames[i] = OUString::createFromAscii(aPropNames[i]);
-    }
+    };
     return aNames;
 }
 
@@ -1292,23 +1254,14 @@ void SwMiscConfig::Load()
 
 const Sequence<OUString>& SwCompareConfig::GetPropertyNames()
 {
-    static Sequence<OUString> aNames;
-    if(!aNames.getLength())
+    static Sequence<OUString> const aNames
     {
-        const int nCount = 5;
-        aNames.realloc(nCount);
-        static const char* aPropNames[] =
-        {
             "Mode",                         // 0
             "UseRSID",                      // 1
             "IgnorePieces",             // 2
             "IgnoreLength", // 3
             "StoreRSID" // 4
-        };
-        OUString* pNames = aNames.getArray();
-        for(int i = 0; i < nCount; i++)
-            pNames[i] = OUString::createFromAscii(aPropNames[i]);
-    }
+    };
     return aNames;
 }
 
diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx
index 970816c3e3ce..ad2f1d870645 100644
--- a/sw/source/uibase/config/viewopt.cxx
+++ b/sw/source/uibase/config/viewopt.cxx
@@ -573,9 +573,7 @@ bool SwViewOption::IsAppearanceFlag(ViewOptFlags nFlag)
 namespace{
 rtl::Reference<comphelper::ConfigurationListener> const & getWCOptionListener()
 {
-    static rtl::Reference<comphelper::ConfigurationListener> xListener;
-    if (!xListener.is())
-        xListener.set(new comphelper::ConfigurationListener("/org.openoffice.Office.Writer/Cursor/Option"));
+    static rtl::Reference<comphelper::ConfigurationListener> xListener(new comphelper::ConfigurationListener("/org.openoffice.Office.Writer/Cursor/Option"));
     return xListener;
 }
 }