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 /toolkit | |
| parent | 6b631a02d36aa09f7c06793e8b4482d3b67ab258 (diff) | |
convert DecodeMechanism to scoped enum
(cherry picked from commit bfde4866e07746eafa2f0d6173c29d805cc35ad0)
(cherry picked from commit 3de922d4a695e253d4ca2d42b70e0b35b52e9b7c)
Change-Id: I5c56634b1bca8e37fa73d02d2428645301b6c547
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/animatedimagespeer.cxx | 2 | ||||
| -rw-r--r-- | toolkit/source/controls/controlmodelcontainerbase.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/toolkit/source/awt/animatedimagespeer.cxx b/toolkit/source/awt/animatedimagespeer.cxx index 82169b358d70..3dae4a6bfad5 100644 --- a/toolkit/source/awt/animatedimagespeer.cxx +++ b/toolkit/source/awt/animatedimagespeer.cxx @@ -109,7 +109,7 @@ namespace toolkit if ( aURL.GetProtocol() != INetProtocol::PrivSoffice ) { OSL_VERIFY( aURL.insertName( "hicontrast", false, 0 ) ); - return aURL.GetMainURL( INetURLObject::NO_DECODE ); + return aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ); } // the private: scheme is not considered to be hierarchical by INetURLObject, so manually insert the // segment diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index 3cf4abb36d26..32a80af35cc4 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -1824,7 +1824,7 @@ OUString getPhysicalLocation( const css::uno::Any& rbase, const css::uno::Any& r { INetURLObject urlObj(baseLocation); urlObj.removeSegment(); - baseLocation = urlObj.GetMainURL( INetURLObject::NO_DECODE ); + baseLocation = urlObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ); const INetURLObject protocolCheck( url ); const INetProtocol protocol = protocolCheck.GetProtocol(); |