From 54e87df11faf697d3b2666198a3d20b3ee091419 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 2 Apr 2015 18:32:36 +0200 Subject: Change INetProtocol enumerators to CamelCase ...to avoid clashes with macros and poor warnings about hiding global FILE Change-Id: I444e8b958f029201b228937e088efabc4b6d3050 --- basic/source/basmgr/basicmanagerrepository.cxx | 2 +- basic/source/basmgr/basmgr.cxx | 18 +++++++++--------- basic/source/runtime/methods.cxx | 2 +- basic/source/runtime/methods1.cxx | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'basic') diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx index c12e904d1321..45b63f2fcaa3 100644 --- a/basic/source/basmgr/basicmanagerrepository.cxx +++ b/basic/source/basmgr/basicmanagerrepository.cxx @@ -288,7 +288,7 @@ namespace basic // The first dir in the path as destination: OUString aFileName( aAppBasic.getName() ); aAppBasic = INetURLObject( aAppBasicDir.getToken(1, ';') ); - DBG_ASSERT(aAppBasic.GetProtocol() != INetProtocol::NOT_VALID, + DBG_ASSERT(aAppBasic.GetProtocol() != INetProtocol::NotValid, OString("Invalid URL: \"" + OUStringToOString(aAppBasicDir, osl_getThreadTextEncoding()) + "\"").getStr()); diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index a4527d4a99bf..59fb0f66458d 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -587,7 +587,7 @@ BasicManager::BasicManager( SotStorage& rStorage, const OUString& rBaseURL, Star pLibs->aBasicLibPath = *pLibPath; } OUString aStorName( rStorage.GetName() ); - maStorageName = INetURLObject(aStorName, INetProtocol::FILE).GetMainURL( INetURLObject::NO_DECODE ); + maStorageName = INetURLObject(aStorName, INetProtocol::File).GetMainURL( INetURLObject::NO_DECODE ); // If there is no Manager Stream, no further actions are necessary @@ -831,7 +831,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const OUString& rBase return; } - maStorageName = INetURLObject(aStorName, INetProtocol::FILE).GetMainURL( INetURLObject::NO_DECODE ); + maStorageName = INetURLObject(aStorName, INetProtocol::File).GetMainURL( INetURLObject::NO_DECODE ); // #i13114 removed, DBG_ASSERT(aStorageName.Len() != 0, "Bad storage name"); OUString aRealStorageName = maStorageName; // for relative paths, can be modified through BaseURL @@ -839,7 +839,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const OUString& rBase if ( !rBaseURL.isEmpty() ) { INetURLObject aObj( rBaseURL ); - if ( aObj.GetProtocol() == INetProtocol::FILE ) + if ( aObj.GetProtocol() == INetProtocol::File ) { aRealStorageName = aObj.PathToFileName(); } @@ -875,7 +875,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const OUString& rBase // Always try relative first if there are two stands on disk if ( !pInfo->GetRelStorageName().isEmpty() && pInfo->GetRelStorageName() != szImbedded ) { - INetURLObject aObj( aRealStorageName, INetProtocol::FILE ); + INetURLObject aObj( aRealStorageName, INetProtocol::File ); aObj.removeSegment(); bool bWasAbsolute = false; aObj = aObj.smartRel2Abs( pInfo->GetRelStorageName(), bWasAbsolute ); @@ -946,7 +946,7 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage ) if ( !aLibs.isEmpty() ) { OUString aCurStorageName( aStorName ); - INetURLObject aCurStorage( aCurStorageName, INetProtocol::FILE ); + INetURLObject aCurStorage( aCurStorageName, INetProtocol::File ); sal_Int32 nLibs = comphelper::string::getTokenCount(aLibs, LIB_SEP); for ( sal_Int32 nLib = 0; nLib < nLibs; nLib++ ) { @@ -956,7 +956,7 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage ) OUString aLibName( aLibInfo.getToken( 0, LIBINFO_SEP ) ); OUString aLibAbsStorageName( aLibInfo.getToken( 1, LIBINFO_SEP ) ); OUString aLibRelStorageName( aLibInfo.getToken( 2, LIBINFO_SEP ) ); - INetURLObject aLibAbsStorage( aLibAbsStorageName, INetProtocol::FILE ); + INetURLObject aLibAbsStorage( aLibAbsStorageName, INetProtocol::File ); INetURLObject aLibRelStorage( aStorName ); aLibRelStorage.removeSegment(); @@ -1056,10 +1056,10 @@ bool BasicManager::ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStora OUString aStorName( pCurStorage->GetName() ); // #i13114 removed, DBG_ASSERT( aStorName.Len(), "No Storage Name!" ); - INetURLObject aCurStorageEntry(aStorName, INetProtocol::FILE); + INetURLObject aCurStorageEntry(aStorName, INetProtocol::File); // #i13114 removed, DBG_ASSERT(aCurStorageEntry.GetMainURL( INetURLObject::NO_DECODE ).Len() != 0, "Bad storage name"); - INetURLObject aStorageEntry(aStorageName, INetProtocol::FILE); + INetURLObject aStorageEntry(aStorageName, INetProtocol::File); // #i13114 removed, DBG_ASSERT(aCurStorageEntry.GetMainURL( INetURLObject::NO_DECODE ).Len() != 0, "Bad storage name"); if ( aCurStorageEntry == aStorageEntry ) @@ -1235,7 +1235,7 @@ StarBASIC* BasicManager::AddLib( SotStorage& rStorage, const OUString& rLibName, OUString aStorName( rStorage.GetName() ); DBG_ASSERT( !aStorName.isEmpty(), "No Storage Name!" ); - OUString aStorageName = INetURLObject(aStorName, INetProtocol::FILE).GetMainURL( INetURLObject::NO_DECODE ); + OUString aStorageName = INetURLObject(aStorName, INetProtocol::File).GetMainURL( INetURLObject::NO_DECODE ); DBG_ASSERT(!aStorageName.isEmpty(), "Bad storage name"); OUString aNewLibName( rLibName ); diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 8dbdf8e4f883..623b092c6651 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -628,7 +628,7 @@ RTLFUNC(MkDir) // In vba if the full path is not specified then // folder is created relative to the curdir INetURLObject aURLObj( getFullPath( aPath ) ); - if ( aURLObj.GetProtocol() != INetProtocol::FILE ) + if ( aURLObj.GetProtocol() != INetProtocol::File ) { SbxArrayRef pPar = new SbxArray(); SbxVariableRef pResult = new SbxVariable(); diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 59459d932354..86aed45c93c2 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -1644,7 +1644,7 @@ RTLFUNC(ConvertToUrl) if ( rPar.Count() == 2 ) { OUString aStr = rPar.Get(1)->GetOUString(); - INetURLObject aURLObj( aStr, INetProtocol::FILE ); + INetURLObject aURLObj( aStr, INetProtocol::File ); OUString aFileURL = aURLObj.GetMainURL( INetURLObject::NO_DECODE ); if( aFileURL.isEmpty() ) { -- cgit v1.2.3