diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2023-04-02 01:18:42 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2023-04-02 18:46:47 +0200 |
| commit | 116b9d6ddf2b61186b29f0370234eec9c1bbe306 (patch) | |
| tree | 7f90a12333274086e33c4e0fabfd96a8e54e6b6c /xmlsecurity/source | |
| parent | d7ba78e9c7be835a1e2ecdacd25995663e96862f (diff) | |
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>
Diffstat (limited to 'xmlsecurity/source')
| -rw-r--r-- | xmlsecurity/source/dialogs/certificateviewer.cxx | 4 | ||||
| -rw-r--r-- | xmlsecurity/source/dialogs/macrosecurity.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
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) |