|
 |
2135ec |
From 95c7765107d4d668cfa0709dce8003bf3258ef66 Mon Sep 17 00:00:00 2001
|
|
|
2135ec |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
2135ec |
Date: Mon, 7 Oct 2013 12:21:54 +0100
|
|
|
2135ec |
Subject: [PATCH] Resolves: rhbz#1015281 crash on clicking custom animation
|
|
|
2135ec |
|
|
|
2135ec |
Change-Id: Ibb4519a3d41266ae16fcb93567cf5b5c67066b0c
|
|
|
2135ec |
---
|
|
|
2135ec |
sd/source/ui/animations/motionpathtag.cxx | 7 +++++--
|
|
|
2135ec |
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
2135ec |
|
|
|
2135ec |
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
|
|
|
2135ec |
index f5f7ac2..2051823 100644
|
|
|
2135ec |
--- a/sd/source/ui/animations/motionpathtag.cxx
|
|
|
2135ec |
+++ b/sd/source/ui/animations/motionpathtag.cxx
|
|
|
2135ec |
@@ -366,7 +366,8 @@ MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, con
|
|
|
2135ec |
{
|
|
|
2135ec |
mpPathObj = mpEffect->createSdrPathObjFromPath();
|
|
|
2135ec |
mxPolyPoly = mpPathObj->GetPathPoly();
|
|
|
2135ec |
- maOriginPos = mxOrigin->getPosition();
|
|
|
2135ec |
+ if (mxOrigin.is())
|
|
|
2135ec |
+ maOriginPos = mxOrigin->getPosition();
|
|
|
2135ec |
|
|
|
2135ec |
SdrPage* pPage = mrView.GetSdrPageView()->GetPage();
|
|
|
2135ec |
if( pPage )
|
|
|
2135ec |
@@ -946,7 +947,9 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList )
|
|
|
2135ec |
{
|
|
|
2135ec |
if( mpPathObj )
|
|
|
2135ec |
{
|
|
|
2135ec |
- ::com::sun::star::awt::Point aPos( mxOrigin->getPosition() );
|
|
|
2135ec |
+ ::com::sun::star::awt::Point aPos;
|
|
|
2135ec |
+ if (mxOrigin.is())
|
|
|
2135ec |
+ aPos = mxOrigin->getPosition();
|
|
|
2135ec |
if( (aPos.X != maOriginPos.X) || (aPos.Y != maOriginPos.Y) )
|
|
|
2135ec |
{
|
|
|
2135ec |
const basegfx::B2DHomMatrix aTransform(basegfx::tools::createTranslateB2DHomMatrix(
|
|
|
2135ec |
--
|
|
|
2135ec |
1.8.3.1
|
|
|
2135ec |
|