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>

11 files changed, 18 insertions, 18 deletions

diff --git a/dbaccess/source/ui/inc/ChildWindow.hxx b/dbaccess/source/ui/inc/ChildWindow.hxx
index 8da6c8570dea..c2f68ac46f78 100644
--- a/dbaccess/source/ui/inc/ChildWindow.hxx
+++ b/dbaccess/source/ui/inc/ChildWindow.hxx
@@ -16,7 +16,7 @@ namespace dbaui
 class OChildWindow
 {
 protected:
-    OChildWindow(weld::Container* pParent, const OUString& rUIXMLDescription, const OString& rID);
+    OChildWindow(weld::Container* pParent, const OUString& rUIXMLDescription, const OUString& rID);
     std::unique_ptr<weld::Builder> m_xBuilder;
     std::unique_ptr<weld::Container> m_xContainer;
 
@@ -29,7 +29,7 @@ public:
 
     void Enable(bool bEnable) { m_xContainer->set_sensitive(bEnable); }
 
-    void SetHelpId(const OString& rHelpId) { m_xContainer->set_help_id(rHelpId); }
+    void SetHelpId(const OUString& rHelpId) { m_xContainer->set_help_id(rHelpId); }
 
     void Show() { m_xContainer->show(); }
 };
diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx
index 478a41070f73..410e086116fe 100644
--- a/dbaccess/source/ui/inc/FieldDescControl.hxx
+++ b/dbaccess/source/ui/inc/FieldDescControl.hxx
@@ -117,9 +117,9 @@ namespace dbaui
         void                UpdateFormatSample(OFieldDescription const * pFieldDescr);
 
         bool                isTextFormat(const OFieldDescription* _pFieldDescr,sal_uInt32& _nFormatKey) const;
-        std::unique_ptr<OPropNumericEditCtrl> CreateNumericControl(const OString& rId, TranslateId pHelpId, short _nProperty, const OString& _sHelpId);
-        void                InitializeControl(weld::Widget* _pControl,const OString& _sHelpId);
-        void                InitializeControl(OPropListBoxCtrl* _pControl,const OString& _sHelpId,bool _bAddChangeHandler);
+        std::unique_ptr<OPropNumericEditCtrl> CreateNumericControl(const OUString& rId, TranslateId pHelpId, short _nProperty, const OUString& _sHelpId);
+        void                InitializeControl(weld::Widget* _pControl,const OUString& _sHelpId);
+        void                InitializeControl(OPropListBoxCtrl* _pControl,const OUString& _sHelpId,bool _bAddChangeHandler);
 
         bool                IsFocusInEditableWidget() const;
 
@@ -165,7 +165,7 @@ namespace dbaui
         void                SetReadOnly( bool bReadOnly );
 
         void                Enable(bool bEnable) { m_xContainer->set_sensitive(bEnable); }
-        void                SetHelpId(const OString& rId) { m_xContainer->set_help_id(rId); }
+        void                SetHelpId(const OUString& rId) { m_xContainer->set_help_id(rId); }
 
         virtual bool        isCutAllowed() override;
         virtual bool        isCopyAllowed() override;
diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx
index 941eab5faed3..95edbe5f5527 100644
--- a/dbaccess/source/ui/inc/UserAdminDlg.hxx
+++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx
@@ -47,7 +47,7 @@ namespace dbaui
         css::uno::Reference< css::sdbc::XConnection>          m_xConnection;
         bool          m_bOwnConnection;
     protected:
-        virtual void PageCreated(const OString& rId, SfxTabPage& _rPage) override;
+        virtual void PageCreated(const OUString& rId, SfxTabPage& _rPage) override;
     public:
         OUserAdminDlg(weld::Window* pParent, SfxItemSet* pItems,
                       const css::uno::Reference< css::uno::XComponentContext >& rxORB,
diff --git a/dbaccess/source/ui/inc/WTabPage.hxx b/dbaccess/source/ui/inc/WTabPage.hxx
index cc7564cbae59..ef3d7f23b20c 100644
--- a/dbaccess/source/ui/inc/WTabPage.hxx
+++ b/dbaccess/source/ui/inc/WTabPage.hxx
@@ -31,7 +31,7 @@ namespace dbaui
         OCopyTableWizard*       m_pParent;
         bool                    m_bFirstTime;   // Page is called the first time; should be set in the reset method
 
-        OWizardPage(weld::Container* pPage, OCopyTableWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID);
+        OWizardPage(weld::Container* pPage, OCopyTableWizard* pWizard, const OUString& rUIXMLDescription, const OUString& rID);
 
     public:
         virtual ~OWizardPage() override;
diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
index b28fe5ce3857..7c38562145a5 100644
--- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
+++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
@@ -37,7 +37,7 @@ namespace dbaui
         std::unique_ptr<ODbDataSourceAdministrationHelper>  m_pImpl;
 
     protected:
-        virtual void PageCreated(const OString& rId, SfxTabPage& _rPage) override;
+        virtual void PageCreated(const OUString& rId, SfxTabPage& _rPage) override;
         virtual short Ok() override;
 
     public:
diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx
index a99c2c3affe3..6042f761ce2f 100644
--- a/dbaccess/source/ui/inc/curledit.hxx
+++ b/dbaccess/source/ui/inc/curledit.hxx
@@ -43,7 +43,7 @@ public:
 public:
     bool get_visible() const { return m_xEntry->get_visible(); }
     void connect_changed(const Link<weld::Entry&, void>& rLink) { m_xEntry->connect_changed(rLink); }
-    void set_help_id(const OString& rName) { m_xEntry->set_help_id(rName); }
+    void set_help_id(const OUString& rName) { m_xEntry->set_help_id(rName); }
     void hide()
     {
         m_xEntry->hide();
diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx
index 8caf3c129102..53222a6afca2 100644
--- a/dbaccess/source/ui/inc/dbadmin.hxx
+++ b/dbaccess/source/ui/inc/dbadmin.hxx
@@ -49,7 +49,7 @@ class ODbAdminDialog final : public SfxTabDialogController, public IItemSetHelpe
 private:
     std::unique_ptr<ODbDataSourceAdministrationHelper>  m_pImpl;
 
-    OString             m_sMainPageID;
+    OUString             m_sMainPageID;
 
 public:
     /** ctor. The itemset given should have been created by <method>createItemSet</method> and should be destroyed
@@ -89,9 +89,9 @@ public:
 
 private:
     // adds a new detail page and remove all the old ones
-    void addDetailPage(const OString& rPageId, TranslateId pTextId, CreateTabPage pCreateFunc);
+    void addDetailPage(const OUString& rPageId, TranslateId pTextId, CreateTabPage pCreateFunc);
 
-    virtual void PageCreated(const OString& rId, SfxTabPage& _rPage) override;
+    virtual void PageCreated(const OUString& rId, SfxTabPage& _rPage) override;
     virtual short Ok() override;
 
     /// select a datasource with a given name, adjust the item set accordingly, and everything like that ..
diff --git a/dbaccess/source/ui/inc/dlgattr.hxx b/dbaccess/source/ui/inc/dlgattr.hxx
index 6c3a00f95472..83fe0466e4f8 100644
--- a/dbaccess/source/ui/inc/dlgattr.hxx
+++ b/dbaccess/source/ui/inc/dlgattr.hxx
@@ -34,7 +34,7 @@ namespace dbaui
         SbaSbAttrDlg(weld::Widget* pParent, const SfxItemSet*, SvNumberFormatter*, bool bHasFormat);
         virtual ~SbaSbAttrDlg() override;
 
-        virtual void  PageCreated(const OString& rPageId, SfxTabPage& rTabPage) override;
+        virtual void  PageCreated(const OUString& rPageId, SfxTabPage& rTabPage) override;
     };
 }   // namespace dbaui
 
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx
index f03b04f6f0b8..b3ba37936e79 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -74,7 +74,7 @@ namespace dbaui
         void IndexSelected();
 
         DECL_LINK( OnIndexSelected, weld::TreeView&, void );
-        DECL_LINK( OnIndexAction, const OString&, void );
+        DECL_LINK( OnIndexAction, const OUString&, void );
         DECL_LINK( OnEntryEditing, const weld::TreeIter&, bool );
         DECL_LINK( OnEntryEdited, const IterString&, bool );
         DECL_LINK( OnModifiedClick, weld::Toggleable&, void );
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index 4c0f37654647..ae96bb291bbb 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -163,7 +163,7 @@ namespace dbaui
         virtual void    PreExecuteColumnContextMenu(sal_uInt16 nColId, weld::Menu& rMenu,
                                                     weld::Menu& rInsertMenu, weld::Menu& rChangeMenu,
                                                     weld::Menu& rShowMenu) override;
-        virtual void    PostExecuteColumnContextMenu(sal_uInt16 nColId, const weld::Menu& rMenu, const OString& rExecutionResult) override;
+        virtual void    PostExecuteColumnContextMenu(sal_uInt16 nColId, const weld::Menu& rMenu, const OUString& rExecutionResult) override;
 
     private:
         // DragSourceHelper overridables
@@ -254,7 +254,7 @@ namespace dbaui
 
         // DbGridControl overridables
         virtual void PreExecuteRowContextMenu(weld::Menu& rMenu) override;
-        virtual void PostExecuteRowContextMenu(const OString& rExecutionResult) override;
+        virtual void PostExecuteRowContextMenu(const OUString& rExecutionResult) override;
 
         // DbGridControl overridables
         virtual void onRowChange() override;
diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx
index ad6cb25b4d63..481732985d12 100644
--- a/dbaccess/source/ui/inc/sqlmessage.hxx
+++ b/dbaccess/source/ui/inc/sqlmessage.hxx
@@ -106,7 +106,7 @@ public:
                 const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = nullptr );
 
     void set_title(const OUString& rTitle) { m_xDialog->set_title(rTitle); }
-    void add_button(const OUString& rText, int nResponse, const OString& rHelpId = OString()) { m_xDialog->add_button(rText, nResponse, rHelpId); }
+    void add_button(const OUString& rText, int nResponse, const OUString& rHelpId = {}) { m_xDialog->add_button(rText, nResponse, rHelpId); }
     void set_default_response(int nResponse) { m_xDialog->set_default_response(nResponse); }
 
     virtual ~OSQLMessageBox() override;