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 /svx/source/unodraw | |
| parent | 0b4965bcd7ec911951e7ca3a4cd48062843b2634 (diff) | |
Change INetProtocol to scoped enumeration
...and fix o3tl::enumarray::operator [] const overload
Change-Id: I749b1b9d68686b03a97074253478d9d2d9d32b0b
Diffstat (limited to 'svx/source/unodraw')
| -rw-r--r-- | svx/source/unodraw/UnoGraphicExporter.cxx | 2 | ||||
| -rw-r--r-- | svx/source/unodraw/unoshap2.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 7f2a32ba18be..4a5ab7cc561a 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -1059,7 +1059,7 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes else { INetURLObject aURLObject( aSettings.maURL.Complete ); - DBG_ASSERT( aURLObject.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); + DBG_ASSERT( aURLObject.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" ); nStatus = XOutBitmap::ExportGraphic( aGraphic, aURLObject, rFilter, nFilter, &aSettings.maFilterData ); } diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index f0f4eb3bb932..b942a0d7057c 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1495,7 +1495,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte { INetURLObject aURLObj( aURL ); - if( aURLObj.GetProtocol() == INET_PROT_NOT_VALID ) + if( aURLObj.GetProtocol() == INetProtocol::NOT_VALID ) { OUString aValidURL; @@ -1503,7 +1503,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte aURLObj = INetURLObject( aValidURL ); } - if( aURLObj.GetProtocol() != INET_PROT_NOT_VALID ) + if( aURLObj.GetProtocol() != INetProtocol::NOT_VALID ) { GraphicFilter &rGrfFilter = GraphicFilter::GetGraphicFilter(); aFilterName = rGrfFilter.GetImportFormatName( rGrfFilter.GetImportFormatNumberForShortName( aURLObj.getExtension() ) ); |