[Libreoffice-commits] .: writerfilter/source

David Tardon dtardon at kemper.freedesktop.org
Sat Jun 18 08:00:24 PDT 2011


 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit fc23cec13e5e17fb6d0f2d650b8889041af2da68
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Jun 18 16:54:43 2011 +0200

    rhbz#667082 do not crash importing section containing just an empty paragraph

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 759f8e7..9944c8c 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -937,13 +937,7 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap )
                 uno::Reference< text::XTextRange > xParaEnd( xCur, uno::UNO_QUERY );
                 CheckParaRedline( xParaEnd );
 
-                // Remove the last empty section paragraph if needed
-                if ( m_bIsLastParaInSection && !m_bParaChanged )
-                {
-                    RemoveLastParagraph( );
-                    m_bIsLastParaInSection = false;
-                }
-
+                m_bIsLastParaInSection = false;
                 m_bParaChanged = false;
             }
             if( !bKeepLastParagraphProperties )


More information about the Libreoffice-commits mailing list