summaryrefslogtreecommitdiff
path: root/svl/source/misc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-12-05 08:47:18 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-12-05 12:49:02 +0200
commitbfde4866e07746eafa2f0d6173c29d805cc35ad0 (patch)
treebe939a44eb70c7187fa5536089b782326b160013 /svl/source/misc
parent803215142efa6437515348f63bd70ffdcf5d45f1 (diff)
convert DecodeMechanism to scoped enum
Change-Id: I5c56634b1bca8e37fa73d02d2428645301b6c547
Diffstat (limited to 'svl/source/misc')
-rw-r--r--svl/source/misc/filenotation.cxx2
-rw-r--r--svl/source/misc/inethist.cxx10
-rw-r--r--svl/source/misc/lockfilecommon.cxx4
-rw-r--r--svl/source/misc/urihelper.cxx12
4 files changed, 14 insertions, 14 deletions
diff --git a/svl/source/misc/filenotation.cxx b/svl/source/misc/filenotation.cxx
index 26d614dcf137..d77f96e97f75 100644
--- a/svl/source/misc/filenotation.cxx
+++ b/svl/source/misc/filenotation.cxx
@@ -59,7 +59,7 @@ namespace svt
aSmartParser.SetSmartProtocol( INetProtocol::File );
if ( aSmartParser.SetSmartURL( _rSystemPath ) )
{
- m_sFileURL = aSmartParser.GetMainURL( INetURLObject::NO_DECODE );
+ m_sFileURL = aSmartParser.GetMainURL( INetURLObject::DecodeMechanism::NONE );
osl_getSystemPathFromFileURL( m_sFileURL.pData, &m_sSystem.pData );
bSuccess = true;
}
diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx
index f516af9effc0..3eecd4b3288e 100644
--- a/svl/source/misc/inethist.cxx
+++ b/svl/source/misc/inethist.cxx
@@ -329,7 +329,7 @@ void INetURLHistory::NormalizeUrl_Impl (INetURLObject &rUrl)
case INetProtocol::File:
if (!INetURLObject::IsCaseSensitive())
{
- OUString aPath (rUrl.GetURLPath(INetURLObject::NO_DECODE).toAsciiLowerCase());
+ OUString aPath (rUrl.GetURLPath(INetURLObject::DecodeMechanism::NONE).toAsciiLowerCase());
rUrl.SetURLPath (aPath, INetURLObject::EncodeMechanism::NotCanonical);
}
break;
@@ -366,15 +366,15 @@ void INetURLHistory::PutUrl_Impl (const INetURLObject &rUrl)
INetURLObject aHistUrl (rUrl);
NormalizeUrl_Impl (aHistUrl);
- m_pImpl->putUrl (aHistUrl.GetMainURL(INetURLObject::NO_DECODE));
+ m_pImpl->putUrl (aHistUrl.GetMainURL(INetURLObject::DecodeMechanism::NONE));
Broadcast (INetURLHistoryHint (&rUrl));
if (aHistUrl.HasMark())
{
- aHistUrl.SetURL (aHistUrl.GetURLNoMark(INetURLObject::NO_DECODE),
+ aHistUrl.SetURL (aHistUrl.GetURLNoMark(INetURLObject::DecodeMechanism::NONE),
INetURLObject::EncodeMechanism::NotCanonical);
- m_pImpl->putUrl (aHistUrl.GetMainURL(INetURLObject::NO_DECODE));
+ m_pImpl->putUrl (aHistUrl.GetMainURL(INetURLObject::DecodeMechanism::NONE));
Broadcast (INetURLHistoryHint (&aHistUrl));
}
}
@@ -388,7 +388,7 @@ bool INetURLHistory::QueryUrl_Impl (const INetURLObject &rUrl)
INetURLObject aHistUrl (rUrl);
NormalizeUrl_Impl (aHistUrl);
- return m_pImpl->queryUrl (aHistUrl.GetMainURL(INetURLObject::NO_DECODE));
+ return m_pImpl->queryUrl (aHistUrl.GetMainURL(INetURLObject::DecodeMechanism::NONE));
}
return false;
}
diff --git a/svl/source/misc/lockfilecommon.cxx b/svl/source/misc/lockfilecommon.cxx
index e19bd44fd710..a163c43ac0b3 100644
--- a/svl/source/misc/lockfilecommon.cxx
+++ b/svl/source/misc/lockfilecommon.cxx
@@ -63,7 +63,7 @@ LockFileCommon::LockFileCommon( const OUString& aOrigURL, const OUString& aPrefi
aShareURLString += aPrefix;
aShareURLString += aDocURL.GetName();
aShareURLString += "%23"; // '#'
- m_aURL = INetURLObject( aShareURLString ).GetMainURL( INetURLObject::NO_DECODE );
+ m_aURL = INetURLObject( aShareURLString ).GetMainURL( INetURLObject::DecodeMechanism::NONE );
}
@@ -77,7 +77,7 @@ INetURLObject LockFileCommon::ResolveLinks( const INetURLObject& aDocURL )
if ( aDocURL.HasError() )
throw lang::IllegalArgumentException();
- OUString aURLToCheck = aDocURL.GetMainURL(INetURLObject::NO_DECODE);
+ OUString aURLToCheck = aDocURL.GetMainURL(INetURLObject::DecodeMechanism::NONE);
// there is currently no UCB functionality to resolve the symbolic links;
// since the lock files are used only for local file systems the osl
diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index acf4d0aa4e42..4673a8907079 100644
--- a/svl/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.cxx
@@ -534,7 +534,7 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText,
rBegin = nPos;
rEnd = nUriEnd;
return
- aUri.GetMainURL(INetURLObject::DECODE_TO_IURI);
+ aUri.GetMainURL(INetURLObject::DecodeMechanism::ToIUri);
}
}
}
@@ -563,7 +563,7 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText,
rBegin = nPos;
rEnd = nUriEnd;
return
- aUri.GetMainURL(INetURLObject::DECODE_TO_IURI);
+ aUri.GetMainURL(INetURLObject::DecodeMechanism::ToIUri);
}
}
}
@@ -612,7 +612,7 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText,
rBegin = nPos;
rEnd = nUriEnd;
return
- aUri.GetMainURL(INetURLObject::DECODE_TO_IURI);
+ aUri.GetMainURL(INetURLObject::DecodeMechanism::ToIUri);
}
}
}
@@ -638,7 +638,7 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText,
rBegin = nPos;
rEnd = nUriEnd;
return
- aUri.GetMainURL(INetURLObject::DECODE_TO_IURI);
+ aUri.GetMainURL(INetURLObject::DecodeMechanism::ToIUri);
}
}
}
@@ -667,7 +667,7 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText,
rBegin = nPos;
rEnd = nUriEnd;
return
- aUri.GetMainURL(INetURLObject::DECODE_TO_IURI);
+ aUri.GetMainURL(INetURLObject::DecodeMechanism::ToIUri);
}
}
}
@@ -702,7 +702,7 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText,
rBegin = nPos;
rEnd = i;
return aUri.GetMainURL(
- INetURLObject::DECODE_TO_IURI);
+ INetURLObject::DecodeMechanism::ToIUri);
}
}
}