From 39c3574b799690d4405d9318a5ba221b5feaccbe Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 27 Apr 2021 18:08:53 +0200 Subject: 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 --- cui/source/dialogs/hlinettp.cxx | 2 +- cui/source/dialogs/hltpbase.cxx | 2 +- cui/source/dialogs/screenshotannotationdlg.cxx | 2 +- cui/source/tabpages/tplnedef.cxx | 2 +- cui/source/tabpages/tplneend.cxx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'cui') diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 0ed40de94df8..86a3da492a69 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -101,7 +101,7 @@ void SvxHyperlinkInternetTp::FillDlgFields(const OUString& rStrURL) //do not show password and user in url if(!aURL.GetUser().isEmpty() || !aURL.GetPass().isEmpty() ) - aURL.SetUserAndPass("", ""); + aURL.SetUserAndPass(u"", u""); } // set URL-field diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 5e95ed6c5e6b..9515443e67d7 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -56,7 +56,7 @@ OUString CreateUiNameFromURL( const OUString& aStrURL ) { //remove password from name INetURLObject aTmpURL(aURLObj); - aTmpURL.SetPass(""); + aTmpURL.SetPass(u""); aStrUiURL = aTmpURL.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ); } break; diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx index fd378f7686f1..f5f214ca4fa9 100644 --- a/cui/source/dialogs/screenshotannotationdlg.cxx +++ b/cui/source/dialogs/screenshotannotationdlg.cxx @@ -322,7 +322,7 @@ IMPL_LINK_NOARG(ScreenshotAnnotationDlg_Impl, saveButtonHandler, weld::Button&, if (aCurrentExtension.isEmpty()) { - aConfirmedURL.setExtension("png"); + aConfirmedURL.setExtension(u"png"); } // open stream diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 23739c287f2a..2d4b04fb79cd 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -759,7 +759,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl, weld::Button&, void) aFile.Append( pDashList->GetName() ); if( aFile.getExtension().isEmpty() ) - aFile.SetExtension( "sod" ); + aFile.SetExtension( u"sod" ); } aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 2d923e166477..d34b016fa7b0 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -579,7 +579,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl, weld::Button&, void) aFile.Append( pLineEndList->GetName() ); if( aFile.getExtension().isEmpty() ) - aFile.SetExtension( "soe" ); + aFile.SetExtension( u"soe" ); } aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); -- cgit v1.2.3