summaryrefslogtreecommitdiff
path: root/sw/inc/docsh.hxx
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/inc/docsh.hxx
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/inc/docsh.hxx')
-rw-r--r--sw/inc/docsh.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 890c2c48ed67..e5f86c271cd2 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -134,7 +134,7 @@ class SW_DLLPUBLIC SwDocShell
const SfxStyleFamily nFamily,
SfxStyleSearchBits nMask,
const bool bNew,
- const OString& sPageId,
+ const OUString& sPageId,
SwWrtShell* pActShell,
SfxRequest* pRequest = nullptr,
sal_uInt16 nSlot = 0);
@@ -268,7 +268,7 @@ public:
void FormatPage(
weld::Window* pDialogParent,
const OUString& rPage,
- const OString& rPageId,
+ const OUString& rPageId,
SwWrtShell& rActShell,
SfxRequest* pRequest = nullptr);