diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-02 15:58:06 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-02 16:30:34 +0200 |
| commit | 44b3e56bb4a4df59f53447c4ca4d8e02fe926206 (patch) | |
| tree | 71a9efde3a6a2a00688e8feb8e3086cb32eceb4f /filter | |
| parent | 0b4965bcd7ec911951e7ca3a4cd48062843b2634 (diff) | |
Change INetProtocol to scoped enumeration
...and fix o3tl::enumarray::operator [] const overload
Change-Id: I749b1b9d68686b03a97074253478d9d2d9d32b0b
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 b2f7093416d4..ffd0cda3a250 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() != INET_PROT_NOT_VALID ) + if( aAbsURL.GetProtocol() != INetProtocol::NOT_VALID ) { GraphicFilter &rGrfFilter = GraphicFilter::GetGraphicFilter(); aLinkFilterName = rGrfFilter.GetImportFormatName( diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx index e7662cad1705..3dbdde9959f6 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() != INET_PROT_NOT_VALID; + bool bIsURL = aObj.GetProtocol() != INetProtocol::NOT_VALID; 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() != INET_PROT_NOT_VALID; + bool bIsURL = aObj.GetProtocol() != INetProtocol::NOT_VALID; OUString aURL; if ( bIsURL ) aURL = sCreatedFrom; diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 19e3f183e694..d4942b906d23 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() != INET_PROT_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() == INET_PROT_FILE ) + if( aURL.GetProtocol() == INetProtocol::FILE ) { Reference< XRenderable > xRenderable( mxSrcDoc, UNO_QUERY ); |