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 /svx/source/xoutdev | |
| parent | 3aac11a1233f679ea813fee8b8de134553d7db60 (diff) | |
Change INetProtocol enumerators to CamelCase
...to avoid clashes with macros and poor warnings about hiding global FILE
Change-Id: I444e8b958f029201b228937e088efabc4b6d3050
Diffstat (limited to 'svx/source/xoutdev')
| -rw-r--r-- | svx/source/xoutdev/_xoutbmp.cxx | 4 | ||||
| -rw-r--r-- | svx/source/xoutdev/xtable.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index 87dbb9f55dc3..1f39734d3dff 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -127,7 +127,7 @@ sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, OUString& rFileNam sal_uInt16 nErr = GRFILTER_FILTERERROR, nFilter = GRFILTER_FORMAT_NOTFOUND; bool bTransparent = rGraphic.IsTransparent(), bAnimated = rGraphic.IsAnimated(); - DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NOT_VALID, "XOutBitmap::WriteGraphic(...): invalid URL" ); + DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NotValid, "XOutBitmap::WriteGraphic(...): invalid URL" ); // calculate correct file name if( !( nFlags & XOUTBMP_DONT_EXPAND_FILENAME ) ) @@ -364,7 +364,7 @@ sal_uInt16 XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObje GraphicFilter& rFilter, const sal_uInt16 nFormat, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData ) { - DBG_ASSERT( rURL.GetProtocol() != INetProtocol::NOT_VALID, "XOutBitmap::ExportGraphic(...): invalid URL" ); + DBG_ASSERT( rURL.GetProtocol() != INetProtocol::NotValid, "XOutBitmap::ExportGraphic(...): invalid URL" ); SfxMedium aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::SHARE_DENYNONE | StreamMode::TRUNC ); SvStream* pOStm = aMedium.GetOutStream(); diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx index bae363fb044b..5e35be97a2c7 100644 --- a/svx/source/xoutdev/xtable.cxx +++ b/svx/source/xoutdev/xtable.cxx @@ -227,7 +227,7 @@ bool XPropertyList::Load() INetURLObject aURL( maPath ); - if( INetProtocol::NOT_VALID == aURL.GetProtocol() ) + if( INetProtocol::NotValid == aURL.GetProtocol() ) { DBG_ASSERT( maPath.isEmpty(), "invalid URL" ); return false; @@ -258,7 +258,7 @@ bool XPropertyList::Save() { INetURLObject aURL( maPath ); - if( INetProtocol::NOT_VALID == aURL.GetProtocol() ) + if( INetProtocol::NotValid == aURL.GetProtocol() ) { DBG_ASSERT( maPath.isEmpty(), "invalid URL" ); return false; |