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>

15 files changed, 28 insertions, 28 deletions

diff --git a/include/svx/SvxPresetListBox.hxx b/include/svx/SvxPresetListBox.hxx
index ec608c830754..027a9248e687 100644
--- a/include/svx/SvxPresetListBox.hxx
+++ b/include/svx/SvxPresetListBox.hxx
@@ -32,7 +32,7 @@ private:
     Link<SvxPresetListBox*,void> maRenameHdl;
     Link<SvxPresetListBox*,void> maDeleteHdl;
 
-    void OnMenuItemSelected(std::string_view rIdent);
+    void OnMenuItemSelected(std::u16string_view rIdent);
 
     template< typename ListType, typename EntryType >
     void FillPresetListBoxImpl(ListType& pList, sal_uInt32 nStartIndex);
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index faf5aea9b7e1..6c84a53a0d9a 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -151,7 +151,7 @@ protected:
     // abstraction layers are: Unicode<->MapIndex<->Pixel
     Point           MapIndexToPixel( int) const;
     DECL_DLLPRIVATE_LINK(VscrollHdl, weld::ScrolledWindow&, void);
-    void ContextMenuSelect(std::string_view rIdent);
+    void ContextMenuSelect(std::u16string_view rIdent);
 
     void            init();
     tools::Rectangle       getGridRectangle(const Point &rPointUL, const Size &rOutputSize) const;
diff --git a/include/svx/colorbox.hxx b/include/svx/colorbox.hxx
index 2705833ee37d..e48fe4809729 100644
--- a/include/svx/colorbox.hxx
+++ b/include/svx/colorbox.hxx
@@ -85,7 +85,7 @@ public:
     void show() { m_xButton->show(); }
     void hide() { m_xButton->hide(); }
     void set_visible(bool bShow) { m_xButton->set_visible(bShow); }
-    void set_help_id(const OString& rHelpId) { m_xButton->set_help_id(rHelpId); }
+    void set_help_id(const OUString& rHelpId) { m_xButton->set_help_id(rHelpId); }
     void connect_focus_in(const Link<weld::Widget&, void>& rLink)
     {
         m_xButton->connect_focus_in(rLink);
diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx
index 4a0e951322ab..0a2e0a5ffeb8 100644
--- a/include/svx/colorwindow.hxx
+++ b/include/svx/colorwindow.hxx
@@ -56,14 +56,14 @@ private:
     weld::MenuButton* m_pMenuButton;
     // or
     weld::Toolbar* m_pToolbar;
-    OString m_aIdent;
+    OUString m_aIdent;
     // or
     SvxColorToolBoxControl* m_pControl;
     VclPtr<ToolBox> m_xToolBox;
     ToolBoxItemId m_nId;
 public:
     MenuOrToolMenuButton(weld::MenuButton* pMenuButton);
-    MenuOrToolMenuButton(weld::Toolbar* pToolbar, OString sIdent);
+    MenuOrToolMenuButton(weld::Toolbar* pToolbar, OUString sIdent);
     MenuOrToolMenuButton(SvxColorToolBoxControl* pControl, ToolBox* pToolbar, ToolBoxItemId nId);
     ~MenuOrToolMenuButton();
 
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index 84cf456cb58a..f852a4886bd7 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -138,7 +138,7 @@ protected:
     std::unique_ptr<weld::Builder> m_xBuilder;
     std::unique_ptr<weld::Container> m_xContainer;
 public:
-    SvxTPage(weld::Container* pParent, const OUString& rUIXMLDescription, const OString& rID);
+    SvxTPage(weld::Container* pParent, const OUString& rUIXMLDescription, const OUString& rID);
     virtual ~SvxTPage();
     virtual void ActivatePage();
     void Show() { m_xContainer->show(); }
@@ -321,8 +321,8 @@ private:
     std::unique_ptr<SvxTPFilter> m_xTPFilter;
     std::unique_ptr<SvxTPView> m_xTPView;
 
-    DECL_DLLPRIVATE_LINK(ActivatePageHdl, const OString&, void);
-    DECL_DLLPRIVATE_LINK(DeactivatePageHdl, const OString&, bool);
+    DECL_DLLPRIVATE_LINK(ActivatePageHdl, const OUString&, void);
+    DECL_DLLPRIVATE_LINK(DeactivatePageHdl, const OUString&, bool);
 
 public:
     SvxAcceptChgCtr(weld::Container* pParent);
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 75e51d276411..ffdce3797769 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -44,7 +44,7 @@ class SAL_WARN_UNUSED SvxTabPage : public SfxTabPage
 {
 
 public:
-    SvxTabPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet &rAttrSet)
+    SvxTabPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OUString& rID, const SfxItemSet &rAttrSet)
         : SfxTabPage(pPage, pController, rUIXMLDescription, rID, &rAttrSet)
     {
     }
diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index 57ba3ccd8bbf..43d59ecb3ec1 100644
--- a/include/svx/fmgridcl.hxx
+++ b/include/svx/fmgridcl.hxx
@@ -66,7 +66,7 @@ protected:
                                                 weld::Menu& rShowMenu);
     /** After executing the context menu for a column this method is called.
     */
-    virtual void    PostExecuteColumnContextMenu(sal_uInt16 nColId, const weld::Menu& rMenu, const OString& rExecutionResult);
+    virtual void    PostExecuteColumnContextMenu(sal_uInt16 nColId, const weld::Menu& rMenu, const OUString& rExecutionResult);
 
     // DropTargetHelper
     virtual sal_Int8    AcceptDrop( const AcceptDropEvent& rEvt ) override;
diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx
index 7fe65fd452d0..c726382756e6 100644
--- a/include/svx/fontwork.hxx
+++ b/include/svx/fontwork.hxx
@@ -76,9 +76,9 @@ class SAL_WARN_UNUSED SvxFontWorkDialog final : public SfxDockingWindow
     SfxBindings&    rBindings;
     Idle            aInputIdle;
 
-    OString         m_sLastStyleTbxId;
-    OString         m_sLastAdjustTbxId;
-    OString         m_sLastShadowTbxId;
+    OUString         m_sLastStyleTbxId;
+    OUString         m_sLastAdjustTbxId;
+    OUString         m_sLastShadowTbxId;
 
     tools::Long            nSaveShadowX;
     tools::Long            nSaveShadowY;
@@ -105,9 +105,9 @@ class SAL_WARN_UNUSED SvxFontWorkDialog final : public SfxDockingWindow
     friend class SvxFontWorkChildWindow;
     friend class SvxFontWorkControllerItem;
 
-    DECL_LINK( SelectStyleHdl_Impl, const OString&, void );
-    DECL_LINK( SelectAdjustHdl_Impl, const OString&, void );
-    DECL_LINK( SelectShadowHdl_Impl, const OString&, void );
+    DECL_LINK( SelectStyleHdl_Impl, const OUString&, void );
+    DECL_LINK( SelectAdjustHdl_Impl, const OUString&, void );
+    DECL_LINK( SelectShadowHdl_Impl, const OUString&, void );
 
     DECL_LINK( ModifyInputHdl_Impl, weld::MetricSpinButton&, void );
     DECL_LINK( InputTimeoutHdl_Impl, Timer*, void );
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 54a99269cf7f..b8057fd61823 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -347,7 +347,7 @@ protected:
     virtual void PreExecuteRowContextMenu(weld::Menu& rMenu);
     /** After executing the context menu for a row this method is called.
     */
-    virtual void PostExecuteRowContextMenu(const OString& rExecutionResult);
+    virtual void PostExecuteRowContextMenu(const OUString& rExecutionResult);
 
     /// @throws css::uno::RuntimeException
     void DataSourcePropertyChanged(const css::beans::PropertyChangeEvent& evt);
diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx
index e3586e290d7a..07a73b17b763 100644
--- a/include/svx/imapdlg.hxx
+++ b/include/svx/imapdlg.hxx
@@ -104,7 +104,7 @@ class SVX_DLLPUBLIC SvxIMapDlg final : public SfxModelessDialogController
     std::unique_ptr<weld::Label> m_xStbStatus3;
     std::unique_ptr<weld::CustomWeld> m_xIMapWndWeld;
 
-    DECL_DLLPRIVATE_LINK( TbxClickHdl, const OString&, void );
+    DECL_DLLPRIVATE_LINK( TbxClickHdl, const OUString&, void );
     DECL_DLLPRIVATE_LINK( InfoHdl, IMapWindow&, void );
     DECL_DLLPRIVATE_LINK( MousePosHdl, GraphCtrl*, void );
     DECL_DLLPRIVATE_LINK( GraphSizeHdl, GraphCtrl*, void );
@@ -118,7 +118,7 @@ class SVX_DLLPUBLIC SvxIMapDlg final : public SfxModelessDialogController
     void                URLModify();
     void                DoOpen();
     bool                DoSave();
-    void                SetActiveTool(std::string_view rId);
+    void                SetActiveTool(std::u16string_view rId);
 
 public:
 
diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx
index 58b9e0a5c85b..486515f1822a 100644
--- a/include/svx/ruler.hxx
+++ b/include/svx/ruler.hxx
@@ -218,8 +218,8 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
     tools::Long GetLeftMin() const;
     tools::Long GetRightMax() const;
 
-    void TabMenuSelect(std::string_view rIdent);
-    void MenuSelect(std::string_view ident);
+    void TabMenuSelect(std::u16string_view rIdent);
+    void MenuSelect(std::u16string_view ident);
     void PrepareProportional_Impl(RulerType);
 
     enum class UpdateType
diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx
index 214617b725af..75675ca140fa 100644
--- a/include/svx/sidebar/AreaPropertyPanelBase.hxx
+++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx
@@ -159,7 +159,7 @@ protected:
     DECL_DLLPRIVATE_LINK(ModifyTransparentHdl_Impl, weld::MetricSpinButton&, void);
     DECL_DLLPRIVATE_LINK(ModifyTransSliderHdl, weld::Scale&, void);
     DECL_DLLPRIVATE_LINK(ClickImportBitmapHdl, weld::Button&, void);
-    DECL_DLLPRIVATE_LINK(ToolbarHdl_Impl, const OString&, void);
+    DECL_DLLPRIVATE_LINK(ToolbarHdl_Impl, const OUString&, void);
 
     void ImpUpdateTransparencies();
     void SetTransparency(sal_uInt16 nVal);
diff --git a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
index 3383884a807f..18891e0e2348 100644
--- a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
+++ b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
@@ -47,8 +47,8 @@ private:
     void InitStatus(XFillFloatTransparenceItem const* pGradientItem);
     void ExecuteValueModify(sal_uInt8 nStartCol, sal_uInt8 nEndCol);
     DECL_LINK(ModifiedTrgrHdl_Impl, weld::MetricSpinButton&, void);
-    DECL_LINK(Left_Click45_Impl, const OString&, void);
-    DECL_LINK(Right_Click45_Impl, const OString&, void);
+    DECL_LINK(Left_Click45_Impl, const OUString&, void);
+    DECL_LINK(Right_Click45_Impl, const OUString&, void);
 
 public:
     AreaTransparencyGradientPopup(const css::uno::Reference<css::frame::XFrame>& rFrame,
diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx
index f5eef671635c..891ca7aa1804 100644
--- a/include/svx/sidebar/LinePropertyPanelBase.hxx
+++ b/include/svx/sidebar/LinePropertyPanelBase.hxx
@@ -127,7 +127,7 @@ private:
 
     void Initialize();
 
-    DECL_DLLPRIVATE_LINK(ToolboxWidthSelectHdl, const OString&, void);
+    DECL_DLLPRIVATE_LINK(ToolboxWidthSelectHdl, const OUString&, void);
     DECL_DLLPRIVATE_LINK(ChangeTransparentHdl, weld::MetricSpinButton&, void);
     DECL_DLLPRIVATE_LINK(ChangeEdgeStyleHdl, weld::ComboBox&, void);
     DECL_DLLPRIVATE_LINK(ChangeCapStyleHdl, weld::ComboBox&, void);
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index ded2d20c4e02..d361c6800dca 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -165,8 +165,8 @@ public:
     virtual void    GetName( OUString& rName ) = 0;
     virtual void    SetCheckNameHdl( const Link<AbstractSvxNameDialog&,bool>& rLink, bool bCheckImmediately = false ) = 0;
     virtual void    SetCheckNameTooltipHdl( const Link<AbstractSvxNameDialog&,OUString>& rLink ) = 0;
-    virtual void    SetEditHelpId(const OString&) = 0;
-    virtual void    SetHelpId( const OString& ) = 0;
+    virtual void    SetEditHelpId(const OUString&) = 0;
+    virtual void    SetHelpId( const OUString& ) = 0;
     virtual void    SetText( const OUString& rStr ) = 0;
 };
 
@@ -443,7 +443,7 @@ public:
 
     virtual std::shared_ptr<SvxAbstractNewTableDialog> CreateSvxNewTableDialog(weld::Window* pParent) = 0;
 
-    virtual VclPtr<SvxAbstractInsRowColDlg> CreateSvxInsRowColDlg(weld::Window* pParent, bool bCol, const OString& rHelpId) = 0;
+    virtual VclPtr<SvxAbstractInsRowColDlg> CreateSvxInsRowColDlg(weld::Window* pParent, bool bCol, const OUString& rHelpId) = 0;
 };
 
 #endif