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 --- sd/source/filter/eppt/epptso.cxx | 8 ++++---- sd/source/filter/html/htmlex.cxx | 8 ++++---- sd/source/filter/html/pubdlg.cxx | 2 +- sd/source/filter/ppt/pptin.cxx | 4 ++-- sd/source/ui/dlg/PhotoAlbumDialog.cxx | 6 +++--- sd/source/ui/dlg/dlgass.cxx | 2 +- sd/source/ui/dlg/navigatr.cxx | 2 +- sd/source/ui/dlg/sdtreelb.cxx | 2 +- sd/source/ui/dlg/tpaction.cxx | 2 +- sd/source/ui/func/fuinsert.cxx | 4 ++-- sd/source/ui/func/fusel.cxx | 2 +- sd/source/ui/slideshow/slideshowimpl.cxx | 2 +- sd/source/ui/view/sdview4.cxx | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-) (limited to 'sd/source') diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 86bf529d16f3..546cbe505fe1 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -1131,9 +1131,9 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u OUString aFile( pFieldEntry->aFieldUrl ); OUString aTarget( pFieldEntry->aFieldUrl ); INetURLObject aUrl( pFieldEntry->aFieldUrl ); - if ( INetProtocol::FILE == aUrl.GetProtocol() ) + if ( INetProtocol::File == aUrl.GetProtocol() ) aFile = aUrl.PathToFileName(); - else if ( INetProtocol::SMB == aUrl.GetProtocol() ) + else if ( INetProtocol::Smb == aUrl.GetProtocol() ) { // Convert smb notation to '\\' and skip the 'smb:' part aFile = aUrl.GetMainURL(INetURLObject::NO_DECODE).copy(4); @@ -1968,7 +1968,7 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat if ( ImplGetPropertyValue( OUString( "Bookmark" ) ) ) { INetURLObject aUrl( *static_cast(mAny.getValue()) ); - if ( INetProtocol::FILE == aUrl.GetProtocol() ) + if ( INetProtocol::File == aUrl.GetProtocol() ) { aFile = aUrl.PathToFileName(); nAction = 2; @@ -2016,7 +2016,7 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat OUString aBookmarkFile( aBookmark ); INetURLObject aUrl( aBookmark ); - if ( INetProtocol::FILE == aUrl.GetProtocol() ) + if ( INetProtocol::File == aUrl.GetProtocol() ) aBookmarkFile = aUrl.PathToFileName(); nHyperLinkID = ImplInsertBookmarkURL( aBookmark, (sal_uInt32)(2 | ( 1U << 31 )), aBookmarkFile, aBookmark, "", "" ); } diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index e943858fdea4..bd2757718b39 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -607,7 +607,7 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams // we come up with a destination... INetURLObject aINetURLObj( maPath ); - DBG_ASSERT( aINetURLObj.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" ); + DBG_ASSERT( aINetURLObj.GetProtocol() != INetProtocol::NotValid, "invalid URL" ); maExportPath = aINetURLObj.GetPartBeforeLastName(); // with trailing '/' maIndex = aINetURLObj.GetLastName(); @@ -3031,7 +3031,7 @@ OUString HtmlExport::InsertSound( const OUString& rSoundFile ) INetURLObject aURL( rSoundFile ); OUString aSoundFileName = aURL.getName(); - DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" ); + DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" ); OUString aStr(""); @@ -3203,13 +3203,13 @@ sal_uLong EasyFile::createFileName( const OUString& rURL, OUString& rFileName ) { INetURLObject aURL( rURL ); - if( aURL.GetProtocol() == INetProtocol::NOT_VALID ) + if( aURL.GetProtocol() == INetProtocol::NotValid ) { OUString aURLStr; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( rURL, aURLStr ); aURL = INetURLObject( aURLStr ); } - DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" ); + DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" ); rFileName = aURL.GetMainURL( INetURLObject::NO_DECODE ); } diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index f2ab340e26ae..7edbf1200514 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -782,7 +782,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams ) // try to guess protocol for user's homepage INetURLObject aHomeURL( pPage4_WWW->GetText(), - INetProtocol::HTTP, // default proto is HTTP + INetProtocol::Http, // default proto is HTTP INetURLObject::ENCODE_ALL ); aValue.Name = "HomepageURL"; diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 0d6622ad28a2..4d8b2f610649 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -397,7 +397,7 @@ bool ImplSdPPTImport::Import() break; // Convert '\\' notation to 'smb://' - INetURLObject aUrl( pHyperlink->aTarget, INetProtocol::FILE ); + INetURLObject aUrl( pHyperlink->aTarget, INetProtocol::File ); pHyperlink->aTarget = aUrl.GetMainURL( INetURLObject::NO_DECODE ); if ( !aPropItem.Read( pHyperlink->aSubAdress, VT_EMPTY ) ) @@ -2065,7 +2065,7 @@ void ImplSdPPTImport::FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiv OUString aBaseURL = pDocShell->GetMedium()->GetBaseURL(); OUString aBookmarkURL( pInfo->GetBookmark() ); INetURLObject aURL( pPtr->aTarget ); - if( INetProtocol::NOT_VALID == aURL.GetProtocol() ) + if( INetProtocol::NotValid == aURL.GetProtocol() ) utl::LocalFileHelper::ConvertSystemPathToURL( pPtr->aTarget, aBaseURL, aBookmarkURL ); if( aBookmarkURL.isEmpty() ) aBookmarkURL = URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), pPtr->aTarget, URIHelper::GetMaybeFileHdl(), true ); diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index 6b9783c4cd47..a3da722b97e5 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -579,15 +579,15 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl) sal_uInt16 nFilter = GRFILTER_FORMAT_DONTKNOW; - if ( aURLObj.HasError() || INetProtocol::NOT_VALID == aURLObj.GetProtocol() ) + if ( aURLObj.HasError() || INetProtocol::NotValid == aURLObj.GetProtocol() ) { - aURLObj.SetSmartProtocol( INetProtocol::FILE ); + aURLObj.SetSmartProtocol( INetProtocol::File ); aURLObj.SetSmartURL( sImgUrl ); } sal_uInt32 nFilterImportFlags = GRFILTER_I_FLAGS_SET_LOGSIZE_FOR_JPEG; // remote? - if ( INetProtocol::FILE != aURLObj.GetProtocol() ) + if ( INetProtocol::File != aURLObj.GetProtocol() ) { SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( sImgUrl, StreamMode::READ ); diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index cc95909988ca..8ed91666fbd3 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -1616,7 +1616,7 @@ bool AssistentDlgImpl::IsOwnFormat( const OUString& rPath ) INetURLObject aURL( rPath ); OUString aExt( aURL.GetFileExtension() ); - DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" ); + DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" ); return !aExt.equalsIgnoreAsciiCase( "ppt" ); } diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 24df6b6225f2..f7b479162026 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -584,7 +584,7 @@ bool SdNavigatorWin::InsertFile(const OUString& rFileName) { INetURLObject aURL( rFileName ); - if( aURL.GetProtocol() == INetProtocol::NOT_VALID ) + if( aURL.GetProtocol() == INetProtocol::NotValid ) { OUString aURLStr; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( rFileName, aURLStr ); diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index c21ea4eb8e8e..51c860914b73 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -1176,7 +1176,7 @@ void SdPageObjsTLB::DoDrag() if( mpDropNavWin ) { ::sd::DrawDocShell* pDocShell = mpDoc->GetDocSh(); - OUString aURL = INetURLObject( pDocShell->GetMedium()->GetPhysicalName(), INetProtocol::FILE ).GetMainURL( INetURLObject::NO_DECODE ); + OUString aURL = INetURLObject( pDocShell->GetMedium()->GetPhysicalName(), INetProtocol::File ).GetMainURL( INetURLObject::NO_DECODE ); NavigatorDragType eDragType = mpDropNavWin->GetNavigatorDragType(); aURL += "#" + GetSelectEntry(); diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index a2d3cd1dc455..521a9c64bcb7 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -811,7 +811,7 @@ OUString SdTPAction::GetEditText( bool bFullDocDestination ) if( mpDoc && mpDoc->GetDocSh() && mpDoc->GetDocSh()->GetMedium() ) aBaseURL = mpDoc->GetDocSh()->GetMedium()->GetBaseURL(); - if( !aStr.isEmpty() && aURL.GetProtocol() == INetProtocol::NOT_VALID ) + if( !aStr.isEmpty() && aURL.GetProtocol() == INetProtocol::NotValid ) aURL = INetURLObject( ::URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), aStr, URIHelper::GetMaybeFileHdl(), true, false ) ); // get adjusted file name diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index ccdcb5c7d8fe..bd21323f0984 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -485,8 +485,8 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) { // get URL OUString aStrURL(aPluginFileDialog.GetPath()); - INetURLObject aURL( aStrURL, INetProtocol::FILE ); - if( aURL.GetProtocol() != INetProtocol::NOT_VALID ) + INetURLObject aURL( aStrURL, INetProtocol::File ); + if( aURL.GetProtocol() != INetProtocol::NotValid ) { // create a plugin object xObj = mpViewShell->GetObjectShell()->GetEmbeddedObjectContainer().CreateEmbeddedObject( SvGlobalName( SO3_PLUGIN_CLASSID ).GetByteSequence(), aName ); diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 6f90fd6e4c9d..65ffe59a262b 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -1380,7 +1380,7 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS ) ); - if( INetProtocol::FILE == aURL.GetProtocol() ) + if( INetProtocol::File == aURL.GetProtocol() ) { SfxStringItem aUrl( SID_FILE_NAME, aURL.GetMainURL( INetURLObject::NO_DECODE ) ); SfxBoolItem aBrowsing( SID_BROWSE, true ); diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index c1f251952822..f64376e69571 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1594,7 +1594,7 @@ void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun:: false, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS ) ); - if( INetProtocol::FILE == aURL.GetProtocol() ) + if( INetProtocol::File == aURL.GetProtocol() ) { SfxStringItem aUrl( SID_FILE_NAME, aURL.GetMainURL( INetURLObject::NO_DECODE ) ); SfxBoolItem aBrowsing( SID_BROWSE, true ); diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 510bbec86d55..992c111d672c 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -415,7 +415,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl) INetURLObject aURL( aCurrentDropFile ); bool bOK = false; - if( aURL.GetProtocol() == INetProtocol::NOT_VALID ) + if( aURL.GetProtocol() == INetProtocol::NotValid ) { OUString aURLStr; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aCurrentDropFile, aURLStr ); -- cgit