diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-14 13:34:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-14 15:42:31 +0200 |
| commit | a6aa57ff591fdf3d834a7e0b1e9e2ebad1d87c5c (patch) | |
| tree | 3de1d4767963fd78bcf6f8a90a4e2467e3a2acc5 /filter/source/graphicfilter | |
| parent | 546c35519125a769755330c961c7b8fc61e24d89 (diff) | |
use ERRCODE_NONE instead of 0
peeling off a small chunk of my ErrCode strong_int conversion
Change-Id: Idc89e8496083beed7608cba705cd981139eb7111
Reviewed-on: https://gerrit.libreoffice.org/38777
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter/source/graphicfilter')
| -rw-r--r-- | filter/source/graphicfilter/ios2met/ios2met.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 052ab9b877fc..369de5eca38a 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -2343,7 +2343,7 @@ void OS2METReader::ReadFont(sal_uInt16 nFieldSize) nPos=pOS2MET->Tell(); nMaxPos=nPos+(sal_uLong)nFieldSize; pOS2MET->SeekRel(2); nPos+=2; - while (nPos<nMaxPos && pOS2MET->GetError()==0) { + while (nPos<nMaxPos && pOS2MET->GetError()==ERRCODE_NONE) { pOS2MET->ReadUChar( nByte ); sal_uInt16 nLen = ((sal_uInt16)nByte) & 0x00ff; if (nLen == 0) @@ -2431,7 +2431,7 @@ void OS2METReader::ReadField(sal_uInt16 nFieldType, sal_uInt16 nFieldSize) nPos=pOS2MET->Tell(); nMaxPos=nPos+(sal_uLong)nFieldSize; pOS2MET->SeekRel(3); nPos+=3; - while (nPos<nMaxPos && pOS2MET->GetError()==0) { + while (nPos<nMaxPos && pOS2MET->GetError()==ERRCODE_NONE) { pOS2MET->ReadUChar( nbyte ); nElemLen=((sal_uInt16)nbyte) & 0x00ff; if (nElemLen>11) { pOS2MET->SeekRel(4); @@ -2486,7 +2486,7 @@ void OS2METReader::ReadField(sal_uInt16 nFieldType, sal_uInt16 nFieldSize) case EndImgObjMagic: { // read temporary Windows BMP file: if (pBitmapList==nullptr || pBitmapList->pBMP==nullptr || - pBitmapList->pBMP->GetError()!=0) { + pBitmapList->pBMP->GetError()!=ERRCODE_NONE) { pOS2MET->SetError(SVSTREAM_FILEFORMAT_ERROR); ErrorCode=5; return; @@ -2495,7 +2495,7 @@ void OS2METReader::ReadField(sal_uInt16 nFieldType, sal_uInt16 nFieldSize) ReadDIB(pBitmapList->aBitmap, *(pBitmapList->pBMP), false); - if (pBitmapList->pBMP->GetError()!=0) { + if (pBitmapList->pBMP->GetError()!=ERRCODE_NONE) { pOS2MET->SetError(SVSTREAM_FILEFORMAT_ERROR); ErrorCode=6; } @@ -2518,7 +2518,7 @@ void OS2METReader::ReadField(sal_uInt16 nFieldType, sal_uInt16 nFieldSize) nPos=pOS2MET->Tell(); nMaxPos=nPos+(sal_uLong)nFieldSize; - while (nPos<nMaxPos && pOS2MET->GetError()==0) { + while (nPos<nMaxPos && pOS2MET->GetError()==ERRCODE_NONE) { pOS2MET->ReadUChar( nbyte ); nDataID=((sal_uInt16)nbyte)&0x00ff; if (nDataID==0x00fe) { pOS2MET->ReadUChar( nbyte ); @@ -2570,7 +2570,7 @@ void OS2METReader::ReadField(sal_uInt16 nFieldType, sal_uInt16 nFieldSize) else pOS2MET->SeekRel(-1); // no header, go back one byte // loop through Order: - while (pOS2MET->Tell()<nMaxPos && pOS2MET->GetError()==0) { + while (pOS2MET->Tell()<nMaxPos && pOS2MET->GetError()==ERRCODE_NONE) { pOS2MET->ReadUChar( nbyte ); nOrderID=((sal_uInt16)nbyte) & 0x00ff; if (nOrderID==0x00fe) { pOS2MET->ReadUChar( nbyte ); @@ -2614,7 +2614,7 @@ void OS2METReader::ReadField(sal_uInt16 nFieldType, sal_uInt16 nFieldSize) sal_uInt8 nbyte; nMaxPos=pOS2MET->Tell()+(sal_uLong)nFieldSize; - while (pOS2MET->Tell()<nMaxPos && pOS2MET->GetError()==0) { + while (pOS2MET->Tell()<nMaxPos && pOS2MET->GetError()==ERRCODE_NONE) { pOS2MET->ReadUChar( nbyte ); nDscID =((sal_uInt16)nbyte) & 0x00ff; pOS2MET->ReadUChar( nbyte ); nDscLen=((sal_uInt16)nbyte) & 0x00ff; nPos=pOS2MET->Tell(); |