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 /include/vcl/notebookbar | |
| 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 'include/vcl/notebookbar')
| -rw-r--r-- | include/vcl/notebookbar/NotebookBarAddonsMerger.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/notebookbar/notebookbar.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/vcl/notebookbar/NotebookBarAddonsMerger.hxx b/include/vcl/notebookbar/NotebookBarAddonsMerger.hxx index 87c843620c68..30ab04be2b6e 100644 --- a/include/vcl/notebookbar/NotebookBarAddonsMerger.hxx +++ b/include/vcl/notebookbar/NotebookBarAddonsMerger.hxx @@ -53,7 +53,7 @@ void MergeNotebookBarAddons(vcl::Window* pParent, const VclBuilder::customMakeWi const css::uno::Reference<css::frame::XFrame>& rFrame, const NotebookBarAddonsItem& aNotebookBarAddonsItem, VclBuilder::stringmap& rVec); -void MergeNotebookBarMenuAddons(Menu* pPopupMenu, sal_Int16 nItemId, const OString& sItemIdName, +void MergeNotebookBarMenuAddons(Menu* pPopupMenu, sal_Int16 nItemId, const OUString& sItemIdName, NotebookBarAddonsItem& aNotebookBarAddonsItem); }; diff --git a/include/vcl/notebookbar/notebookbar.hxx b/include/vcl/notebookbar/notebookbar.hxx index b93e3707fb7c..15186fce2cc3 100644 --- a/include/vcl/notebookbar/notebookbar.hxx +++ b/include/vcl/notebookbar/notebookbar.hxx @@ -28,7 +28,7 @@ class VCL_DLLPUBLIC NotebookBar final : public Control, public VclBuilderContain { friend class NotebookBarContextChangeEventListener; public: - NotebookBar(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, + NotebookBar(Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame>& rFrame, const NotebookBarAddonsItem& aNotebookBarAddonsItem); virtual ~NotebookBar() override; |