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 /filter | |
| parent | test color scale entries (diff) | |
| download | core-54e87df11faf697d3b2666198a3d20b3ee091419.tar.gz core-54e87df11faf697d3b2666198a3d20b3ee091419.zip | |
Change INetProtocol enumerators to CamelCase
...to avoid clashes with macros and poor warnings about hiding global FILE
Change-Id: I444e8b958f029201b228937e088efabc4b6d3050
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 2 | ||||
| -rw-r--r-- | filter/source/msfilter/msvbahelper.cxx | 4 | ||||
| -rw-r--r-- | filter/source/pdf/pdfexport.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index ffd0cda3a250..c1be035f3257 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -3944,7 +3944,7 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, SfxItemSet& rSet, cons if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aFileName, aValidURL ) ) aAbsURL = INetURLObject( aValidURL ); } - if( aAbsURL.GetProtocol() != INetProtocol::NOT_VALID ) + if( aAbsURL.GetProtocol() != INetProtocol::NotValid ) { GraphicFilter &rGrfFilter = GraphicFilter::GetGraphicFilter(); aLinkFilterName = rGrfFilter.GetImportFormatName( diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx index 3dbdde9959f6..29e5433695fc 100644 --- a/filter/source/msfilter/msvbahelper.cxx +++ b/filter/source/msfilter/msvbahelper.cxx @@ -80,7 +80,7 @@ SfxObjectShell* findShellForUrl( const OUString& sMacroURLOrPath ) SfxObjectShell* pShell = SfxObjectShell::GetFirst(); INetURLObject aObj; aObj.SetURL( sMacroURLOrPath ); - bool bIsURL = aObj.GetProtocol() != INetProtocol::NOT_VALID; + bool bIsURL = aObj.GetProtocol() != INetProtocol::NotValid; OUString aURL; if ( bIsURL ) aURL = sMacroURLOrPath; @@ -398,7 +398,7 @@ MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const OUString& Macro { INetURLObject aObj; aObj.SetURL( sCreatedFrom ); - bool bIsURL = aObj.GetProtocol() != INetProtocol::NOT_VALID; + bool bIsURL = aObj.GetProtocol() != INetProtocol::NotValid; OUString aURL; if ( bIsURL ) aURL = sCreatedFrom; diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index d4942b906d23..4b1b76fa1d2a 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -381,7 +381,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& std::set< PDFWriter::ErrorCode > aErrors; - if( aURL.GetProtocol() != INetProtocol::FILE ) + if( aURL.GetProtocol() != INetProtocol::File ) { OUString aTmp; @@ -389,7 +389,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& aURL = INetURLObject(aTmp); } - if( aURL.GetProtocol() == INetProtocol::FILE ) + if( aURL.GetProtocol() == INetProtocol::File ) { Reference< XRenderable > xRenderable( mxSrcDoc, UNO_QUERY ); |