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 /sc | |
| 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 'sc')
| -rw-r--r-- | sc/source/core/data/documen8.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/excel/xecontent.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 572d594b3697..e2aac3677484 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -833,7 +833,7 @@ void ScDocument::UpdateExternalRefLinks(vcl::Window* pWin) OUString aFile; sfx2::LinkManager::GetDisplayNames(pRefLink, nullptr, &aFile); // Decode encoded URL for display friendliness. - INetURLObject aUrl(aFile,INetURLObject::WAS_ENCODED); + INetURLObject aUrl(aFile,INetURLObject::EncodeMechanism::WasEncoded); aFile = aUrl.GetMainURL(INetURLObject::DECODE_UNAMBIGUOUS); OUStringBuffer aBuf; diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index ac6be4e26cd9..970ea5b19e1d 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -465,7 +465,7 @@ OUString XclExpHyperlink::BuildFileName( // try to convert to relative file name OUString aTmpName( aDosName ); aDosName = INetURLObject::GetRelURL( rRoot.GetBasePath(), rUrl, - INetURLObject::WAS_ENCODED, + INetURLObject::EncodeMechanism::WasEncoded, (bEncoded ? INetURLObject::DECODE_TO_IURI : INetURLObject::DECODE_WITH_CHARSET)); if (aDosName.startsWith(INET_FILE_SCHEME)) diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index f0214bd46cf5..d963507e1b68 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -2397,7 +2397,7 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed ) // tdf#40713: don't lose dbt file // if aDbtFile corresponds exactly to aTmpFile, we just have to return - if (aDbtFile.GetMainURL( INetURLObject::DecodeMechanism::DECODE_UNAMBIGUOUS ) == aTmpFile.GetMainURL( INetURLObject::DecodeMechanism::DECODE_UNAMBIGUOUS )) + if (aDbtFile.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ) == aTmpFile.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous )) return bRet; if ( IsDocument( aDbtFile ) && !KillFile( aDbtFile ) ) |