You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
39 lines
1.5 KiB
39 lines
1.5 KiB
From 95c7765107d4d668cfa0709dce8003bf3258ef66 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
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
|
|
|