[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sd/source

[Jim Raykowski (via logerrit)]

 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx |    9 +++------
 sd/source/ui/view/drviewsb.cxx                         |    8 +++++---
 sd/source/ui/view/drviewsd.cxx                         |    3 ---
 3 files changed, 8 insertions(+), 12 deletions(-)

New commits:
commit f0ae7571b7f0d8b03f6c365d6c24ee69d973c781
Author:     Jim Raykowski <rayk...@gmail.com>
AuthorDate: Thu Dec 23 20:46:59 2021 -0900
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Dec 27 12:33:45 2021 +0100

    tdf#146003 tdf#106613 Draw: fix slide rename not updated in Navigator
    
    Change-Id: Iee2d34e3192e3f7875ab10f3e79e9dc1a2fb20b8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127397
    Tested-by: Jenkins
    Reviewed-by: Jim Raykowski <rayk...@gmail.com>
    (cherry picked from commit 9bfc42015acd6ae3475ab7927ccc006507cc38a2)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127486
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx 
b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 89d10e310725..8ade9b296462 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -1029,12 +1029,9 @@ bool SlotManager::RenameSlideFromDrawViewShell( 
sal_uInt16 nPageId, const OUStri
         pDocument->SetChanged();
 
         // inform navigator about change
-        SfxBoolItem aItem( SID_NAVIGATOR_INIT, true );
-        if (mrSlideSorter.GetViewShell() != nullptr)
-            mrSlideSorter.GetViewShell()->GetDispatcher()->ExecuteList(
-                SID_NAVIGATOR_INIT,
-                SfxCallMode::ASYNCHRON | SfxCallMode::RECORD,
-                { &aItem });
+        if (mrSlideSorter.GetViewShell() && 
mrSlideSorter.GetViewShell()->GetViewFrame())
+            
mrSlideSorter.GetViewShell()->GetViewFrame()->GetBindings().Invalidate(
+                        SID_NAVIGATOR_STATE, true);
     }
 
     return bSuccess;
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index 5bc741c91269..6f6bba8555d5 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -97,9 +97,11 @@ bool DrawViewShell::RenameSlide( sal_uInt16 nPageId, const 
OUString & rName  )
         GetDoc()->SetChanged();
 
         // inform navigator about change
-        SfxBoolItem aItem( SID_NAVIGATOR_INIT, true );
-        GetViewFrame()->GetDispatcher()->ExecuteList(SID_NAVIGATOR_INIT,
-                SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, { &aItem });
+        if (GetViewFrame())
+        {
+            SfxBindings& rBindings = GetViewFrame()->GetBindings();
+            rBindings.Invalidate(SID_NAVIGATOR_STATE, true);
+        }
 
         // Tell the slide sorter about the name change (necessary for
         // accessibility.)
diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx
index 763ae13eac91..0926e02990e5 100644
--- a/sd/source/ui/view/drviewsd.cxx
+++ b/sd/source/ui/view/drviewsd.cxx
@@ -61,9 +61,6 @@ void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq )
                 if( pNavWin )
                     pNavWin->InitTreeLB( GetDoc() );
             }
-            SfxBindings& rBindings = GetViewFrame()->GetBindings();
-            rBindings.Invalidate(SID_NAVIGATOR_STATE, true);
-            rBindings.Invalidate(SID_NAVIGATOR_PAGENAME, true);
         }
         break;