summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-07-05 20:24:50 +0100
committerMichael Stahl <mstahl@redhat.com>2015-07-06 20:08:49 +0000
commit21b15296d9fb2a5c47c890cb7423aaa49b22131b (patch)
treea8fab6a8450d7364022ee739196c4e2bcb88f69f
parent0e78a51b0e7b023bcdc51fdbff7816ed4ba5d0f8 (diff)
this SAL_INFO uses brush which might be NULL
Change-Id: Id69b55b266fe62934b53fc765030cfd044d0c74a (cherry picked from commit 4a121d402f2a66d30cd01ed1b890284d8d4f465a) Reviewed-on: https://gerrit.libreoffice.org/16778 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--cppcanvas/source/mtfrenderer/emfplus.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index f58ec95dd49a..c99d819e3e7e 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1289,7 +1289,7 @@ namespace cppcanvas
rState.isFillColorSet = true;
// extract UseBrush
EMFPBrush* brush = static_cast<EMFPBrush*>( aObjects [brushIndexOrColor & 0xff] );
- SAL_INFO("cppcanvas.emf", "EMF+\tbrush fill slot: " << brushIndexOrColor << " (type: " << brush->GetType () << ")");
+ SAL_INFO("cppcanvas.emf", "EMF+\tbrush fill slot: " << brushIndexOrColor << " (type: " << (brush ? brush->GetType() : -1) << ")");
// give up in case something wrong happened
if( !brush )