summaryrefslogtreecommitdiff
path: root/sw/source/ui/frmdlg
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2023-04-02 01:18:42 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2023-04-02 18:46:47 +0200
commit116b9d6ddf2b61186b29f0370234eec9c1bbe306 (patch)
tree7f90a12333274086e33c4e0fabfd96a8e54e6b6c /sw/source/ui/frmdlg
parentd7ba78e9c7be835a1e2ecdacd25995663e96862f (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/frmdlg')
-rw-r--r--sw/source/ui/frmdlg/frmdlg.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index b7124046d617..0eaf29dfe6db 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -47,11 +47,11 @@ SwFrameDlg::SwFrameDlg(const SfxViewFrame& rViewFrame,
bool bNewFrame,
const OUString& sResType,
bool bFormat,
- const OString& sDefPage,
+ const OUString& sDefPage,
const OUString* pStr)
: SfxTabDialogController(pParent, "modules/swriter/ui/" + sResType.toAsciiLowerCase() + ".ui",
- sResType.toUtf8(), &rCoreSet, pStr != nullptr)
+ sResType, &rCoreSet, pStr != nullptr)
, m_bFormat(bFormat)
, m_bNew(bNewFrame)
, m_rSet(rCoreSet)
@@ -123,7 +123,7 @@ SwFrameDlg::~SwFrameDlg()
{
}
-void SwFrameDlg::PageCreated(const OString& rId, SfxTabPage &rPage)
+void SwFrameDlg::PageCreated(const OUString& rId, SfxTabPage &rPage)
{
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
if (rId == "type")