[openoffice.org/f14/master] Resolves: rhbz#673819 crash on changing position of header/footer drawing object

[Caolan McNamara]

commit 8ac536b88b67d1ef12e46175d90672a3ddeef7ce
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 30 20:43:30 2011 +0000

    Resolves: rhbz#673819 crash on changing position of header/footer drawing object

 ...bz-673819-crash-on-changing-position-of-d.patch |   42 ++++++++++++++++++++
 openoffice.org.spec                                |    3 +
 2 files changed, 45 insertions(+), 0 deletions(-)
---
diff --git a/0001-Resolves-rhbz-673819-crash-on-changing-position-of-d.patch b/0001-Resolves-rhbz-673819-crash-on-changing-position-of-d.patch
new file mode 100644
index 0000000..ec072ee
--- /dev/null
+++ b/0001-Resolves-rhbz-673819-crash-on-changing-position-of-d.patch
@@ -0,0 +1,42 @@
+From 69aadc54a50352f69457899c176286d3ac66ca7d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Sun, 30 Jan 2011 20:38:00 +0000
+Subject: [PATCH] Resolves: rhbz#673819 crash on changing position of drawing object in header
+
+The header/footer objects are cunning wrappers to pretend to some parts
+of the drawing stuff that there are multiple objects, while in reality
+there is only one. So call HasText actually gets a totally different
+object from the cast :-(
+---
+ cui/source/tabpages/swpossizetabpage.cxx |    8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
+index ee3add0..9955420 100644
+--- a/cui/source/tabpages/swpossizetabpage.cxx
++++ b/cui/source/tabpages/swpossizetabpage.cxx
+@@ -1876,7 +1876,10 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView )
+     }
+ 
+     // this should happen via SID_ATTR_TRANSFORM_AUTOSIZE
+-    if( rMarkList.GetMarkCount() == 1 )
++    if( rMarkList.GetMarkCount() != 1 )
++        m_bIsMultiSelection = true;
++#if OSL_DEBUG_LEVEL > 1
++    else
+     {
+         const SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
+         SdrObjKind eKind = (SdrObjKind) pObj->GetObjIdentifier();
+@@ -1887,8 +1890,7 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView )
+             DBG_ERROR("AutoWidth/AutoHeight should be enabled");
+         }
+     }
+-    else
+-        m_bIsMultiSelection = true;
++#endif
+ }
+ 
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+-- 
+1.7.3.5
+
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 23b7b30..45348bb 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -159,6 +159,7 @@ Patch75: openoffice.org-3.3.0.rh668349.backportstatusicon.patch
 Patch76: libreoffice-fdo31271.icu.patch
 Patch77: 0001-Related-rhbz-610103-more-woes-on-rpm-upgrade-vs-rpm-.patch
 Patch78: 0001-Related-rhbz-672872-cancel-gtk-file-dialog-on-deskto.patch
+Patch79: 0001-Resolves-rhbz-673819-crash-on-changing-position-of-d.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1734,6 +1735,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch76 -p1 -b .libreoffice-fdo31271.icu.patch
 %patch77 -p1 -b .rhbz610103-more-woes-on-rpm-upgrade-vs-rpm-.patch
 %patch78 -p1 -b .rhbz672872-cancel-gtk-file-dialog-on-deskto.patch
+%patch79 -p1 -b .rhbz673819-crash-on-changing-position-of-d.patch
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
 touch scripting/util/provider/javascript/delzip
@@ -3932,6 +3934,7 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 * Thu Jan 27 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.3-UNBUILT
 - Related: rhbz#610103 make this even more robust
 - Related: rhbz#672872 cancel gtk file dialog on terminate
+- Resolves: rhbz#673819 crash on changing position of header/footer drawing object
 
 * Mon Jan 24 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.2
 - Resolves: rhbz#671540 fix lonely )