[Libreoffice-commits] core.git: writerfilter/source

Miklos Vajna vmiklos at collabora.co.uk
Wed May 14 06:10:58 PDT 2014


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

New commits:
commit b28c0afdae884dff3a2f06adce80e3520f6ebf68
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed May 14 14:52:19 2014 +0200

    DomainMapper_Impl::AddDummyParaForTableInSection: shapes can't have sections
    
    Trying to add (and later remove) a dummy paragraph is just not needed at
    the moment, but it'll cause a real problem for textboxes.
    
    Change-Id: I9f90b515171ce4b498de49c2381b7324002e3c20

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 9cda806..f3eb595 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -301,6 +301,9 @@ void DomainMapper_Impl::RemoveDummyParaForTableInSection()
 }
 void DomainMapper_Impl::AddDummyParaForTableInSection()
 {
+    // Shapes can't have sections.
+    if (IsInShape())
+        return;
 
     if (!m_aTextAppendStack.empty())
     {


More information about the Libreoffice-commits mailing list