diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 08:47:18 +0200 |
---|---|---|
committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-18 01:07:53 -0500 |
commit | 3c4333c24882d6699b65d109f2cfbf7daf3122c6 (patch) | |
tree | 739dacdd38ddd2053aaa3ad7f0ffc053eb515d52 /scripting | |
parent | 6b631a02d36aa09f7c06793e8b4482d3b67ab258 (diff) |
convert DecodeMechanism to scoped enum
(cherry picked from commit bfde4866e07746eafa2f0d6173c29d805cc35ad0)
(cherry picked from commit 3de922d4a695e253d4ca2d42b70e0b35b52e9b7c)
Change-Id: I5c56634b1bca8e37fa73d02d2428645301b6c547
Diffstat (limited to 'scripting')
-rw-r--r-- | scripting/source/dlgprov/dlgprov.cxx | 2 | ||||
-rw-r--r-- | scripting/source/provider/MasterScriptProvider.cxx | 2 | ||||
-rw-r--r-- | scripting/source/stringresource/stringresource.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index c47a84959277..2a41e8ee573a 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -91,7 +91,7 @@ namespace dlgprov INetURLObject aInetObj( i_sURL ); OUString aDlgName = aInetObj.GetBase(); aInetObj.removeSegment(); - OUString aDlgLocation = aInetObj.GetMainURL( INetURLObject::NO_DECODE ); + OUString aDlgLocation = aInetObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ); bool bReadOnly = true; css::lang::Locale aLocale = Application::GetSettings().GetUILanguageTag().getLocale(); OUString aComment; diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index 888b7f9800b1..764731c2ea2d 100644 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -470,7 +470,7 @@ MasterScriptProvider::parseLocationName( const OUString& location ) OUString temp = location; INetURLObject aURLObj( temp ); if ( !aURLObj.HasError() ) - temp = aURLObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); + temp = aURLObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset ); return temp; } diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index f63cda1d5696..27f730f12533 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -1804,7 +1804,7 @@ OUString StringResourcePersistenceImpl::implGetPathForLocaleItem aInetObj.setExtension( "default" ); else aInetObj.setExtension( "properties" ); - OUString aCompleteFileName = aInetObj.GetMainURL( INetURLObject::NO_DECODE ); + OUString aCompleteFileName = aInetObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ); return aCompleteFileName; } |