diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2015-02-07 11:44:20 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-02-09 10:51:10 +0000 |
| commit | 3c1c50281acce8a7471ba456d514e2584e6d22d1 (patch) | |
| tree | 16405ae8d5763fe48e7063a590922c4b053b331f /vcl/source/gdi | |
| parent | 5236e24afddeba986802dea10f988f0559365ff8 (diff) | |
tdf#88836: UI: in-form navigation bar icons gone
Regression from:
6419c745e5e9802da264250d5e131fb9a3b6e4de
Revert it and use IsEmpty() instead of operator!().
(cherry picked from commit 905d4db48a0b98f540c8abc3e12fb80be4826029)
Conflicts:
vcl/source/gdi/impgraph.cxx
Change-Id: Icc4f5dbba848a1d4ef807e598f0aa3b940459c82
Reviewed-on: https://gerrit.libreoffice.org/14357
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'vcl/source/gdi')
| -rw-r--r-- | vcl/source/gdi/impgraph.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 27bd0b97b430..f24dca155b59 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -141,7 +141,7 @@ ImpGraphic::ImpGraphic( const Bitmap& rBitmap ) : mpContext ( NULL ), mpSwapFile ( NULL ), mpGfxLink ( NULL ), - meType ( GRAPHIC_BITMAP ), + meType ( !rBitmap.IsEmpty() ? GRAPHIC_BITMAP : GRAPHIC_NONE ), mnDocFilePos ( 0UL ), mnSizeBytes ( 0UL ), mnRefCount ( 1UL ), @@ -156,7 +156,7 @@ ImpGraphic::ImpGraphic( const BitmapEx& rBitmapEx ) : mpContext ( NULL ), mpSwapFile ( NULL ), mpGfxLink ( NULL ), - meType ( GRAPHIC_BITMAP ), + meType ( !rBitmapEx.IsEmpty() ? GRAPHIC_BITMAP : GRAPHIC_NONE ), mnDocFilePos ( 0UL ), mnSizeBytes ( 0UL ), mnRefCount ( 1UL ), |