cppcanvas/source/mtfrenderer/emfplus.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 21b15296d9fb2a5c47c890cb7423aaa49b22131b Author: Caolán McNamara <[email protected]> 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/16778 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Michael Stahl <[email protected]> diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index f58ec95..c99d819 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 )
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
