From 8b71bf194365b95e3da883651046e5e75bde77c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Sun, 30 Jan 2011 20:41:20 +0000 Subject: [PATCH] Resolves: rhbz#673819 crash on changing position of header/footer object --- ...3819-crash-on-changing-position-of-d.patch | 42 +++++++++++++++++++ libreoffice.spec | 5 ++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 0001-Resolves-rhbz-673819-crash-on-changing-position-of-d.patch 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?= +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/libreoffice.spec b/libreoffice.spec index e129a0d..315ea47 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -111,6 +111,7 @@ Patch23: 0001-fexceptions-fexceptions.patch Patch24: 0001-Related-rhbz-672872-cancel-gtk-file-dialog-on-deskto.patch Patch25: vbahelper.visibility.patch Patch26: 0001-Resolves-fdo-33509-i62414-out-by-one-breaks-CTL-spel.patch +Patch27: 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} @@ -740,6 +741,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch24 -p1 -b .rhbz672872-cancel-gtk-file-dialog-on-deskto.patch %patch25 -p0 -b .vbahelper.visibility.patch %patch26 -p1 -b .fdo33509-i62414-out-by-one-breaks-CTL-spel.patch +%patch27 -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 @@ -2085,10 +2087,11 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %{basisinstdir}/program/kde-open-url %changelog -* Thu Jan 27 2011 Caolán McNamara 3.3.0.4-3 +* Sun Jan 30 2011 Caolán McNamara 3.3.0.4-3 - Related: rhbz#610103 make this even more robust - Related: rhbz#672872 cancel gtk file dialog on terminate - Resolves: fdo#33509/ooo#62414 fix CTL spelling popup +- Resolves: rhbz#673819 crash on changing position of header/footer object * Mon Jan 24 2011 Caolán McNamara 3.3.0.4-2 - Resolves: rhbz#671540 fix lonely )