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>

4 files changed, 6 insertions, 6 deletions

diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
index d5b9ffd68652..e80e75678c79 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
@@ -154,7 +154,7 @@ void SwCustomizeAddressListDialog::UpdateButtons()
 }
 
 SwAddRenameEntryDialog::SwAddRenameEntryDialog(
-        weld::Window* pParent, const OUString& rUIXMLDescription, const OString& rID,
+        weld::Window* pParent, const OUString& rUIXMLDescription, const OUString& rID,
         const std::vector< OUString >& rCSVHeader)
     : SfxDialogController(pParent, rUIXMLDescription, rID)
     , m_rCSVHeader(rCSVHeader)
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
index 107d7b8554fe..a683ccb8290f 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
@@ -58,7 +58,7 @@ class SwAddRenameEntryDialog : public SfxDialogController
     DECL_LINK(ModifyHdl_Impl, weld::Entry&, void);
 protected:
     SwAddRenameEntryDialog(weld::Window* pParent, const OUString& rUIXMLDescription,
-        const OString& rID, const std::vector< OUString >& rCSVHeader);
+        const OUString& rID, const std::vector< OUString >& rCSVHeader);
 
 public:
     void                SetFieldName(const OUString& rName) { m_xFieldNameED->set_text(rName); }
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index c98462dac378..634e984f2e30 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -86,7 +86,7 @@ SwMailMergeWizard::~SwMailMergeWizard()
 
 std::unique_ptr<BuilderPage> SwMailMergeWizard::createPage(WizardState _nState)
 {
-    OString sIdent(OString::number(_nState));
+    OUString sIdent(OUString::number(_nState));
     weld::Container* pPageContainer = m_xAssistant->append_page(sIdent);
 
     std::unique_ptr<vcl::OWizardPage> xRet;
@@ -237,7 +237,7 @@ void SwMailMergeWizard::UpdateRoadmap()
             case MM_ADDRESSBLOCKPAGE:
                 bEnable = !m_bDocumentLoad && bEnableOutputTypePage;
                 // update page title for email vs letter
-                m_xAssistant->set_page_title(OString::number(MM_ADDRESSBLOCKPAGE), getStateDisplayName(MM_ADDRESSBLOCKPAGE));
+                m_xAssistant->set_page_title(OUString::number(MM_ADDRESSBLOCKPAGE), getStateDisplayName(MM_ADDRESSBLOCKPAGE));
             break;
             case MM_GREETINGSPAGE:
                 bEnable = !m_bDocumentLoad && bEnableOutputTypePage &&
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index 61f17c2f1f1b..f7c17f18c4ca 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -167,7 +167,7 @@ class SwSendQueryBox_Impl : public SwMessageAndEditDialog
     bool            m_bIsEmptyAllowed;
     DECL_LINK( ModifyHdl, weld::Entry&, void);
 public:
-    SwSendQueryBox_Impl(weld::Window* pParent, const OString& rID,
+    SwSendQueryBox_Impl(weld::Window* pParent, const OUString& rID,
         const OUString& rUIXMLDescription);
 
     void SetValue(const OUString& rSet)
@@ -209,7 +209,7 @@ IMPL_LINK( SwSaveWarningBox_Impl, ModifyHdl, weld::Entry&, rEdit, void)
     m_xOKPB->set_sensitive(!rEdit.get_text().isEmpty());
 }
 
-SwSendQueryBox_Impl::SwSendQueryBox_Impl(weld::Window* pParent, const OString& rID,
+SwSendQueryBox_Impl::SwSendQueryBox_Impl(weld::Window* pParent, const OUString& rID,
         const OUString& rUIXMLDescription)
     : SwMessageAndEditDialog(pParent, rID, rUIXMLDescription)
     , m_bIsEmptyAllowed(true)