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 /framework | |
| 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 'framework')
| -rw-r--r-- | framework/source/services/substitutepathvars.cxx | 2 | ||||
| -rw-r--r-- | framework/source/services/urltransformer.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 2a3cb4994fc6..84725a3a18c4 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -639,7 +639,7 @@ void SubstitutePathVariables::SetPredefinedPathVariables() // Set $(prog), $(progpath), $(progurl) INetURLObject aProgObj( m_aPreDefVars.m_FixedVar[PREDEFVAR_BRANDBASEURL] ); - if ( !aProgObj.HasError() && aProgObj.insertName( LIBO_BIN_FOLDER ) ) + if ( !aProgObj.HasError() && aProgObj.insertName( u"" LIBO_BIN_FOLDER ) ) { m_aPreDefVars.m_FixedVar[ PREDEFVAR_PROGPATH ] = aProgObj.GetMainURL(INetURLObject::DecodeMechanism::NONE); m_aPreDefVars.m_FixedVar[ PREDEFVAR_PROGURL ] = m_aPreDefVars.m_FixedVar[ PREDEFVAR_PROGPATH ]; diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx index b5d319ef8716..a7655ef9b029 100644 --- a/framework/source/services/urltransformer.cxx +++ b/framework/source/services/urltransformer.cxx @@ -101,8 +101,8 @@ void lcl_ParserHelper(INetURLObject& _rParser, css::util::URL& _rURL,bool _bUseI if ( _bUseIntern ) _rURL.Complete = _rURL.Complete.intern(); - _rParser.SetMark ( OUString() ); - _rParser.SetParam( OUString() ); + _rParser.SetMark( u"" ); + _rParser.SetParam( u"" ); _rURL.Main = _rParser.GetMainURL( INetURLObject::DecodeMechanism::NONE ); } |