download.lst | 4 ++-- include/svl/hint.hxx | 2 -- sc/source/ui/app/inputwin.cxx | 3 +-- sc/source/ui/docshell/docfunc.cxx | 3 ++- sc/source/ui/undo/undotab.cxx | 7 +++++-- sc/source/ui/view/viewfun2.cxx | 1 + 6 files changed, 11 insertions(+), 9 deletions(-)
New commits: commit 39ccadeb16b1448a6e4ef6935c440ff713e7607b Author: Eike Rathke <er...@redhat.com> AuthorDate: Tue Sep 6 21:41:51 2022 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Thu Sep 8 12:54:42 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/+/139512 Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index f09e2d568ebe..33d07907bc3d 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 d823ebf4c2b6239d3f9bf717ae2bdf1b7472e875 Author: Eike Rathke <er...@redhat.com> AuthorDate: Mon Sep 5 20:31:05 2022 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Thu Sep 8 12:54:42 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/+/139433 Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> diff --git a/include/svl/hint.hxx b/include/svl/hint.hxx index ef1343a49fc8..a134fc17a076 100644 --- a/include/svl/hint.hxx +++ b/include/svl/hint.hxx @@ -73,7 +73,6 @@ enum class SfxHintId { ScDbAreasChanged, ScAreasChanged, ScTablesChanged, - ScTablesRenamed, ScDrawChanged, ScDocNameChanged, ScAreaLinksChanged, @@ -166,7 +165,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 34d72d49481a..1122efc5debe 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -2341,8 +2341,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 87306d7f7a9c..8bcb958f92db 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 c82da5271c4f..f09e2d568ebe 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(); commit 5022b709c7295f03e03dc6064cd347d79c7cf5e5 Author: Taichi Haradaguchi <20001...@ymail.ne.jp> AuthorDate: Tue Sep 6 14:42:20 2022 +0900 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Thu Sep 8 12:54:42 2022 +0200 upgrade openssl-1.1.1q Change-Id: I2317e734f074cf7301a6081cf3d2221beeaf5ad1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139497 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139498 diff --git a/download.lst b/download.lst index 0c0ab469de95..c386e478c5f9 100644 --- a/download.lst +++ b/download.lst @@ -226,8 +226,8 @@ export OFFICEOTRON_SHA256SUM := f2443f27561af52324eee03a1892d9f569adc8db9e7bca55 export OFFICEOTRON_JAR := 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar export OPENLDAP_SHA256SUM := 99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34 export OPENLDAP_TARBALL := openldap-2.4.59.tgz -export OPENSSL_SHA256SUM := 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 -export OPENSSL_TARBALL := openssl-1.1.1l.tar.gz +export OPENSSL_SHA256SUM := d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca +export OPENSSL_TARBALL := openssl-1.1.1q.tar.gz export ORCUS_SHA256SUM := 2a86c405a5929f749b27637509596421d46805753364ab258b035fd01fbde143 export ORCUS_TARBALL := liborcus-0.17.2.tar.bz2 export PAGEMAKER_SHA256SUM := 66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d commit 7b9068bb3c6c48c3fe9e8fe635d0f76902bd5834 Author: Eike Rathke <er...@redhat.com> AuthorDate: Mon Sep 5 20:06:56 2022 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Thu Sep 8 12:54:42 2022 +0200 Resolves: tdf#150307 Broadcast missing ScAreasChanged hint on sheet deletion ... and Undo. Change-Id: I59413d5470294c415c51e7d7ada9134f4173c872 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139450 Reviewed-by: Eike Rathke <er...@redhat.com> Tested-by: Jenkins (cherry picked from commit 0ff4a77f337237a5cad1d44390ff924af3992ff8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139432 Reviewed-by: Caolán McNamara <caol...@redhat.com> diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 46aeb7e2aa62..87306d7f7a9c 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -3407,6 +3407,7 @@ bool ScDocFunc::DeleteTable( SCTAB nTab, bool bRecord ) SfxApplication* pSfxApp = SfxGetpApp(); // Navigator pSfxApp->Broadcast( SfxHint( SfxHintId::ScTablesChanged ) ); + pSfxApp->Broadcast( SfxHint( SfxHintId::ScAreasChanged ) ); pSfxApp->Broadcast( SfxHint( SfxHintId::ScDbAreasChanged ) ); pSfxApp->Broadcast( SfxHint( SfxHintId::ScAreaLinksChanged ) ); diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index f2c9d55e555f..c82da5271c4f 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -366,6 +366,7 @@ void ScUndoDeleteTab::Undo() } SfxApplication* pSfxApp = SfxGetpApp(); // Navigator pSfxApp->Broadcast( SfxHint( SfxHintId::ScTablesChanged ) ); + pSfxApp->Broadcast( SfxHint( SfxHintId::ScAreasChanged ) ); pSfxApp->Broadcast( SfxHint( SfxHintId::ScDbAreasChanged ) ); pSfxApp->Broadcast( SfxHint( SfxHintId::ScAreaLinksChanged ) ); diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 9dfdd8dad075..d39405c9b89b 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -2600,6 +2600,7 @@ bool ScViewFunc::DeleteTables(const vector<SCTAB> &TheTabs, bool bRecord ) SfxApplication* pSfxApp = SfxGetpApp(); // Navigator pSfxApp->Broadcast( SfxHint( SfxHintId::ScTablesChanged ) ); + pSfxApp->Broadcast( SfxHint( SfxHintId::ScAreasChanged ) ); pSfxApp->Broadcast( SfxHint( SfxHintId::ScDbAreasChanged ) ); pSfxApp->Broadcast( SfxHint( SfxHintId::ScAreaLinksChanged ) ); }