diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-01 16:47:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-02 09:00:13 +0200 |
| commit | 0265bdb92e5dbb5ba851a3d89eb8722bdaf081be (patch) | |
| tree | 46c8f87d626cb6c74e211f4dce2721ab5c9b9e14 /filter | |
| parent | cf0651fe736c1f411651ee2691ab009fe271be2f (diff) | |
convert GRFILTER constants to ERRCODE_GRFILTER_
since various code mixes these constants in with ErrCode values from
other code, let us just make it into real ErrCode values.
Change-Id: Ifa3d0f7526172609a44e6749bed9f730ab6b1a95
Reviewed-on: https://gerrit.libreoffice.org/38313
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/graphic/GraphicExportFilter.cxx | 2 | ||||
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/filter/source/graphic/GraphicExportFilter.cxx b/filter/source/graphic/GraphicExportFilter.cxx index 65f70ba18a06..c14ecdc20563 100644 --- a/filter/source/graphic/GraphicExportFilter.cxx +++ b/filter/source/graphic/GraphicExportFilter.cxx @@ -121,7 +121,7 @@ sal_Bool SAL_CALL GraphicExportFilter::filter( const Sequence<PropertyValue>& rD const sal_uInt16 nResult = rFilter.ExportGraphic( aGraphic.GetBitmapEx(aParameters), OUString(), aMemStream, nFilterFormat, &aFilterData ); - if ( nResult == GRFILTER_OK ) + if ( nResult == ERRCODE_NONE ) { SvOutputStream aOutputStream( mxOutputStream ); aMemStream.Seek(0); diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index b61f6c8d6c23..11f83205f1b3 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -6328,7 +6328,7 @@ bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, tool { sal_uLong nOldPos = rBLIPStream.Tell(); - int nRes = GRFILTER_OPENERROR; // initialize error variable + ErrCode nRes = ERRCODE_GRFILTER_OPENERROR; // initialize error variable // check whether it's really a BLIP sal_uInt32 nLength; @@ -6452,7 +6452,7 @@ bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, tool if( ReadDIB(aNew, *pGrStream, false) ) { rData = Graphic( aNew ); - nRes = GRFILTER_OK; + nRes = ERRCODE_NONE; } } else @@ -6466,7 +6466,7 @@ bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, tool // // For pict graphics we will furthermore scale the metafile, because font scaling leads to error if the // dxarray is empty (this has been solved in wmf/emf but not for pict) - if( bMtfBLIP && ( GRFILTER_OK == nRes ) && ( rData.GetType() == GraphicType::GdiMetafile ) && ( ( nInst & 0xFFFE ) == 0x542 ) ) + if( bMtfBLIP && ( ERRCODE_NONE == nRes ) && ( rData.GetType() == GraphicType::GdiMetafile ) && ( ( nInst & 0xFFFE ) == 0x542 ) ) { if ( ( aMtfSize100.Width() >= 1000 ) && ( aMtfSize100.Height() >= 1000 ) ) { // #75956#, scaling does not work properly, if the graphic is less than 1cm @@ -6491,7 +6491,7 @@ bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, tool } rBLIPStream.Seek( nOldPos ); // restore old FilePos of the strem - return ( GRFILTER_OK == nRes ); // return result + return ( ERRCODE_NONE == nRes ); // return result } /* also static */ |