diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-04-27 18:08:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-04-28 15:41:02 +0200 |
| commit | 39c3574b799690d4405d9318a5ba221b5feaccbe (patch) | |
| tree | 40cacd124e11dd71b23affec3713c6f0fef27906 /vcl | |
| parent | 9658115370bf33c2fdb68a3b759cf2f9d9e7c6c1 (diff) | |
use string_view in INetURLObject::encode
Change-Id: Ib686c6872388b02c8939d3b65f6bd25cda348bc8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114754
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/image/ImplImageTree.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/printer/printerinfomanager.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 99918b8df1b1..6efb3ac3e81a 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -3338,7 +3338,7 @@ we check in the following sequence: else if( aFileExtension.equalsIgnoreAsciiCase( "ods" ) ) bChangeFileExtensionToPDF = true; if( bChangeFileExtensionToPDF ) - aTargetURL.setExtension("pdf" ); + aTargetURL.setExtension(u"pdf" ); } //check if extension is pdf, see if GoToR should be forced bTargetHasPDFExtension = aTargetURL.GetFileExtension().equalsIgnoreAsciiCase( "pdf" ); diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx index 51f61f1f29b4..227b5981be52 100644 --- a/vcl/source/image/ImplImageTree.cxx +++ b/vcl/source/image/ImplImageTree.cxx @@ -488,7 +488,7 @@ void ImplImageTree::createStyle() INetURLObject aUrl(path); OSL_ASSERT(!aUrl.HasError()); - bool ok = aUrl.Append("images_" + maCurrentStyle, INetURLObject::EncodeMechanism::All); + bool ok = aUrl.Append(OUString("images_" + maCurrentStyle), INetURLObject::EncodeMechanism::All); OSL_ASSERT(ok); sThemeUrl = aUrl.GetMainURL(INetURLObject::DecodeMechanism::NONE) + ".zip"; if (urlExists(sThemeUrl)) diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index 227b185f904e..ddb8f93bcb74 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -212,7 +212,7 @@ void PrinterInfoManager::initialize() for (auto const& printDir : aDirList) { INetURLObject aFile( printDir, INetProtocol::File, INetURLObject::EncodeMechanism::All ); - aFile.Append( PRINT_FILENAME ); + aFile.Append( u"" PRINT_FILENAME ); Config aConfig( aFile.PathToFileName() ); if( aConfig.HasGroup( GLOBAL_DEFAULTS_GROUP ) ) { @@ -282,7 +282,7 @@ void PrinterInfoManager::initialize() { INetURLObject aDir( printDir, INetProtocol::File, INetURLObject::EncodeMechanism::All ); INetURLObject aFile( aDir ); - aFile.Append( PRINT_FILENAME ); + aFile.Append( u"" PRINT_FILENAME ); // check directory validity OUString aUniPath; |