[Libreoffice-commits] .: writerfilter/source

Miklos Vajna vmiklos at kemper.freedesktop.org
Sat Nov 12 06:45:49 PST 2011


 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 2cbb64ca303d89984fd42ba4a787d63ea427fcd6
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Sat Nov 12 15:36:03 2011 +0100

    Related: i#108154 null pointer check for the unit test

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 53bfb1e..2f3eed6 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1368,6 +1368,8 @@ void DomainMapper_Impl::PopAnnotation()
 
 void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape > xShape )
 {
+    if (m_aTextAppendStack.empty())
+        return;
     uno::Reference<text::XTextAppend> xTextAppend = m_aTextAppendStack.top().xTextAppend;
     m_bIsInShape = true;
     try


More information about the Libreoffice-commits mailing list