diff --git a/0001-Resolves-rhbz-1015281-crash-on-clicking-custom-anima.patch b/0001-Resolves-rhbz-1015281-crash-on-clicking-custom-anima.patch new file mode 100644 index 0000000..ac18ca7 --- /dev/null +++ b/0001-Resolves-rhbz-1015281-crash-on-clicking-custom-anima.patch @@ -0,0 +1,38 @@ +From 95c7765107d4d668cfa0709dce8003bf3258ef66 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Mon, 7 Oct 2013 12:21:54 +0100 +Subject: [PATCH] Resolves: rhbz#1015281 crash on clicking custom animation + +Change-Id: Ibb4519a3d41266ae16fcb93567cf5b5c67066b0c +--- + sd/source/ui/animations/motionpathtag.cxx | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx +index f5f7ac2..2051823 100644 +--- a/sd/source/ui/animations/motionpathtag.cxx ++++ b/sd/source/ui/animations/motionpathtag.cxx +@@ -366,7 +366,8 @@ MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, con + { + mpPathObj = mpEffect->createSdrPathObjFromPath(); + mxPolyPoly = mpPathObj->GetPathPoly(); +- maOriginPos = mxOrigin->getPosition(); ++ if (mxOrigin.is()) ++ maOriginPos = mxOrigin->getPosition(); + + SdrPage* pPage = mrView.GetSdrPageView()->GetPage(); + if( pPage ) +@@ -946,7 +947,9 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList ) + { + if( mpPathObj ) + { +- ::com::sun::star::awt::Point aPos( mxOrigin->getPosition() ); ++ ::com::sun::star::awt::Point aPos; ++ if (mxOrigin.is()) ++ aPos = mxOrigin->getPosition(); + if( (aPos.X != maOriginPos.X) || (aPos.Y != maOriginPos.Y) ) + { + const basegfx::B2DHomMatrix aTransform(basegfx::tools::createTranslateB2DHomMatrix( +-- +1.8.3.1 + diff --git a/libreoffice.spec b/libreoffice.spec index 169119d..0d29b51 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -43,7 +43,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.3 -Release: 2%{?libo_prerelease}%{?dist} +Release: 3%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 Group: Applications/Productivity URL: http://www.libreoffice.org/default/ @@ -261,6 +261,7 @@ Patch20: 0001-Avoid-crash-when-a-comment-contains-data-but-no-text.patch Patch21: 0001-Resolves-rhbz-1013480-crash-in-EditLineList-operator.patch Patch22: 0001-rhbz-1014010-Missing-dependencies-in-isBootstrapType.patch Patch23: 0001-Resolves-rhbz-1013844-fdo-47482-encrypted-OOo-1.0-do.patch +Patch24: 0001-Resolves-rhbz-1015281-crash-on-clicking-custom-anima.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -1016,6 +1017,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch21 -p1 -b .rhbz-1013480-crash-in-EditLineList-operator.patch %patch22 -p1 -b .rhbz-1014010-Missing-dependencies-in-isBootstrapType.patch %patch23 -p1 -b .rhbz-1013844-fdo-47482-encrypted-OOo-1.0-do.patch +%patch24 -p1 -b .rhbz-1015281-crash-on-clicking-custom-anima.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2106,6 +2108,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Mon Oct 07 2013 Caolán McNamara - 1:4.1.2.3-3 +- Resolves: rhbz#1015281 crash on clicking custom animation + * Wed Oct 02 2013 Caolán McNamara - 1:4.1.2.3-2 - Resolves: rhbz#1013480 crash in EditLineList::operator[] - Resolves: rhbz#1014010 crash on start up