[Libreoffice-commits] core.git: include/sfx2 sfx2/source

[Caolán McNamara]

 include/sfx2/sidebar/SidebarController.hxx |    6 +++++-
 sfx2/source/sidebar/SidebarController.cxx  |   12 ++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 3e27ba70ce212642026874ba73021930a06cdbbd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jan 31 14:29:18 2017 +0000

    Resolves: tdf#104884 print preview replaces the frame controller
    
    so the sidebar is listening to the old controller which has been disposed[1] so
    when print preview exits and yet another controller replaces the print preview
    one then the sidebar still doesn't listen to the current one.
    
    framework broadcasts COMPONENT_DETACHING/COMPONENT_REATTACHED around these
    changes, so if we listen to them we can keep attached to whatever is the
    current component
    
    [1] note that ContextChangeEventMultipler doesn't inform clients that the
    controller has been disposed, this remains unchanged here
    
    Change-Id: I141509d4a262307afd7dcfc3d77de6cdd6dbfa5f
    Reviewed-on: https://gerrit.libreoffice.org/33758
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx
index e648b2b..5832f21 100644
--- a/include/sfx2/sidebar/SidebarController.hxx
+++ b/include/sfx2/sidebar/SidebarController.hxx
@@ -45,7 +45,8 @@ typedef cppu::WeakComponentImplHelper <
     css::ui::XContextChangeEventListener,
     css::beans::XPropertyChangeListener,
     css::ui::XSidebar,
-    css::frame::XStatusListener
+    css::frame::XStatusListener,
+    css::frame::XFrameActionListener
     > SidebarControllerInterfaceBase;
 
 class SfxSplitWindow;
@@ -97,6 +98,9 @@ public:
     // frame::XStatusListener
     virtual void SAL_CALL statusChanged (const css::frame::FeatureStateEvent& rEvent) override;
 
+    // frame::XFrameActionListener
+    virtual void SAL_CALL frameAction (const css::frame::FrameActionEvent& rEvent) override;
+
     // ui::XSidebar
     virtual void SAL_CALL requestLayout() override;
 
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 4e275a5..4a6ec25 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -126,6 +126,7 @@ rtl::Reference<SidebarController> SidebarController::create(
         new SidebarController(pParentWindow, rxFrame));
 
     registerSidebarForFrame(instance.get(), rxFrame->getController());
+    rxFrame->addFrameActionListener(instance.get());
     // Listen for window events.
     instance->mpParentWindow->AddEventListener(LINK(instance.get(), SidebarController, WindowEventHandler));
 
@@ -236,6 +237,7 @@ void SAL_CALL SidebarController::disposing()
     if (!xController.is())
         xController = mxCurrentController;
 
+    mxFrame->removeFrameActionListener(this);
     unregisterSidebarForFrame(this, xController);
 
     if (mxReadOnlyModeDispatch.is())
@@ -1316,6 +1318,16 @@ void SidebarController::FadeIn()
         mpSplitWindow->FadeIn();
 }
 
+void SidebarController::frameAction(const css::frame::FrameActionEvent& rEvent)
+{
+    if (rEvent.Frame == mxFrame)
+    {
+        if (rEvent.Action == css::frame::FrameAction_COMPONENT_DETACHING)
+            unregisterSidebarForFrame(this, mxFrame->getController());
+        else if (rEvent.Action == css::frame::FrameAction_COMPONENT_REATTACHED)
+            registerSidebarForFrame(this, mxFrame->getController());
+    }
+}
 
 } } // end of namespace sfx2::sidebar