diff options
Diffstat (limited to 'sw/source/uibase/utlui/initui.cxx')
| -rw-r--r-- | sw/source/uibase/utlui/initui.cxx | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/sw/source/uibase/utlui/initui.cxx b/sw/source/uibase/utlui/initui.cxx index a690b7cfe9df..f24cded867f5 100644 --- a/sw/source/uibase/utlui/initui.cxx +++ b/sw/source/uibase/utlui/initui.cxx @@ -91,7 +91,7 @@ void InitUI() SwEditWin::InitStaticData(); } -static const char* FLD_DOCINFO_ARY[] = +const TranslateId FLD_DOCINFO_ARY[] = { FLD_DOCINFO_TITLE, FLD_DOCINFO_SUBJECT, @@ -135,8 +135,8 @@ ShellResource::ShellResource() sPageDescFollowName( SwResId(STR_PAGEDESC_FOLLOWNAME)), sPageDescName( SwResId(STR_PAGEDESC_NAME)) { - for (size_t i = 0; i < SAL_N_ELEMENTS(FLD_DOCINFO_ARY); ++i) - aDocInfoLst.push_back(SwResId(FLD_DOCINFO_ARY[i])); + for (auto const& aID : FLD_DOCINFO_ARY) + aDocInfoLst.push_back(SwResId(aID)); } OUString ShellResource::GetPageDescName(sal_uInt16 nNo, PageNameMode eMode) @@ -181,11 +181,11 @@ SwGlossaryList* GetGlossaryList() void ShellResource::GetAutoFormatNameLst_() const { - assert(!pAutoFormatNameLst); - pAutoFormatNameLst.reset( new std::vector<OUString> ); - pAutoFormatNameLst->reserve(STR_AUTOFMTREDL_END); + assert(!mxAutoFormatNameLst); + mxAutoFormatNameLst.emplace(); + mxAutoFormatNameLst->reserve(STR_AUTOFMTREDL_END); - assert(SAL_N_ELEMENTS(RID_SHELLRES_AUTOFMTSTRS) == STR_AUTOFMTREDL_END); + static_assert(SAL_N_ELEMENTS(RID_SHELLRES_AUTOFMTSTRS) == STR_AUTOFMTREDL_END); for (sal_uInt16 n = 0; n < STR_AUTOFMTREDL_END; ++n) { OUString p(SwResId(RID_SHELLRES_AUTOFMTSTRS[n])); @@ -196,13 +196,13 @@ void ShellResource::GetAutoFormatNameLst_() const p = p.replaceFirst("%1", rLclD.getDoubleQuotationMarkStart()); p = p.replaceFirst("%2", rLclD.getDoubleQuotationMarkEnd()); } - pAutoFormatNameLst->push_back(p); + mxAutoFormatNameLst->push_back(p); } } namespace { - const char* STR_AUTH_FIELD_ARY[] = + const TranslateId STR_AUTH_FIELD_ARY[] = { STR_AUTH_FIELD_IDENTIFIER, STR_AUTH_FIELD_AUTHORITY_TYPE, @@ -234,7 +234,10 @@ namespace STR_AUTH_FIELD_CUSTOM3, STR_AUTH_FIELD_CUSTOM4, STR_AUTH_FIELD_CUSTOM5, - STR_AUTH_FIELD_ISBN + STR_AUTH_FIELD_ISBN, + STR_AUTH_FIELD_LOCAL_URL, + STR_AUTH_FIELD_TARGET_TYPE, + STR_AUTH_FIELD_TARGET_URL, }; } @@ -250,7 +253,7 @@ OUString const & SwAuthorityFieldType::GetAuthFieldName(ToxAuthorityField eType) return (*pAuthFieldNameList)[static_cast< sal_uInt16 >(eType)]; } -static const char* STR_AUTH_TYPE_ARY[] = +const TranslateId STR_AUTH_TYPE_ARY[] = { STR_AUTH_TYPE_ARTICLE, STR_AUTH_TYPE_BOOK, |