diff options
Diffstat (limited to 'svl/source')
| -rw-r--r-- | svl/source/misc/filenotation.cxx | 8 | ||||
| -rw-r--r-- | svl/source/misc/inethist.cxx | 8 | ||||
| -rw-r--r-- | svl/source/misc/urihelper.cxx | 20 |
3 files changed, 18 insertions, 18 deletions
diff --git a/svl/source/misc/filenotation.cxx b/svl/source/misc/filenotation.cxx index a6cf323c947b..c10dd60d65b2 100644 --- a/svl/source/misc/filenotation.cxx +++ b/svl/source/misc/filenotation.cxx @@ -35,7 +35,7 @@ namespace svt if ( _eInputNotation == N_URL ) { INetURLObject aParser( _rUrlOrPath ); - if ( aParser.GetProtocol() == INET_PROT_FILE ) + if ( aParser.GetProtocol() == INetProtocol::FILE ) implInitWithURLNotation( _rUrlOrPath ); else m_sSystem = m_sFileURL = _rUrlOrPath; @@ -56,7 +56,7 @@ namespace svt if ( !_rSystemPath.isEmpty() ) { INetURLObject aSmartParser; - aSmartParser.SetSmartProtocol( INET_PROT_FILE ); + aSmartParser.SetSmartProtocol( INetProtocol::FILE ); if ( aSmartParser.SetSmartURL( _rSystemPath ) ) { m_sFileURL = aSmartParser.GetMainURL( INetURLObject::NO_DECODE ); @@ -84,12 +84,12 @@ namespace svt INetURLObject aParser( _rUrlOrPath ); switch ( aParser.GetProtocol() ) { - case INET_PROT_FILE: + case INetProtocol::FILE: // file URL bSuccess = implInitWithURLNotation( _rUrlOrPath ); break; - case INET_PROT_NOT_VALID: + case INetProtocol::NOT_VALID: // assume system notation bSuccess = implInitWithSystemNotation( _rUrlOrPath ); break; diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx index 3987cbb2384e..5c3f1a9ada6f 100644 --- a/svl/source/misc/inethist.cxx +++ b/svl/source/misc/inethist.cxx @@ -335,7 +335,7 @@ void INetURLHistory::NormalizeUrl_Impl (INetURLObject &rUrl) { switch (rUrl.GetProtocol()) { - case INET_PROT_FILE: + case INetProtocol::FILE: if (!INetURLObject::IsCaseSensitive()) { OUString aPath (rUrl.GetURLPath(INetURLObject::NO_DECODE).toAsciiLowerCase()); @@ -343,19 +343,19 @@ void INetURLHistory::NormalizeUrl_Impl (INetURLObject &rUrl) } break; - case INET_PROT_FTP: + case INetProtocol::FTP: if (!rUrl.HasPort()) rUrl.SetPort (INETHIST_DEF_FTP_PORT); break; - case INET_PROT_HTTP: + case INetProtocol::HTTP: if (!rUrl.HasPort()) rUrl.SetPort (INETHIST_DEF_HTTP_PORT); if (!rUrl.HasURLPath()) rUrl.SetURLPath("/"); break; - case INET_PROT_HTTPS: + case INetProtocol::HTTPS: if (!rUrl.HasPort()) rUrl.SetPort (INETHIST_DEF_HTTPS_PORT); if (!rUrl.HasURLPath()) diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx index bbb3e9ebcaa2..5e53645b7916 100644 --- a/svl/source/misc/urihelper.cxx +++ b/svl/source/misc/urihelper.cxx @@ -76,7 +76,7 @@ OUString URIHelper::SmartRel2Abs(INetURLObject const & rTheBaseURIRef, eStyle); if (bCheckFileExists && !bWasAbsolute - && (aAbsURIRef.GetProtocol() == INET_PROT_FILE)) + && (aAbsURIRef.GetProtocol() == INetProtocol::FILE)) { INetURLObject aNonFileURIRef; aNonFileURIRef.SetSmartURL(rTheRelURIRef, @@ -84,7 +84,7 @@ OUString URIHelper::SmartRel2Abs(INetURLObject const & rTheBaseURIRef, eCharset, eStyle); if (!aNonFileURIRef.HasError() - && aNonFileURIRef.GetProtocol() != INET_PROT_FILE) + && aNonFileURIRef.GetProtocol() != INetProtocol::FILE) { bool bMaybeFile = false; if (rMaybeFileHdl.IsSet()) @@ -507,7 +507,7 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText, { sal_Int32 i = nPos; INetProtocol eScheme = INetURLObject::CompareProtocolScheme(rText.copy(i, rEnd - i)); - if (eScheme == INET_PROT_FILE) // 2nd + if (eScheme == INetProtocol::FILE) // 2nd { while (rText[i++] != ':') ; sal_Int32 nPrefixEnd = i; @@ -525,7 +525,7 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText, && isBoundary1(rCharClass, rText, nUriEnd, rEnd)) { INetURLObject aUri(rText.copy(nPos, nUriEnd - nPos), - INET_PROT_FILE, eMechanism, eCharset, + INetProtocol::FILE, eMechanism, eCharset, eStyle); if (!aUri.HasError()) { @@ -536,7 +536,7 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText, } } } - else if (eScheme != INET_PROT_NOT_VALID) // 1st + else if (eScheme != INetProtocol::NOT_VALID) // 1st { while (rText[i++] != ':') ; sal_Int32 nPrefixEnd = i; @@ -554,7 +554,7 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText, || rText[nUriEnd] == '\\')) { INetURLObject aUri(rText.copy(nPos, nUriEnd - nPos), - INET_PROT_HTTP, eMechanism, + INetProtocol::HTTP, eMechanism, eCharset); if (!aUri.HasError()) { @@ -603,7 +603,7 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText, || rText[nUriEnd] == '\\') { INetURLObject aUri(rText.copy(nPos, nUriEnd - nPos), - INET_PROT_HTTP, eMechanism, + INetProtocol::HTTP, eMechanism, eCharset); if (!aUri.HasError()) { @@ -627,7 +627,7 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText, if (isBoundary1(rCharClass, rText, nUriEnd, rEnd)) { INetURLObject aUri(rText.copy(nPos, nUriEnd - nPos), - INET_PROT_FILE, + INetProtocol::FILE, INetURLObject::ENCODE_ALL, RTL_TEXTENCODING_UTF8, INetURLObject::FSYS_DOS); @@ -656,7 +656,7 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText, if (isBoundary1(rCharClass, rText, nUriEnd, rEnd)) { INetURLObject aUri(rText.copy(nPos, nUriEnd - nPos), - INET_PROT_FILE, + INetProtocol::FILE, INetURLObject::ENCODE_ALL, RTL_TEXTENCODING_UTF8, INetURLObject::FSYS_DOS); @@ -693,7 +693,7 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText, && isBoundary1(rCharClass, rText, i, rEnd)) { INetURLObject aUri(rText.copy(nPos, i - nPos), - INET_PROT_MAILTO, + INetProtocol::MAILTO, INetURLObject::ENCODE_ALL); if (!aUri.HasError()) { |