diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-10 12:37:04 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-11 09:26:28 +0200 |
| commit | 2962ceec4b96758bec7e7a0390d5ec60e3ce708f (patch) | |
| tree | 54b1f57a5ee59babeef28b2f624024cecef8f4c3 /unotools/source/config/securityoptions.cxx | |
| parent | b5303563b785115075b5f9b7b4abccd8f9d916e2 (diff) | |
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>
Diffstat (limited to 'unotools/source/config/securityoptions.cxx')
| -rw-r--r-- | unotools/source/config/securityoptions.cxx | 40 |
1 files changed, 17 insertions, 23 deletions
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 { |