diff options
Diffstat (limited to 'vcl/source/gdi')
-rw-r--r-- | vcl/source/gdi/cvtgrf.cxx | 8 | ||||
-rw-r--r-- | vcl/source/gdi/impgraph.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/print.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/vcl/source/gdi/cvtgrf.cxx b/vcl/source/gdi/cvtgrf.cxx index d803813ac919..50204c1d5666 100644 --- a/vcl/source/gdi/cvtgrf.cxx +++ b/vcl/source/gdi/cvtgrf.cxx @@ -32,10 +32,10 @@ GraphicConverter::~GraphicConverter() { } -sal_uLong GraphicConverter::Import( SvStream& rIStm, Graphic& rGraphic, ConvertDataFormat nFormat ) +ErrCode GraphicConverter::Import( SvStream& rIStm, Graphic& rGraphic, ConvertDataFormat nFormat ) { GraphicConverter* pCvt = ImplGetSVData()->maGDIData.mpGrfConverter; - sal_uLong nRet = ERRCODE_IO_GENERAL; + ErrCode nRet = ERRCODE_IO_GENERAL; if( pCvt && pCvt->GetFilterHdl().IsSet() ) { @@ -53,10 +53,10 @@ sal_uLong GraphicConverter::Import( SvStream& rIStm, Graphic& rGraphic, ConvertD return nRet; } -sal_uLong GraphicConverter::Export( SvStream& rOStm, const Graphic& rGraphic, ConvertDataFormat nFormat ) +ErrCode GraphicConverter::Export( SvStream& rOStm, const Graphic& rGraphic, ConvertDataFormat nFormat ) { GraphicConverter* pCvt = ImplGetSVData()->maGDIData.mpGrfConverter; - sal_uLong nRet = ERRCODE_IO_GENERAL; + ErrCode nRet = ERRCODE_IO_GENERAL; if( pCvt && pCvt->GetFilterHdl().IsSet() ) { diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index caed1663c776..f5f05e06f1a8 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -1509,7 +1509,7 @@ void ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic ) } else { - sal_uInt32 nOrigError = rIStm.GetErrorCode(); + ErrCode nOrigError = rIStm.GetErrorCode(); // try to stream in Svg defining data (length, byte array and evtl. path) // See below (operator<<) for more information const sal_uInt32 nSvgMagic((sal_uInt32('s') << 24) | (sal_uInt32('v') << 16) | (sal_uInt32('g') << 8) | sal_uInt32('0')); diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index cb53eb66a005..85c35dc3e0cb 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -1607,9 +1607,9 @@ bool Printer::SetCopyCount( sal_uInt16 nCopy, bool bCollate ) return true; } -sal_uLong Printer::ImplSalPrinterErrorCodeToVCL( sal_uLong nError ) +ErrCode Printer::ImplSalPrinterErrorCodeToVCL( sal_uLong nError ) { - sal_uLong nVCLError; + ErrCode nVCLError; switch ( nError ) { case 0: |