From 64d2019b2cab4a14408be15ef6c245a46a75dcb6 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 30 Jun 2017 22:56:18 +0200
Subject: PresenterSlideSorter::SetActiveState does nothing

...ever since d3ff78188fd08422586e7a884a31e185ecdde34c "INTEGRATION: CWS
presenterscreen"

Change-Id: Ideca940c514c60188040d5ebe75b95cc4f2b816b
---
 sdext/source/presenter/PresenterPaneContainer.cxx | 6 ------
 sdext/source/presenter/PresenterPaneContainer.hxx | 2 --
 sdext/source/presenter/PresenterSlideSorter.cxx   | 5 -----
 sdext/source/presenter/PresenterSlideSorter.hxx   | 2 --
 sdext/source/presenter/PresenterViewFactory.cxx   | 8 --------
 5 files changed, 23 deletions(-)

(limited to 'sdext')

diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx
index 91a520d688ca..e99c946ac73e 100644
--- a/sdext/source/presenter/PresenterPaneContainer.cxx
+++ b/sdext/source/presenter/PresenterPaneContainer.cxx
@@ -184,10 +184,6 @@ PresenterPaneContainer::SharedPaneDescriptor
             {
                 if (pDescriptor->maViewInitialization)
                     pDescriptor->maViewInitialization(rxView);
-
-                // Activate or deactivate the pane/view.
-                if (pDescriptor->maActivator)
-                    pDescriptor->maActivator(pDescriptor->mbIsActive);
             }
             catch (RuntimeException&)
             {
@@ -361,8 +357,6 @@ void SAL_CALL PresenterPaneContainer::disposing (
 void PresenterPaneContainer::PaneDescriptor::SetActivationState (const bool bIsActive)
 {
     mbIsActive = bIsActive;
-    if (maActivator)
-        maActivator(mbIsActive);
 }
 
 } } // end of namespace ::sdext::presenter
diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx
index ff8c9bf8b13e..e7e3ef948fef 100644
--- a/sdext/source/presenter/PresenterPaneContainer.hxx
+++ b/sdext/source/presenter/PresenterPaneContainer.hxx
@@ -78,7 +78,6 @@ public:
     class PaneDescriptor
     {
     public:
-        typedef ::std::function<void (bool)> Activator;
         typedef ::std::function<std::shared_ptr<PresenterSprite> ()> SpriteProvider;
         css::uno::Reference<css::drawing::framework::XResourceId> mxPaneId;
         OUString msViewURL;
@@ -95,7 +94,6 @@ public:
         bool mbIsOpaque;
         SpriteProvider maSpriteProvider;
         bool mbIsSprite;
-        Activator maActivator;
         css::awt::Point maCalloutAnchorLocation;
 
         void SetActivationState (const bool bIsActive);
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index 56405880ad17..5d457f82a7b7 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -417,11 +417,6 @@ void SAL_CALL PresenterSlideSorter::disposing()
     }
 }
 
-void PresenterSlideSorter::SetActiveState (const bool bIsActive)
-{
-    (void)bIsActive;
-}
-
 //----- lang::XEventListener --------------------------------------------------
 
 void SAL_CALL PresenterSlideSorter::disposing (const lang::EventObject& rEventObject)
diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx
index f9da7896a2e7..24010e38e88a 100644
--- a/sdext/source/presenter/PresenterSlideSorter.hxx
+++ b/sdext/source/presenter/PresenterSlideSorter.hxx
@@ -73,8 +73,6 @@ public:
 
     virtual void SAL_CALL disposing() override;
 
-    static void SetActiveState (const bool bIsActive);
-
     // lang::XEventListener
 
     virtual void SAL_CALL
diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx
index 3d15993e8614..1e5b1a304e09 100644
--- a/sdext/source/presenter/PresenterViewFactory.cxx
+++ b/sdext/source/presenter/PresenterViewFactory.cxx
@@ -480,14 +480,6 @@ Reference<XView> PresenterViewFactory::CreateSlideSorterView(
                 rxViewId,
                 Reference<frame::XController>(mxControllerWeak),
                 mpPresenterController));
-        PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
-            mpPresenterController->GetPaneContainer()->FindPaneId(rxViewId->getAnchor()));
-        if (pDescriptor.get() != nullptr)
-        {
-            pDescriptor->maActivator = [] (bool const isActive) {
-                    return PresenterSlideSorter::SetActiveState(isActive);
-                };
-        }
         xView = pView.get();
     }
     catch (RuntimeException&)
-- 
cgit