diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 07:59:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 12:49:02 +0200 |
| commit | 803215142efa6437515348f63bd70ffdcf5d45f1 (patch) | |
| tree | a665854bb7d11f410e3b1e5596e16ae335afadc5 /svl | |
| parent | 9d3366c4c62efa4260c1b11d4b53d5982d6fac48 (diff) | |
convert INetURLObject::EncodeMechanism to scoped enum
Change-Id: I50ea17c7779c7b5cacddf548f1773fd7d6c8bade
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/misc/inethist.cxx | 4 | ||||
| -rw-r--r-- | svl/source/misc/urihelper.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx index 4fe327f6830b..f516af9effc0 100644 --- a/svl/source/misc/inethist.cxx +++ b/svl/source/misc/inethist.cxx @@ -330,7 +330,7 @@ void INetURLHistory::NormalizeUrl_Impl (INetURLObject &rUrl) if (!INetURLObject::IsCaseSensitive()) { OUString aPath (rUrl.GetURLPath(INetURLObject::NO_DECODE).toAsciiLowerCase()); - rUrl.SetURLPath (aPath, INetURLObject::NOT_CANONIC); + rUrl.SetURLPath (aPath, INetURLObject::EncodeMechanism::NotCanonical); } break; @@ -372,7 +372,7 @@ void INetURLHistory::PutUrl_Impl (const INetURLObject &rUrl) if (aHistUrl.HasMark()) { aHistUrl.SetURL (aHistUrl.GetURLNoMark(INetURLObject::NO_DECODE), - INetURLObject::NOT_CANONIC); + INetURLObject::EncodeMechanism::NotCanonical); m_pImpl->putUrl (aHistUrl.GetMainURL(INetURLObject::NO_DECODE)); Broadcast (INetURLHistoryHint (&aHistUrl)); diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx index b53a725dde55..acf4d0aa4e42 100644 --- a/svl/source/misc/urihelper.cxx +++ b/svl/source/misc/urihelper.cxx @@ -493,7 +493,7 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText, // length match. // Productions 1--4 use the given eMechanism and eCharset. Productions 5--9 - // use ENCODE_ALL. + // use EncodeMechanism::All. // Productions 6--9 are only applicable if the FSYS_DOS bit is set in // eStyle. @@ -630,7 +630,7 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText, { INetURLObject aUri(rText.copy(nPos, nUriEnd - nPos), INetProtocol::File, - INetURLObject::ENCODE_ALL, + INetURLObject::EncodeMechanism::All, RTL_TEXTENCODING_UTF8, INetURLObject::FSYS_DOS); if (!aUri.HasError()) @@ -659,7 +659,7 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText, { INetURLObject aUri(rText.copy(nPos, nUriEnd - nPos), INetProtocol::File, - INetURLObject::ENCODE_ALL, + INetURLObject::EncodeMechanism::All, RTL_TEXTENCODING_UTF8, INetURLObject::FSYS_DOS); if (!aUri.HasError()) @@ -696,7 +696,7 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText, { INetURLObject aUri(rText.copy(nPos, i - nPos), INetProtocol::Mailto, - INetURLObject::ENCODE_ALL); + INetURLObject::EncodeMechanism::All); if (!aUri.HasError()) { rBegin = nPos; |