diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-05-28 15:45:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-05-30 09:08:41 +0200 |
| commit | 8ee22cb0bd6e741a553ef7d5b78cedc7ca669939 (patch) | |
| tree | db8fc19623ee9463409d0e483de999f45420e244 /sw/source/uibase | |
| parent | c78fa391c99885492d50de12b7a6b5912229061f (diff) | |
std::unique_ptr -> std::optional
Change-Id: I78e5995b1a5cccff9c632ef4bcf75ea3ec01ff65
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116382
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/utlui/initui.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/uibase/utlui/initui.cxx b/sw/source/uibase/utlui/initui.cxx index a690b7cfe9df..5b015c71d9b6 100644 --- a/sw/source/uibase/utlui/initui.cxx +++ b/sw/source/uibase/utlui/initui.cxx @@ -181,9 +181,9 @@ 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); for (sal_uInt16 n = 0; n < STR_AUTOFMTREDL_END; ++n) @@ -196,7 +196,7 @@ void ShellResource::GetAutoFormatNameLst_() const p = p.replaceFirst("%1", rLclD.getDoubleQuotationMarkStart()); p = p.replaceFirst("%2", rLclD.getDoubleQuotationMarkEnd()); } - pAutoFormatNameLst->push_back(p); + mxAutoFormatNameLst->push_back(p); } } |