remove some unnecessary temporary OUStrings

found with:
git grep -nP 'OUString\(\s*\w+\s*\)' | grep -v new | grep -v return

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

3 files changed, 28 insertions, 46 deletions

diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx
index 194dff8e4417..d9ce673e82a6 100644
--- a/unotools/source/config/fontoptions.cxx
+++ b/unotools/source/config/fontoptions.cxx
@@ -41,8 +41,6 @@ using namespace ::com::sun::star::uno;
 #define PROPERTYHANDLE_FONTHISTORY          1
 #define PROPERTYHANDLE_FONTWYSIWYG          2
 
-#define PROPERTYCOUNT                       3
-
 class SvtFontOptions_Impl : public ConfigItem
 {
     public:
@@ -230,17 +228,12 @@ void SvtFontOptions_Impl::EnableFontWYSIWYG( bool bState )
 
 Sequence< OUString > SvtFontOptions_Impl::impl_GetPropertyNames()
 {
-    // Build list of configuration key names.
-    const OUString pProperties[] =
+    return Sequence< OUString >
     {
-        OUString(PROPERTYNAME_REPLACEMENTTABLE)   ,
-        OUString(PROPERTYNAME_FONTHISTORY)        ,
-        OUString(PROPERTYNAME_FONTWYSIWYG)        ,
+        PROPERTYNAME_REPLACEMENTTABLE   ,
+        PROPERTYNAME_FONTHISTORY        ,
+        PROPERTYNAME_FONTWYSIWYG        ,
     };
-    // Initialize return sequence with these list ...
-    const Sequence< OUString > seqPropertyNames( pProperties, PROPERTYCOUNT );
-    // ... and return it.
-    return seqPropertyNames;
 }
 
 namespace {
diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx
index 569ce166715e..951785ed687b 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -90,7 +90,6 @@ using namespace ::com::sun::star::uno;
 #define PROPERTYHANDLE_MACRO_TRUSTEDAUTHORS         14
 #define PROPERTYHANDLE_MACRO_DISABLE                15
 
-#define PROPERTYCOUNT                               16
 #define PROPERTYHANDLE_INVALID                      -1
 
 #define CFG_READONLY_DEFAULT                        false
@@ -904,30 +903,25 @@ bool SvtSecurityOptions_Impl::IsOptionEnabled( SvtSecurityOptions::EOption eOpti
 
 Sequence< OUString > SvtSecurityOptions_Impl::GetPropertyNames()
 {
-    // Build static list of configuration key names.
-    const OUString pProperties[] =
+    return Sequence< OUString >
     {
-        OUString(PROPERTYNAME_SECUREURL),
-        OUString(PROPERTYNAME_STAROFFICEBASIC),
-        OUString(PROPERTYNAME_EXECUTEPLUGINS),
-        OUString(PROPERTYNAME_WARNINGENABLED),
-        OUString(PROPERTYNAME_CONFIRMATIONENABLED),
-        OUString(PROPERTYNAME_DOCWARN_SAVEORSEND),
-        OUString(PROPERTYNAME_DOCWARN_SIGNING),
-        OUString(PROPERTYNAME_DOCWARN_PRINT),
-        OUString(PROPERTYNAME_DOCWARN_CREATEPDF),
-        OUString(PROPERTYNAME_DOCWARN_REMOVEPERSONALINFO),
-        OUString(PROPERTYNAME_DOCWARN_RECOMMENDPASSWORD),
-        OUString(PROPERTYNAME_CTRLCLICK_HYPERLINK),
-        OUString(PROPERTYNAME_BLOCKUNTRUSTEDREFERERLINKS),
-        OUString(PROPERTYNAME_MACRO_SECLEVEL),
-        OUString(PROPERTYNAME_MACRO_TRUSTEDAUTHORS),
-        OUString(PROPERTYNAME_MACRO_DISABLE)
+        PROPERTYNAME_SECUREURL,
+        PROPERTYNAME_STAROFFICEBASIC,
+        PROPERTYNAME_EXECUTEPLUGINS,
+        PROPERTYNAME_WARNINGENABLED,
+        PROPERTYNAME_CONFIRMATIONENABLED,
+        PROPERTYNAME_DOCWARN_SAVEORSEND,
+        PROPERTYNAME_DOCWARN_SIGNING,
+        PROPERTYNAME_DOCWARN_PRINT,
+        PROPERTYNAME_DOCWARN_CREATEPDF,
+        PROPERTYNAME_DOCWARN_REMOVEPERSONALINFO,
+        PROPERTYNAME_DOCWARN_RECOMMENDPASSWORD,
+        PROPERTYNAME_CTRLCLICK_HYPERLINK,
+        PROPERTYNAME_BLOCKUNTRUSTEDREFERERLINKS,
+        PROPERTYNAME_MACRO_SECLEVEL,
+        PROPERTYNAME_MACRO_TRUSTEDAUTHORS,
+        PROPERTYNAME_MACRO_DISABLE
     };
-    // Initialize return sequence with these list ...
-    const Sequence< OUString > seqPropertyNames( pProperties, PROPERTYCOUNT );
-    // ... and return it.
-    return seqPropertyNames;
 }
 
 namespace {
diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx
index 30ddad1c06fc..1bfb1be81109 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -116,22 +116,17 @@ public:
 #define PROPERTYHANDLE_DATEPATTERNS     4
 #define PROPERTYHANDLE_IGNORELANGCHANGE 5
 
-//#define PROPERTYCOUNT                   5
-#define PROPERTYCOUNT                   6
-
 const Sequence< OUString > SvtSysLocaleOptions_Impl::GetPropertyNames()
 {
-    const OUString pProperties[] =
+    return Sequence< OUString >
     {
-        OUString(PROPERTYNAME_LOCALE),
-        OUString(PROPERTYNAME_UILOCALE),
-        OUString(PROPERTYNAME_CURRENCY),
-        OUString(PROPERTYNAME_DECIMALSEPARATOR),
-        OUString(PROPERTYNAME_DATEPATTERNS),
-        OUString(PROPERTYNAME_IGNORELANGCHANGE)
+        PROPERTYNAME_LOCALE,
+        PROPERTYNAME_UILOCALE,
+        PROPERTYNAME_CURRENCY,
+        PROPERTYNAME_DECIMALSEPARATOR,
+        PROPERTYNAME_DATEPATTERNS,
+        PROPERTYNAME_IGNORELANGCHANGE
     };
-    const Sequence< OUString > seqPropertyNames( pProperties, PROPERTYCOUNT );
-    return seqPropertyNames;
 }
 
 SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl()