[Libreoffice-commits] .: cppcanvas/source svtools/qa

[Caolán McNamara]

 cppcanvas/source/mtfrenderer/emfplus.cxx        |    4 ++--
 svtools/qa/cppunit/data/emf/pass/fdo38580-3.emf |binary
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8e9ad03830367062aaa84206eae56252eca2ec5e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 10 16:51:55 2011 +0100

    Related: fdo#38580 NULL object

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 88755c5..fe5a129 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1533,10 +1533,10 @@ namespace cppcanvas
                 case EmfPlusRecordTypeSetClipRegion: {
                     EMFP_DEBUG (printf ("EMF+ SetClipRegion\n"));
                     EMFP_DEBUG (printf ("EMF+\tregion in slot: %d combine mode: %d\n", flags & 0xff, (flags & 0xff00) >> 8));
-                    EMFPRegion& region = *(EMFPRegion*) aObjects [flags & 0xff];
+                    EMFPRegion *region = (EMFPRegion*)aObjects [flags & 0xff];
 
                     // reset clip
-                    if (region.parts == 0 && region.initialState == EmfPlusRegionInitialStateInfinite) {
+                    if (region && region->parts == 0 && region->initialState == EmfPlusRegionInitialStateInfinite) {
                         updateClipping (::basegfx::B2DPolyPolygon (), rFactoryParms, false);
                     } else {
                         EMFP_DEBUG (printf ("EMF+\tTODO\n"));
diff --git a/svtools/qa/cppunit/data/emf/pass/fdo38580-3.emf b/svtools/qa/cppunit/data/emf/pass/fdo38580-3.emf
new file mode 100644
index 0000000..0af6c74
Binary files /dev/null and b/svtools/qa/cppunit/data/emf/pass/fdo38580-3.emf differ