diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2023-04-02 01:18:42 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2023-04-02 18:46:47 +0200 |
commit | 116b9d6ddf2b61186b29f0370234eec9c1bbe306 (patch) | |
tree | 7f90a12333274086e33c4e0fabfd96a8e54e6b6c /sw/source/ui/fmtui | |
parent | d7ba78e9c7be835a1e2ecdacd25995663e96862f (diff) |
Avoid conversions between OUString and OString in VCL
Standardize on OUString, which is the main internal string class.
Convert from/to OUString only when communicating with respective
external APIs.
Removes about 200 conversions from the code.
Change-Id: I96ecee7c6fd271bb76639220e96d69d2964bed26
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149930
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw/source/ui/fmtui')
-rw-r--r-- | sw/source/ui/fmtui/tmpdlg.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index 4f64f86de238..497a8d40e10a 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -63,13 +63,13 @@ SwTemplateDlgController::SwTemplateDlgController(weld::Window* pParent, SfxStyleSheetBase& rBase, SfxStyleFamily nRegion, - const OString& sPage, + const OUString& sPage, SwWrtShell* pActShell, bool bNew) : SfxStyleDialogController(pParent, "modules/swriter/ui/templatedialog" + OUString::number(static_cast<sal_uInt16>(nRegion)) + ".ui", - "TemplateDialog" + OString::number(static_cast<sal_uInt16>(nRegion)), + "TemplateDialog" + OUString::number(static_cast<sal_uInt16>(nRegion)), rBase) , m_nType(nRegion) , m_pWrtShell(pActShell) @@ -267,7 +267,7 @@ void SwTemplateDlgController::RefreshInputSet() pInSet->SetParent( &GetStyleSheet().GetItemSet() ); } -void SwTemplateDlgController::PageCreated(const OString& rId, SfxTabPage &rPage ) +void SwTemplateDlgController::PageCreated(const OUString& rId, SfxTabPage &rPage ) { // set style's and metric's names OUString sNumCharFormat, sBulletCharFormat; |