cppcanvas/source/mtfrenderer/emfplus.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5e387d1f5aca7966a18d3b408ed804e9e175374b
Author: Caolán McNamara <caol...@redhat.com>
Date: Sun Jul 5 20:24:50 2015 +0100
this SAL_INFO uses brush which might be NULL
Change-Id: Id69b55b266fe62934b53fc765030cfd044d0c74a
(cherry picked from commit 4a121d402f2a66d30cd01ed1b890284d8d4f465a)
Reviewed-on: https://gerrit.libreoffice.org/16777
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Eike Rathke <er...@redhat.com>
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 701cfa3..b8480b8 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1288,7 +1288,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 )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
