[Libreoffice-commits] core.git: sd/source

Katarina Behrens Katarina.Behrens at cib.de
Tue Jul 12 21:02:28 UTC 2016


 sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx |    4 ----
 sd/source/ui/sidebar/MasterPagesSelector.cxx        |    2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 7f980b43a79168dec3172ea7b9abe52c6f354bc0
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Tue Jul 12 09:40:24 2016 +0200

    tdf#99107: Unify single click behaviour across panels
    
    Change-Id: Ib182f6caae61eda5f85d241ddb1499671df0a28b
    Reviewed-on: https://gerrit.libreoffice.org/27134
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    Tested-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index 6470397..232aedb 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -73,10 +73,6 @@ CurrentMasterPagesSelector::CurrentMasterPagesSelector (
     const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
     : MasterPagesSelector (pParent, rDocument, rBase, rpContainer, rxSidebar)
 {
-    // For this master page selector only we change the default action for
-    // left clicks.
-    mnDefaultClickAction = SID_TP_APPLY_TO_SELECTED_SLIDES;
-
     Link<sd::tools::EventMultiplexerEvent&,void> aLink (LINK(this,CurrentMasterPagesSelector,EventMultiplexerListener));
     rBase.GetEventMultiplexer()->AddEventListener(aLink,
         sd::tools::EventMultiplexerEvent::EID_CURRENT_PAGE
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index f04d113..db4a468 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -75,7 +75,7 @@ MasterPagesSelector::MasterPagesSelector (
       mpContainer(rpContainer),
       mrDocument(rDocument),
       mrBase(rBase),
-      mnDefaultClickAction(SID_TP_APPLY_TO_ALL_SLIDES),
+      mnDefaultClickAction(SID_TP_APPLY_TO_SELECTED_SLIDES),
       maCurrentItemList(),
       maTokenToValueSetIndex(),
       maLockedMasterPages(),


More information about the Libreoffice-commits mailing list