diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 07:59:20 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-18 01:07:52 -0500 |
| commit | 6b631a02d36aa09f7c06793e8b4482d3b67ab258 (patch) | |
| tree | c69d5d75274bf3943f98cdb5a661053ece11c1dd /filter/source | |
| parent | 32e74cdd3ff79fbbc21e1edba55145cc43c5be39 (diff) | |
convert INetURLObject::EncodeMechanism to scoped enum
(cherry picked from commit 803215142efa6437515348f63bd70ffdcf5d45f1)
(cherry picked from commit 736cd289d4cdb0db61d92134bcc9d48aa7e79613)
Change-Id: I50ea17c7779c7b5cacddf548f1773fd7d6c8bade
Diffstat (limited to 'filter/source')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 4 | ||||
| -rw-r--r-- | filter/source/xsltfilter/XSLTFilter.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 66f11591fcb9..420d9727b668 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -7164,7 +7164,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage( { // remember file name to use in the title bar INetURLObject aURL(rBaseURL); - xObj->setContainerName(aURL.GetLastName(INetURLObject::DecodeMechanism::DECODE_WITH_CHARSET)); + xObj->setContainerName(aURL.GetLastName(INetURLObject::DecodeMechanism::WithCharset)); svt::EmbeddedObjectRef aObj( xObj, nAspect ); @@ -7230,7 +7230,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage( { // remember file name to use in the title bar INetURLObject aURL( rBaseURL ); - xObj->setContainerName( aURL.GetLastName( INetURLObject::DecodeMechanism::DECODE_WITH_CHARSET ) ); + xObj->setContainerName( aURL.GetLastName( INetURLObject::DecodeMechanism::WithCharset) ); // the visual area must be retrieved from the metafile (object doesn't know it so far) diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index 615b4c11fd0b..1deb70ff6286 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -260,7 +260,7 @@ namespace XSLT aObj.setFinalSlash(); bool bWasAbsolute; INetURLObject aURL = aObj.smartRel2Abs(s, bWasAbsolute, false, - INetURLObject::WAS_ENCODED, RTL_TEXTENCODING_UTF8, true); + INetURLObject::EncodeMechanism::WasEncoded, RTL_TEXTENCODING_UTF8, true); return aURL.GetMainURL(INetURLObject::NO_DECODE); } |