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

[Emiliano Vavassori (via logerrit)]

 include/sfx2/sidebar/SidebarController.hxx |    1 -
 sfx2/source/sidebar/SidebarController.cxx  |    7 -------
 2 files changed, 8 deletions(-)

New commits:
commit 83c8f77225348bd2b620a5c937a6c5da1cea8b1d
Author:     Emiliano Vavassori <syntaxerrormmm at libreoffice.org>
AuthorDate: Tue Feb 4 11:16:33 2020 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Feb 4 14:18:15 2020 +0100

    Remove unused maAsynchronousDeckSwitch.
    
    Change-Id: Icad8aa0f6ff9897b08e057856b3af981b19532df
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87960
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Jenkins

diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx
index abc122faa709..66959b8a0d50 100644
--- a/include/sfx2/sidebar/SidebarController.hxx
+++ b/include/sfx2/sidebar/SidebarController.hxx
@@ -188,7 +188,6 @@ private:
     OUString msCurrentDeckId;
     AsynchronousCall maPropertyChangeForwarder;
     AsynchronousCall maContextChangeUpdate;
-    AsynchronousCall maAsynchronousDeckSwitch;
 
     /** Two flags control whether the deck is displayed or if only the
         tab bar remains visible.
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 9ce9193fa6f3..462b17051b06 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -138,7 +138,6 @@ SidebarController::SidebarController (
       msCurrentDeckId(gsDefaultDeckId),
       maPropertyChangeForwarder([this](){ return this->BroadcastPropertyChange(); }),
       maContextChangeUpdate([this](){ return this->UpdateConfigurations(); }),
-      maAsynchronousDeckSwitch(),
       mbIsDeckRequestedOpen(),
       mbIsDeckOpen(),
       mbFloatingDeckClosed(!pParentWindow->IsFloatingMode()),
@@ -304,8 +303,6 @@ void SAL_CALL SidebarController::disposing()
         static_cast<css::beans::XPropertyChangeListener*>(this));
 
     maContextChangeUpdate.CancelRequest();
-    maAsynchronousDeckSwitch.CancelRequest();
-
 }
 
 void SAL_CALL SidebarController::notifyContextChangeEvent (const css::ui::ContextChangeEventObject& rEvent)
@@ -321,7 +318,6 @@ void SAL_CALL SidebarController::notifyContextChangeEvent (const css::ui::Contex
     if (maRequestedContext != maCurrentContext)
     {
         mxCurrentController.set(rEvent.Source, css::uno::UNO_QUERY);
-        maAsynchronousDeckSwitch.CancelRequest();
         maContextChangeUpdate.RequestCall();
         // TODO: this call is redundant but mandatory for unit test to update context on document loading
         UpdateConfigurations();
@@ -353,7 +349,6 @@ void SAL_CALL SidebarController::statusChanged (const css::frame::FeatureStateEv
             SwitchToDefaultDeck();
 
         mnRequestedForceFlags |= SwitchFlag_ForceSwitch;
-        maAsynchronousDeckSwitch.CancelRequest();
         maContextChangeUpdate.RequestCall();
     }
 }
@@ -494,7 +489,6 @@ void SidebarController::SyncUpdate()
 {
     maPropertyChangeForwarder.Sync();
     maContextChangeUpdate.Sync();
-    maAsynchronousDeckSwitch.Sync();
 }
 
 void SidebarController::UpdateConfigurations()
@@ -1000,7 +994,6 @@ IMPL_LINK(SidebarController, WindowEventHandler, VclWindowEvent&, rEvent, void)
                 UpdateTitleBarIcons();
                 mpParentWindow->Invalidate();
                 mnRequestedForceFlags |= SwitchFlag_ForceNewDeck | SwitchFlag_ForceNewPanels;
-                maAsynchronousDeckSwitch.CancelRequest();
                 maContextChangeUpdate.RequestCall();
                 break;