[libreoffice/f15] Resolves: rhbz#667082 do not crash importing section containing just an empty paragraph

[David Tardon]

commit 52dc84dd50d3314eb83e99bb820d5c3fb0c7d901
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Jun 21 09:14:14 2011 +0200

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

 ...-do-not-crash-importing-section-containin.patch |   32 ++++++++++++++++++++
 libreoffice.spec                                   |    6 +++-
 2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/0001-rhbz-667082-do-not-crash-importing-section-containin.patch b/0001-rhbz-667082-do-not-crash-importing-section-containin.patch
new file mode 100644
index 0000000..9f2f750
--- /dev/null
+++ b/0001-rhbz-667082-do-not-crash-importing-section-containin.patch
@@ -0,0 +1,32 @@
+From fc23cec13e5e17fb6d0f2d650b8889041af2da68 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Sat, 18 Jun 2011 16:54:43 +0200
+Subject: [PATCH] rhbz#667082 do not crash importing section containing just
+ an empty paragraph
+
+---
+ writerfilter/source/dmapper/DomainMapper_Impl.cxx |    8 +-------
+ 1 files changed, 1 insertions(+), 7 deletions(-)
+
+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 )
+-- 
+1.7.5.2
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 81b2801..23ce9ee 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -149,6 +149,7 @@ Patch60: 0001-Resolves-fdo-37668-bitwise-operations-on-signed-numb.patch
 Patch61: 0001-Resolves-rhbz-713154-pdf-export-dialog-too-tall-to-f.patch
 Patch62: 0001-Related-rhbz-702833-addEventListener-without-removeE.patch
 Patch63: 0001-Related-rhbz-711087-band-aid.patch
+Patch64: 0001-rhbz-667082-do-not-crash-importing-section-containin.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -813,6 +814,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch61 -p1 -b .rhbz713154-pdf-export-dialog-too-tall-to-f.patch
 %patch62 -p1 -b .rhbz702833-addEventListener-without-removeE.patch
 %patch63 -p1 -b .rhbz711087-band-aid.patch
+%patch64 -p1 -b .rhbz667082-do-not-crash-importing-section-containin.patch
 
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
@@ -2157,10 +2159,12 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{basisinstdir}/program/kde-open-url
 
 %changelog
-* Fri Jun 17 2011 Caolán McNamara <caolanm at redhat.com> 1:3.3.3.1-2-UNBUILT
+* Tue Jun 21 2011 Caolán McNamara <caolanm at redhat.com> 1:3.3.3.1-2-UNBUILT
 - Resolves: rhbz#713154 pdf export dialog too tall to fit
 - Related: rhbz#702833 addEventListener without removeEventListener
 - Related: rhbz#711087 band aid for crash in undo
+- Resolves: rhbz#667082 do not crash importing section containing just
+  an empty paragraph (dtardon)
 
 * Tue Jun 14 2011 Caolán McNamara <caolanm at redhat.com> 1:3.3.3.1-1
 - bugfixing 3.3.3.1 point release