diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-02 18:32:36 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-02 18:33:37 +0200 |
| commit | 54e87df11faf697d3b2666198a3d20b3ee091419 (patch) | |
| tree | 8cfe316f012a4969ca6980fa6ac2fdb3a9424118 /unotools/source | |
| parent | 3aac11a1233f679ea813fee8b8de134553d7db60 (diff) | |
Change INetProtocol enumerators to CamelCase
...to avoid clashes with macros and poor warnings about hiding global FILE
Change-Id: I444e8b958f029201b228937e088efabc4b6d3050
Diffstat (limited to 'unotools/source')
| -rw-r--r-- | unotools/source/config/pathoptions.cxx | 4 | ||||
| -rw-r--r-- | unotools/source/config/securityoptions.cxx | 4 | ||||
| -rw-r--r-- | unotools/source/ucbhelper/ucbhelper.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx index cadf02f3904f..e107e446c39a 100644 --- a/unotools/source/config/pathoptions.cxx +++ b/unotools/source/config/pathoptions.cxx @@ -299,7 +299,7 @@ OUString SvtPathOptions_Impl::ExpandMacros( const OUString& rPath ) const OUString sExpanded( rPath ); const INetURLObject aParser( rPath ); - if ( aParser.GetProtocol() == INetProtocol::VND_SUN_STAR_EXPAND ) + if ( aParser.GetProtocol() == INetProtocol::VndSunStarExpand ) sExpanded = m_xMacroExpander->expandMacros( aParser.GetURLPath( INetURLObject::DECODE_WITH_CHARSET ) ); return sExpanded; @@ -795,7 +795,7 @@ bool SvtPathOptions::SearchFile( OUString& rIniFile, Paths ePath ) if ( LocalFileHelper::ConvertPhysicalNameToURL( aPathToken, aURL ) ) aObj.SetURL( aURL ); } - if ( aObj.GetProtocol() == INetProtocol::VND_SUN_STAR_EXPAND ) + if ( aObj.GetProtocol() == INetProtocol::VndSunStarExpand ) { Reference< XMacroExpander > xMacroExpander = theMacroExpander::get( ::comphelper::getProcessComponentContext() ); const OUString sExpandedPath = xMacroExpander->expandMacros( aObj.GetURLPath( INetURLObject::DECODE_WITH_CHARSET ) ); diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index 33c90f6122e4..71dcb5a233ae 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -999,14 +999,14 @@ bool SvtSecurityOptions::isSecureMacroUri( OUString const & uri, OUString const & referer) const { switch (INetURLObject(uri).GetProtocol()) { - case INetProtocol::MACRO: + case INetProtocol::Macro: if (uri.startsWithIgnoreAsciiCase("macro:///")) { // Denotes an App-BASIC macro (see SfxMacroLoader::loadMacro), which // is considered safe: return true; } // fall through - case INetProtocol::SLOT: + case INetProtocol::Slot: return referer.equalsIgnoreAsciiCase("private:user") || isTrustedLocationUri(referer); default: diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx index 39bd6fefb142..1cb9ad65b58c 100644 --- a/unotools/source/ucbhelper/ucbhelper.cxx +++ b/unotools/source/ucbhelper/ucbhelper.cxx @@ -408,7 +408,7 @@ bool utl::UCBContentHelper::IsSubPath( INetURLObject tmp; do { if (candidate == folder - || (candidate.GetProtocol() == INetProtocol::FILE + || (candidate.GetProtocol() == INetProtocol::File && candidateLower == folderLower && (getCasePreservingUrl(candidate) == getCasePreservingUrl(folder)))) |