summaryrefslogtreecommitdiff
path: root/sfx2/inc/sidebar
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 /sfx2/inc/sidebar
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 'sfx2/inc/sidebar')
-rw-r--r--sfx2/inc/sidebar/PanelTitleBar.hxx2
-rw-r--r--sfx2/inc/sidebar/TitleBar.hxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/inc/sidebar/PanelTitleBar.hxx b/sfx2/inc/sidebar/PanelTitleBar.hxx
index 308a0c8f999a..15dc3c5ec68e 100644
--- a/sfx2/inc/sidebar/PanelTitleBar.hxx
+++ b/sfx2/inc/sidebar/PanelTitleBar.hxx
@@ -60,7 +60,7 @@ private:
css::uno::Reference<css::frame::XToolbarController> mxController;
Panel* mpPanel;
- OString msIdent;
+ OUString msIdent;
OUString msMoreOptionsCommand;
};
diff --git a/sfx2/inc/sidebar/TitleBar.hxx b/sfx2/inc/sidebar/TitleBar.hxx
index 1f589508db18..2cd7224bda12 100644
--- a/sfx2/inc/sidebar/TitleBar.hxx
+++ b/sfx2/inc/sidebar/TitleBar.hxx
@@ -59,7 +59,7 @@ protected:
virtual void HandleToolBoxItemClick() = 0;
- DECL_LINK(SelectionHandler, const OString&, void);
+ DECL_LINK(SelectionHandler, const OUString&, void);
private:
void SetBackground();