[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - 2 commits - include/svl sc/source

[Eike Rathke (via logerrit)]

 include/svl/hint.hxx              |    2 --
 sc/source/ui/app/inputwin.cxx     |    3 +--
 sc/source/ui/docshell/docfunc.cxx |    2 +-
 sc/source/ui/undo/undotab.cxx     |    6 ++++--
 4 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 4f1670950e230eaaea7e3533134cb60fd7785195
Author:     Eike Rathke <er...@redhat.com>
AuthorDate: Tue Sep 6 21:41:51 2022 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Sep 7 08:23:05 2022 +0200

    Resolves: tdf#150829 Broadcast missing ScAreasChanged hint on sheet copy 
Undo
    
    Change-Id: I354b1e395079067cd4cc9299501b3936dea00cd8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139538
    Reviewed-by: Eike Rathke <er...@redhat.com>
    Tested-by: Jenkins
    (cherry picked from commit 922b79a0f5a9151a6870ba395abcac5b54055275)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139511
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index 8cb2dc10d21b..bf9379e788ab 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -601,7 +601,9 @@ void ScUndoCopyTab::DoChange() const
     if (pViewShell)
         pViewShell->SetTabNo((*mpOldTabs)[0],true);
 
-    SfxGetpApp()->Broadcast( SfxHint( SfxHintId::ScTablesChanged ) );    // 
Navigator
+    SfxApplication* pSfxApp = SfxGetpApp();                         // 
Navigator
+    pSfxApp->Broadcast( SfxHint( SfxHintId::ScTablesChanged ) );
+    pSfxApp->Broadcast( SfxHint( SfxHintId::ScAreasChanged ) );
 
     pDocShell->PostPaintGridAll();
     pDocShell->PostPaintExtras();
commit e677adf304f7a02d741eb6892e1d102538164ebc
Author:     Eike Rathke <er...@redhat.com>
AuthorDate: Mon Sep 5 20:31:05 2022 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Sep 7 08:22:45 2022 +0200

    Related: tdf#150307 Use SfxHintId::ScAreasChanged, tdf#137577 follow-up
    
    ... instead of ScTablesRenamed, as ScAreasChanged (confusingly
    named) was meant exactly for this and also updates the Navigator.
    
    Change-Id: I6d90b82e6d5121e69c1a40af369be36544ad1b3b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139453
    Reviewed-by: Eike Rathke <er...@redhat.com>
    Tested-by: Jenkins
    (cherry picked from commit 540a312af2f02108ea90f5d2a9f3bf573db622e5)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139431
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/include/svl/hint.hxx b/include/svl/hint.hxx
index 3db9889a53fb..ba26bf7e069a 100644
--- a/include/svl/hint.hxx
+++ b/include/svl/hint.hxx
@@ -72,7 +72,6 @@ enum class SfxHintId {
     ScDbAreasChanged,
     ScAreasChanged,
     ScTablesChanged,
-    ScTablesRenamed,
     ScDrawChanged,
     ScDocNameChanged,
     ScAreaLinksChanged,
@@ -165,7 +164,6 @@ inline std::basic_ostream<charT, traits> & operator <<(
     case SfxHintId::ScDbAreasChanged: return stream << "ScDbAreasChanged";
     case SfxHintId::ScAreasChanged: return stream << "ScAreasChanged";
     case SfxHintId::ScTablesChanged: return stream << "ScTablesChanged";
-    case SfxHintId::ScTablesRenamed: return stream << "ScTablesRenamed";
     case SfxHintId::ScDrawChanged: return stream << "ScDrawChanged";
     case SfxHintId::ScDocNameChanged: return stream << "ScDocNameChanged";
     case SfxHintId::ScAreaLinksChanged: return stream << "ScAreaLinksChanged";
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 5e28dd9c643e..739fe5c12965 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2369,8 +2369,7 @@ void ScPosWnd::Notify( SfxBroadcaster&, const SfxHint& 
rHint )
     else
     {
         const SfxHintId nHintId = rHint.GetId();
-        if (nHintId == SfxHintId::ScAreasChanged || nHintId == 
SfxHintId::ScNavigatorUpdateAll
-                || nHintId == SfxHintId::ScTablesRenamed)
+        if (nHintId == SfxHintId::ScAreasChanged || nHintId == 
SfxHintId::ScNavigatorUpdateAll)
             FillRangeNames();
     }
 }
diff --git a/sc/source/ui/docshell/docfunc.cxx 
b/sc/source/ui/docshell/docfunc.cxx
index d187570fec02..75284379769d 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -3524,7 +3524,7 @@ bool ScDocFunc::RenameTable( SCTAB nTab, const OUString& 
rName, bool bRecord, bo
         rDocShell.PostPaintExtras();
         aModificator.SetDocumentModified();
         SfxGetpApp()->Broadcast( SfxHint( SfxHintId::ScTablesChanged ) );
-        SfxGetpApp()->Broadcast( SfxHint( SfxHintId::ScTablesRenamed ) );
+        SfxGetpApp()->Broadcast( SfxHint( SfxHintId::ScAreasChanged ) );
 
         bSuccess = true;
     }
diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index 0fab08ecfd3d..8cb2dc10d21b 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -437,7 +437,7 @@ void ScUndoRenameTab::DoChange( SCTAB nTabP, const 
OUString& rName ) const
     rDoc.RenameTab( nTabP, rName );
 
     SfxGetpApp()->Broadcast( SfxHint( SfxHintId::ScTablesChanged ) );    // 
Navigator
-    SfxGetpApp()->Broadcast( SfxHint( SfxHintId::ScTablesRenamed ) );    // 
Name Box
+    SfxGetpApp()->Broadcast( SfxHint( SfxHintId::ScAreasChanged ) );     // 
Also Name Box
 
     pDocShell->PostPaintGridAll();
     pDocShell->PostPaintExtras();