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>

1 files changed, 11 insertions, 11 deletions

diff --git a/vcl/inc/verticaltabctrl.hxx b/vcl/inc/verticaltabctrl.hxx
index 2575fc4ebe9b..850e34476496 100644
--- a/vcl/inc/verticaltabctrl.hxx
+++ b/vcl/inc/verticaltabctrl.hxx
@@ -34,7 +34,7 @@ class VerticalTabControl final : public VclHBox
     VclPtr<VclVBox> m_xBox;
 
     std::vector<std::unique_ptr<VerticalTabPageData>> maPageList;
-    OString m_sCurrentPageId;
+    OUString m_sCurrentPageId;
 
     Link<VerticalTabControl*, void> m_aActivateHdl;
     Link<VerticalTabControl*, bool> m_aDeactivateHdl;
@@ -44,7 +44,7 @@ class VerticalTabControl final : public VclHBox
     void ActivatePage();
     bool DeactivatePage();
 
-    VerticalTabPageData* GetPageData(std::string_view rId) const;
+    VerticalTabPageData* GetPageData(std::u16string_view rId) const;
     VerticalTabPageData* GetPageData(const SvxIconChoiceCtrlEntry* pEntry) const;
 
 public:
@@ -54,15 +54,15 @@ public:
 
     sal_uInt16 GetPageCount() const { return m_xChooser->GetEntryCount(); }
 
-    const OString& GetCurPageId() const { return m_sCurrentPageId; }
-    void SetCurPageId(const OString& rId);
+    const OUString& GetCurPageId() const { return m_sCurrentPageId; }
+    void SetCurPageId(const OUString& rId);
 
-    sal_uInt16 GetPagePos(std::string_view rPageId) const;
-    const OString& GetPageId(sal_uInt16 nIndex) const;
-    VclPtr<vcl::Window> GetPage(std::string_view rPageId) const;
+    sal_uInt16 GetPagePos(std::u16string_view rPageId) const;
+    const OUString& GetPageId(sal_uInt16 nIndex) const;
+    VclPtr<vcl::Window> GetPage(std::u16string_view rPageId) const;
 
-    void RemovePage(std::string_view rPageId);
-    void InsertPage(const OString& rPageId, const OUString& rLabel, const Image& rImage,
+    void RemovePage(std::u16string_view rPageId);
+    void InsertPage(const OUString& rPageId, const OUString& rLabel, const Image& rImage,
                     const OUString& rTooltip, VclPtr<vcl::Window> xPage, int nPos = -1);
 
     void SetActivatePageHdl(const Link<VerticalTabControl*, void>& rLink)
@@ -74,8 +74,8 @@ public:
         m_aDeactivateHdl = rLink;
     }
 
-    OUString GetPageText(std::string_view rPageId) const;
-    void SetPageText(std::string_view rPageId, const OUString& rText);
+    OUString GetPageText(std::u16string_view rPageId) const;
+    void SetPageText(std::u16string_view rPageId, const OUString& rText);
 
     vcl::Window* GetPageParent() { return m_xBox.get(); }