Kaydet (Commit) 95c77651 authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: rhbz#1015281 crash on clicking custom animation

Change-Id: Ibb4519a3d41266ae16fcb93567cf5b5c67066b0c
üst e5dd1952
...@@ -366,6 +366,7 @@ MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, con ...@@ -366,6 +366,7 @@ MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, con
{ {
mpPathObj = mpEffect->createSdrPathObjFromPath(); mpPathObj = mpEffect->createSdrPathObjFromPath();
mxPolyPoly = mpPathObj->GetPathPoly(); mxPolyPoly = mpPathObj->GetPathPoly();
if (mxOrigin.is())
maOriginPos = mxOrigin->getPosition(); maOriginPos = mxOrigin->getPosition();
SdrPage* pPage = mrView.GetSdrPageView()->GetPage(); SdrPage* pPage = mrView.GetSdrPageView()->GetPage();
...@@ -946,7 +947,9 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList ) ...@@ -946,7 +947,9 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList )
{ {
if( mpPathObj ) 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) ) if( (aPos.X != maOriginPos.X) || (aPos.Y != maOriginPos.Y) )
{ {
const basegfx::B2DHomMatrix aTransform(basegfx::tools::createTranslateB2DHomMatrix( const basegfx::B2DHomMatrix aTransform(basegfx::tools::createTranslateB2DHomMatrix(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment