2 files changed, 16 insertions, 2 deletions
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 58e595e75877..2a23da8fed34 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -44,6 +44,7 @@
 
 #include <svtools/ctrltool.hxx>
 #include <sfx2/objsh.hxx>
+#include <sfx2/viewsh.hxx>
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
@@ -84,7 +85,8 @@ using ::com::sun::star::beans::XPropertySet;
 namespace sd {
 
 SdPropertySubControl::SdPropertySubControl(weld::Container* pParent)
-    : mxBuilder(Application::CreateBuilder(pParent, "modules/simpress/ui/customanimationfragment.ui"))
+    : mxBuilder(Application::CreateBuilder(pParent, "modules/simpress/ui/customanimationfragment.ui",
+        false, reinterpret_cast<sal_uInt64>(SfxViewShell::Current())))
     , mxContainer(mxBuilder->weld_container("EffectFragment"))
     , mpParent(pParent)
 {
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index b952a72f69ab..0b317da19c3d 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -551,6 +551,9 @@ void CustomAnimationPane::updateControls()
 
         if (!mxLBSubControl || nOldPropertyType != nNewPropertyType)
         {
+            // for LOK destroy old widgets first
+            mxLBSubControl.reset(nullptr);
+            // then create new control, to keep correct pointers for actions
             mxLBSubControl = SdPropertySubControl::create(nNewPropertyType, mxFTProperty.get(), mxPlaceholderBox.get(), GetFrameWeld(), aValue, pEffect->getPresetId(), LINK(this, CustomAnimationPane, implPropertyHdl));
         }
         else
@@ -661,7 +664,16 @@ void CustomAnimationPane::updateControls()
     else
     {
         // use an empty direction box to fill the space
-        mxLBSubControl = SdPropertySubControl::create(nPropertyTypeDirection, mxFTProperty.get(), mxPlaceholderBox.get(), GetFrameWeld(), uno::Any(), OUString(), LINK(this, CustomAnimationPane, implPropertyHdl));
+        if (!mxLBSubControl || (nOldPropertyType != nPropertyTypeDirection && nOldPropertyType != nPropertyTypeNone))
+        {
+            // for LOK destroy old widgets first
+            mxLBSubControl.reset(nullptr);
+            // then create new control, to keep correct pointers for actions
+            mxLBSubControl = SdPropertySubControl::create(nPropertyTypeDirection, mxFTProperty.get(), mxPlaceholderBox.get(), GetFrameWeld(), uno::Any(), OUString(), LINK(this, CustomAnimationPane, implPropertyHdl));
+        }
+        else
+            mxLBSubControl->setValue(uno::Any(), OUString());
+
         mxPlaceholderBox->set_sensitive(false);
         mxFTProperty->set_sensitive(false);
         mxFTStartDelay->set_sensitive(false);