diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2020-12-17 22:02:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-12-19 17:53:06 +0100 |
| commit | 46c5de832868d2812448b2caace3eeaa9237b9f6 (patch) | |
| tree | 6f25538cfb7a0def54ff7ac5b6b17eb22a76178a /xmlsecurity | |
| parent | 6dd1d2268487920e8bda44dfd169a5bda4d62f13 (diff) | |
make *String(string_view) constructors explicit
to make it more obvious when we are constructing heap OUStrings
code and potentially inadvertently throwing away performance.
And fix a handful of places so revealed.
Change-Id: I0cf390f78026f8a670aaab53424cd31510633051
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107923
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/dialogs/certificateviewer.cxx | 2 | ||||
| -rw-r--r-- | xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index fbbdcf53514d..2e1a2e49adf2 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -364,7 +364,7 @@ void CertificateViewerCertPathTP::InsertCert(const weld::TreeIter* pParent, cons maUserData.emplace_back(std::make_unique<CertPath_UserData>(rxCert, bValid)); OUString sId(OUString::number(reinterpret_cast<sal_Int64>(maUserData.back().get()))); mxCertPathLB->insert(pParent, -1, &rName, &sId, nullptr, nullptr, false, mxScratchIter.get()); - mxCertPathLB->set_image(*mxScratchIter, sImage); + mxCertPathLB->set_image(*mxScratchIter, OUString(sImage)); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index c29f43b4b91b..1d373417fd27 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -496,7 +496,7 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, CertMgrButtonHdl, weld::Button&, void) for ( auto const &rServer : aGUIServers ) { - osl::FileBase::RC searchError = osl::File::searchFileURL(rServer, aPath, sFoundGUIServer ); + osl::FileBase::RC searchError = osl::File::searchFileURL(OUString(rServer), aPath, sFoundGUIServer ); if (searchError == osl::FileBase::E_None) { osl::File::getSystemPathFromFileURL( sFoundGUIServer, sExecutable ); |