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 /extensions | |
| parent | 6b631a02d36aa09f7c06793e8b4482d3b67ab258 (diff) | |
convert DecodeMechanism to scoped enum
(cherry picked from commit bfde4866e07746eafa2f0d6173c29d805cc35ad0)
(cherry picked from commit 3de922d4a695e253d4ca2d42b70e0b35b52e9b7c)
Change-Id: I5c56634b1bca8e37fa73d02d2428645301b6c547
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/abpilot/abpfinalpage.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/abpilot/datasourcehandling.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/dbpilots/controlwizard.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/propctrlr/formcomponenthandler.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx index de43b117c49e..efd0227d2944 100644 --- a/extensions/source/abpilot/abpfinalpage.cxx +++ b/extensions/source/abpilot/abpfinalpage.cxx @@ -121,7 +121,7 @@ namespace abp aURL.SetURL(sPath); } OSL_ENSURE( aURL.GetProtocol() != INetProtocol::NotValid ,"No valid file name!"); - rSettings.sDataSourceName = aURL.GetMainURL( INetURLObject::NO_DECODE ); + rSettings.sDataSourceName = aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ); m_pLocationController->setURL( rSettings.sDataSourceName ); OUString sName = aURL.getName( ); sal_Int32 nPos = sName.indexOf(aURL.GetExtension()); diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index 5b287d0de0de..d8d5ec7d03b1 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -63,7 +63,7 @@ OUString lcl_getOwnURL(SfxObjectShell* pObjectShell) return aRet; const INetURLObject& rURLObject = pObjectShell->GetMedium()->GetURLObject(); - aRet = rURLObject.GetMainURL(INetURLObject::DECODE_WITH_CHARSET); + aRet = rURLObject.GetMainURL(INetURLObject::DecodeMechanism::WithCharset); return aRet; } diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index ad1d236921c3..eb42d78be697 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -212,7 +212,7 @@ namespace dbp INetURLObject aURL( sDataSource ); if( aURL.GetProtocol() != INetProtocol::NotValid ) - sDataSource = aURL.GetName(INetURLObject::DECODE_WITH_CHARSET); + sDataSource = aURL.GetName(INetURLObject::DecodeMechanism::WithCharset); m_pFormDatasource->SetText(sDataSource); m_pFormTable->SetText(sCommand); diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 1887a55f43ac..af21b23b78d8 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -2408,7 +2408,7 @@ namespace pcr // additional info about what happened INetURLObject aParser( sDataSourceName ); if ( aParser.GetProtocol() != INetProtocol::NotValid ) - sDataSourceName = aParser.getBase( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); + sDataSourceName = aParser.getBase( INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset ); OUString sInfo(PcrRes(RID_STR_UNABLETOCONNECT).toString().replaceAll("$name$", sDataSourceName)); SQLContext aContext; aContext.Message = sInfo; |