sd: Pass AnimationWindow's SfxBindings param by ref
Change-Id: I7ba5b9d13d1a547fcfda4e25b489977138a6b9a5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/208376 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Jenkins
This commit is contained in:
@@ -34,7 +34,7 @@ AnimationChildWindow::AnimationChildWindow(vcl::Window* _pParent, sal_uInt16 nId
|
||||
SfxBindings& rBindings, SfxChildWinInfo& rInfo)
|
||||
: SfxChildWindow(_pParent, nId)
|
||||
{
|
||||
VclPtr<AnimationWindow> pAnimWin = VclPtr<AnimationWindow>::Create(&rBindings, this, _pParent);
|
||||
VclPtr<AnimationWindow> pAnimWin = VclPtr<AnimationWindow>::Create(rBindings, this, _pParent);
|
||||
SetWindow(pAnimWin);
|
||||
|
||||
pAnimWin->Initialize(rInfo);
|
||||
|
||||
@@ -120,9 +120,9 @@ void SdDisplay::SetDrawingArea(weld::DrawingArea* pDrawingArea)
|
||||
/**
|
||||
* AnimationWindow - FloatingWindow
|
||||
*/
|
||||
AnimationWindow::AnimationWindow(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* pParent)
|
||||
: SfxDockingWindow(pInBindings, pCW, pParent,
|
||||
u"DockingAnimation"_ustr, u"modules/simpress/ui/dockinganimation.ui"_ustr)
|
||||
AnimationWindow::AnimationWindow(SfxBindings& rBindings, SfxChildWindow* pCW, vcl::Window* pParent)
|
||||
: SfxDockingWindow(&rBindings, pCW, pParent, u"DockingAnimation"_ustr,
|
||||
u"modules/simpress/ui/dockinganimation.ui"_ustr)
|
||||
, m_xCtlDisplay(new SdDisplay)
|
||||
, m_xCtlDisplayWin(new weld::CustomWeld(*m_xBuilder, u"preview"_ustr, *m_xCtlDisplay))
|
||||
, m_xBtnFirst(m_xBuilder->weld_button(u"first"_ustr))
|
||||
@@ -160,7 +160,7 @@ AnimationWindow::AnimationWindow(SfxBindings* pInBindings, SfxChildWindow *pCW,
|
||||
rtl::Reference<SdPage> pPage = pMyDoc->AllocSdPage(false);
|
||||
pMyDoc->InsertPage(pPage.get());
|
||||
|
||||
pControllerItem.reset( new AnimationControllerItem( SID_ANIMATOR_STATE, this, pInBindings ) );
|
||||
pControllerItem.reset(new AnimationControllerItem(SID_ANIMATOR_STATE, this, &rBindings));
|
||||
|
||||
m_xBtnFirst->connect_clicked( LINK( this, AnimationWindow, ClickFirstHdl ) );
|
||||
m_xBtnReverse->connect_clicked( LINK( this, AnimationWindow, ClickPlayHdl ) );
|
||||
|
||||
@@ -79,7 +79,7 @@ class AnimationWindow final : public SfxDockingWindow
|
||||
friend class AnimationControllerItem;
|
||||
|
||||
public:
|
||||
AnimationWindow(SfxBindings* pBindings, SfxChildWindow *pCW, vcl::Window* pParent);
|
||||
AnimationWindow(SfxBindings& rBindings, SfxChildWindow* pCW, vcl::Window* pParent);
|
||||
virtual ~AnimationWindow() override;
|
||||
virtual void dispose() override;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user