diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-03-04 17:22:14 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-03-11 17:42:22 +0100 |
| commit | 1653bb9bffaa84a40b7d81a8277e887ea28df4e4 (patch) | |
| tree | 5e56142b7b63ab66fb1dcc781ffeb3ae5afda2ad /sd/source/ui/animations/SlideTransitionPane.cxx | |
| parent | 40c58f6039fb02cff74e442f6adc5ba38adcff1d (diff) | |
remove intermediate containers in sidebars
tested extension sidebars of:
a) Wollmux extension sidebars
b) Analog Clock Extension demo
https://wiki.openoffice.org/wiki/Sidebar_for_Developers#Example:_Analog_Clock_Extension
Change-Id: If9729e20526681928137989f01a8ae733a9b0cb5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112035
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd/source/ui/animations/SlideTransitionPane.cxx')
| -rw-r--r-- | sd/source/ui/animations/SlideTransitionPane.cxx | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index ea56c90f9902..5a509fb448a9 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -36,6 +36,7 @@ #include <sal/log.hxx> #include <tools/debug.hxx> #include <svx/gallery.hxx> +#include <svx/colorwindow.hxx> #include <vcl/stdtext.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> @@ -390,10 +391,9 @@ public: // SlideTransitionPane SlideTransitionPane::SlideTransitionPane( - Window * pParent, - ViewShellBase & rBase, - const css::uno::Reference<css::frame::XFrame>& rxFrame ) : - PanelLayout( pParent, "SlideTransitionsPanel", "modules/simpress/ui/slidetransitionspanel.ui", rxFrame ), + weld::Widget* pParent, + ViewShellBase & rBase) : + PanelLayout( pParent, "SlideTransitionsPanel", "modules/simpress/ui/slidetransitionspanel.ui" ), mrBase( rBase ), mpDrawDoc( rBase.GetDocShell() ? rBase.GetDocShell()->GetDoc() : nullptr ), @@ -477,17 +477,10 @@ void SlideTransitionPane::Initialize(SdDrawDocument* pDoc) maLateInitTimer.SetTimeout(200); maLateInitTimer.SetInvokeHandler(LINK(this, SlideTransitionPane, LateInitCallback)); maLateInitTimer.Start(); - - UpdateLook(); } SlideTransitionPane::~SlideTransitionPane() { - disposeOnce(); -} - -void SlideTransitionPane::dispose() -{ maLateInitTimer.Stop(); removeListener(); mxVS_TRANSITION_ICONSWin.reset(); @@ -505,17 +498,6 @@ void SlideTransitionPane::dispose() mxPB_APPLY_TO_ALL.reset(); mxPB_PLAY.reset(); mxCB_AUTO_PREVIEW.reset(); - PanelLayout::dispose(); -} - -void SlideTransitionPane::DataChanged (const DataChangedEvent&) -{ - UpdateLook(); -} - -void SlideTransitionPane::UpdateLook() -{ - SetBackground(::sfx2::sidebar::Theme::GetColor(::sfx2::sidebar::Theme::Color_PanelBackground)); } void SlideTransitionPane::onSelectionChanged() @@ -888,7 +870,7 @@ void SlideTransitionPane::applyToSelectedPages(bool bPreview = true) if( mbUpdatingControls ) return; - Window *pFocusWindow = Application::GetFocusWindow(); + vcl::Window *pFocusWindow = Application::GetFocusWindow(); ::sd::slidesorter::SharedPageSelection pSelectedPages( getSelectedPages()); impl::TransitionEffect aEffect = getTransitionEffectFromControls(); |