diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-12-12 17:50:16 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-12-12 23:30:44 +0100 |
| commit | eb002da913cd1745b039bbc7e519542d7990fb49 (patch) | |
| tree | 6a035877c86301a8d2184ff3026d5dae740a6789 /filter | |
| parent | dcdaca599987ded1577bd04ed1e70f5bd02e943f (diff) | |
Remove obsolete "explicit operator bool" hack
...and fix the call sites that exploited the hack's internals being non-
transparent.
Change-Id: Ib3b06c3945e303d4088c4e1b65be5beed8613bac
Reviewed-on: https://gerrit.libreoffice.org/46325
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/graphicfilter/ipcx/ipcx.cxx | 2 | ||||
| -rw-r--r-- | filter/source/graphicfilter/iras/iras.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx index 38c6d54664c2..4adfb3ec24f1 100644 --- a/filter/source/graphicfilter/ipcx/ipcx.cxx +++ b/filter/source/graphicfilter/ipcx/ipcx.cxx @@ -100,7 +100,7 @@ bool PCXReader::ReadPCX(Graphic & rGraphic) { aBmp = Bitmap( Size( nWidth, nHeight ), nDestBitsPerPixel ); Bitmap::ScopedWriteAccess pAcc(aBmp); - if ( pAcc == nullptr ) + if ( !pAcc ) return false; if ( nDestBitsPerPixel <= 8 ) diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx index ac75b2a77bd3..232ac9807dc2 100644 --- a/filter/source/graphicfilter/iras/iras.cxx +++ b/filter/source/graphicfilter/iras/iras.cxx @@ -174,7 +174,7 @@ bool RASReader::ReadRAS(Graphic & rGraphic) Bitmap aBmp(Size(mnWidth, mnHeight), mnDstBitsPerPix); Bitmap::ScopedWriteAccess pAcc(aBmp); - if (pAcc == nullptr) + if (!pAcc) return false; if (bPalette) |