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

[Ashod Nakashian (via logerrit)]

 sd/inc/app.hrc                                         |    1 
 sd/sdi/SlideSorterController.sdi                       |    5 ++++
 sd/sdi/drviewsh.sdi                                    |    5 ++++
 sd/sdi/sdraw.sdi                                       |   18 +++++++++++++++++
 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx |   11 ++++++++++
 sd/source/ui/view/drviews2.cxx                         |    3 ++
 sfx2/source/sidebar/DeckLayouter.cxx                   |    1 
 sfx2/source/sidebar/SidebarController.cxx              |    1 
 8 files changed, 44 insertions(+), 1 deletion(-)

New commits:
commit 11b06f0e00fc21654384e2816842ab101e15010e
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sun Aug 26 22:11:43 2018 -0400
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Jul 25 12:18:58 2019 +0200

    sidebar: Add .uno:MasterSlidesPanel
    
    Change-Id: I578dc8b1f9c8df7f7cc9108c70d6fad8006871c6
    Reviewed-on: https://gerrit.libreoffice.org/73502
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 9445f47cd0a7..40424d73097f 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -229,6 +229,7 @@
 #define SID_BEFORE_OBJ                      (SID_SD_START+181)
     // FREE
 #define SID_CUSTOM_ANIMATION_PANEL          (SID_SD_START+183)
+#define SID_MASTER_SLIDES_PANEL             (SID_SD_START+184)
     // FREE
 // and even more...
 #define ID_VAL_ENDINTENS                    (SID_SD_START+197)
diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi
index 5937ba159cec..e9d1ae77d7b2 100644
--- a/sd/sdi/SlideSorterController.sdi
+++ b/sd/sdi/SlideSorterController.sdi
@@ -204,6 +204,11 @@ interface SlideSorterView
         ExecMethod = FuTemporary ;
         StateMethod = GetMenuState ;
     ]
+    SID_MASTER_SLIDES_PANEL // ole : no, status : ?
+    [
+        ExecMethod = FuTemporary ;
+        StateMethod = GetMenuState ;
+    ]
     SID_PRESENTATION_DLG
     [
         ExecMethod = FuTemporary ;
diff --git a/sd/sdi/drviewsh.sdi b/sd/sdi/drviewsh.sdi
index 7ee014de5f76..1139fc5790b5 100644
--- a/sd/sdi/drviewsh.sdi
+++ b/sd/sdi/drviewsh.sdi
@@ -57,6 +57,11 @@ interface ImpressEditView : DrawView
         ExecMethod = FuTemporary ;
         StateMethod = GetMenuState ;
     ]
+    SID_MASTER_SLIDES_PANEL // ole : no, status : ?
+    [
+        ExecMethod = FuTemporary ;
+        StateMethod = GetMenuState ;
+    ]
     SID_REHEARSE_TIMINGS // ole : no, status : ?
     [
         ExecMethod = FuSupport ;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index ad88ee8a09ab..ca7d5bed8ac1 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -3542,6 +3542,24 @@ SfxBoolItem SlideChangeWindow SID_SLIDE_TRANSITIONS_PANEL
     GroupId = SfxGroupId::Modify;
 ]
 
+SfxBoolItem MasterSlidesPanel SID_MASTER_SLIDES_PANEL
+
+[
+    AutoUpdate = TRUE,
+    FastCall = FALSE,
+    ReadOnlyDoc = FALSE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+
+
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    ToolBoxConfig = TRUE,
+    GroupId = SfxGroupId::Modify;
+]
+
 SfxVoidItem SlideMasterPage SID_SLIDE_MASTER_MODE
 ()
 [
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 17b4adeeb958..4c2af27c3a93 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -181,6 +181,17 @@ void SlotManager::FuTemporary (SfxRequest& rRequest)
             break;
         }
 
+        case SID_MASTER_SLIDES_PANEL:
+        {
+            // First make sure that the sidebar is visible
+            pShell->GetViewFrame()->ShowChildWindow(SID_SIDEBAR);
+            ::sfx2::sidebar::Sidebar::ShowPanel(
+                "SdAllMasterPagesPanel",
+                pShell->GetViewFrame()->GetFrame().GetFrameInterface());
+            rRequest.Ignore ();
+            break;
+        }
+
         case SID_PRESENTATION_DLG:
             FuSlideShowDlg::Create (
                 pShell,
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 11025537247f..3c70dc1596c6 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -3176,6 +3176,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
         break;
 
         case SID_SLIDE_TRANSITIONS_PANEL:
+        case SID_MASTER_SLIDES_PANEL:
         case SID_CUSTOM_ANIMATION_PANEL:
         case SID_GALLERY:
         {
@@ -3189,6 +3190,8 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                 panelId = "GalleryPanel";
             else if (nSId == SID_SLIDE_TRANSITIONS_PANEL)
                 panelId = "SdSlideTransitionPanel";
+            else if (nSId == SID_MASTER_SLIDES_PANEL)
+                panelId = "SdAllMasterPagesPanel";
 
             ::sfx2::sidebar::Sidebar::ShowPanel(
                 panelId,
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx
index a27f6f7847ca..591602ccf93a 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -169,6 +169,7 @@ tools::Rectangle LayoutPanels (
         nTotalPreferredHeight += rItem.maLayoutSize.Preferred;
     }
 
+
     if (nTotalMinimumHeight > nAvailableHeight
         && ! bShowVerticalScrollBar)
     {
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 6af46db78a86..e636f4cb30df 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -762,7 +762,6 @@ void SidebarController::SwitchToDeck (
         nDeckX = 0;
     }
 
-
     // Activate the deck and the new set of panels.
     mpCurrentDeck->setPosSizePixel(
         nDeckX,