summaryrefslogtreecommitdiff
path: root/sd/source/ui/animations/CustomAnimationDialog.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-03-24 11:44:16 +0000
committerCaolán McNamara <caolanm@redhat.com>2020-04-06 21:24:40 +0200
commit21e8ce9ab9a522d25e95773af59b7ccccaee4e54 (patch)
tree75e0730830aade810b84ccb3f51ba511faf03513 /sd/source/ui/animations/CustomAnimationDialog.cxx
parent01546c005eaf6bce8fe4066dbec92c5655190a2a (diff)
weld custom animation panel
and align animation panel and slide transitions panel padding/spacing Change-Id: I25a1d10894de635ebb9c8a1cba358940886125c2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91006 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd/source/ui/animations/CustomAnimationDialog.cxx')
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx9
1 files changed, 9 insertions, 0 deletions
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 3c60f179b493..c62a7381f3bf 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -163,6 +163,13 @@ PresetPropertyBox::~PresetPropertyBox()
mpControl.disposeAndClear();
}
+SdPropertySubControl::SdPropertySubControl(weld::Container* pParent)
+ : mxBuilder(Application::CreateBuilder(pParent, "modules/simpress/ui/customanimationfragment.ui"))
+ , mxContainer(mxBuilder->weld_container("EffectFragment"))
+ , mpParent(pParent)
+{
+}
+
Any PresetPropertyBox::getValue()
{
return makeAny( maPropertyValues[mpControl->GetSelectedEntryPos()] );
@@ -175,6 +182,7 @@ Control* PresetPropertyBox::getControl()
SdPropertySubControl::~SdPropertySubControl()
{
+ mpParent->move(mxContainer.get(), nullptr);
}
namespace {
@@ -221,6 +229,7 @@ void SdPresetPropertyBox::setValue( const Any& rValue, const OUString& rPresetId
mxControl->freeze();
mxControl->clear();
+ maPropertyValues.clear();
int nPos = -1;
const CustomAnimationPresets& rPresets = CustomAnimationPresets::getCustomAnimationPresets();