From 3c1c50281acce8a7471ba456d514e2584e6d22d1 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sat, 7 Feb 2015 11:44:20 +0100 Subject: 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 Reviewed-by: Christian Lohmaier --- vcl/source/gdi/impgraph.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vcl/source') 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 ), -- cgit