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, 8 insertions, 8 deletions

diff --git a/xmlsecurity/inc/certificateviewer.hxx b/xmlsecurity/inc/certificateviewer.hxx
index 8aeb5f3368ff..2db66ddba2db 100644
--- a/xmlsecurity/inc/certificateviewer.hxx
+++ b/xmlsecurity/inc/certificateviewer.hxx
@@ -52,7 +52,7 @@ private:
     std::unique_ptr<CertificateViewerDetailsTP> mxDetailsPage;
     std::unique_ptr<CertificateViewerCertPathTP> mxPathId;
 
-    DECL_LINK(ActivatePageHdl, const OString&, void);
+    DECL_LINK(ActivatePageHdl, const OUString&, void);
 
 public:
     CertificateViewer(weld::Window* pParent, const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const css::uno::Reference< css::security::XCertificate >& rXCert, bool bCheckForPrivateKey, CertificateChooser* pParentChooser);
@@ -68,7 +68,7 @@ protected:
 
 public:
     CertificateViewerTP(weld::Container* pParent, const OUString& rUIXMLDescription,
-                        const OString& rID, CertificateViewer* pDlg);
+                        const OUString& rID, CertificateViewer* pDlg);
 };
 
 class CertificateViewerGeneralTP : public CertificateViewerTP
diff --git a/xmlsecurity/inc/macrosecurity.hxx b/xmlsecurity/inc/macrosecurity.hxx
index 52c45ecb3743..5d9feb94c808 100644
--- a/xmlsecurity/inc/macrosecurity.hxx
+++ b/xmlsecurity/inc/macrosecurity.hxx
@@ -40,7 +40,7 @@ private:
     std::unique_ptr<MacroSecurityTP> m_xLevelTP;
     std::unique_ptr<MacroSecurityTP> m_xTrustSrcTP;
 
-    DECL_LINK(ActivatePageHdl, const OString&, void);
+    DECL_LINK(ActivatePageHdl, const OUString&, void);
     DECL_LINK(OkBtnHdl, weld::Button&, void);
 public:
     MacroSecurity(weld::Window* pParent,
@@ -61,7 +61,7 @@ protected:
     MacroSecurity* m_pDlg;
 public:
     MacroSecurityTP(weld::Container* pParent, const OUString& rUIXMLDescription,
-                    const OString& rID, MacroSecurity* pDlg);
+                    const OUString& rID, MacroSecurity* pDlg);
     virtual ~MacroSecurityTP();
 
     virtual void ActivatePage();
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 1801cdf53192..62de673c00e4 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -68,14 +68,14 @@ CertificateViewer::CertificateViewer(weld::Window* _pParent,
     mxTabCtrl->set_current_page("general");
 }
 
-IMPL_LINK(CertificateViewer, ActivatePageHdl, const OString&, rPage, void)
+IMPL_LINK(CertificateViewer, ActivatePageHdl, const OUString&, rPage, void)
 {
     if (rPage == "path")
         mxPathId->ActivatePage();
 }
 
 CertificateViewerTP::CertificateViewerTP(weld::Container* pParent, const OUString& rUIXMLDescription,
-                                         const OString& rID, CertificateViewer* pDlg)
+                                         const OUString& rID, CertificateViewer* pDlg)
     : mxBuilder(Application::CreateBuilder(pParent, rUIXMLDescription))
     , mxContainer(mxBuilder->weld_container(rID))
     , mpDlg(pDlg)
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index f3012dae2eef..ca4df4e64c03 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -71,7 +71,7 @@ MacroSecurity::MacroSecurity(weld::Window* pParent,
     m_xOkBtn->connect_clicked(LINK(this, MacroSecurity, OkBtnHdl));
 }
 
-IMPL_LINK(MacroSecurity, ActivatePageHdl, const OString&, rPage, void)
+IMPL_LINK(MacroSecurity, ActivatePageHdl, const OUString&, rPage, void)
 {
     if (rPage == "SecurityLevelPage")
         m_xLevelTP->ActivatePage();
@@ -80,7 +80,7 @@ IMPL_LINK(MacroSecurity, ActivatePageHdl, const OString&, rPage, void)
 }
 
 MacroSecurityTP::MacroSecurityTP(weld::Container* pParent, const OUString& rUIXMLDescription,
-                                 const OString& rID, MacroSecurity* pDlg)
+                                 const OUString& rID, MacroSecurity* pDlg)
     : m_xBuilder(Application::CreateBuilder(pParent, rUIXMLDescription))
     , m_xContainer(m_xBuilder->weld_container(rID))
     , m_pDlg(pDlg)