configure.ac | 2 - include/svl/IndexedStyleSheets.hxx | 1 include/svl/style.hxx | 1 svl/source/items/IndexedStyleSheets.cxx | 12 ---------- svl/source/items/style.cxx | 36 +++++++++++++------------------- 5 files changed, 16 insertions(+), 36 deletions(-)
New commits: commit a2e40875ae6c54397a89e09c5045e792ed7be776 Author: Andras Timar <[email protected]> AuthorDate: Wed Jun 5 16:42:47 2024 +0200 Commit: Andras Timar <[email protected]> CommitDate: Wed Jun 5 16:42:47 2024 +0200 Bump version to 24.04.3.3 Change-Id: If1c8b38fa5fc6412f52dd12b94e9070463d321d0 diff --git a/configure.ac b/configure.ac index 3bd2b84f34d3..03a5b68b6d9e 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[24.04.3.2],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[24.04.3.3],[],[],[https://collaboraoffice.com/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard commit 1316a84783f836eec4914b5db919c4d7bd8093d9 Author: Henry Castro <[email protected]> AuthorDate: Wed Jun 5 08:35:25 2024 -0400 Commit: Andras Timar <[email protected]> CommitDate: Wed Jun 5 16:42:09 2024 +0200 Revert "tdf#160706 speed up loading conditional formatting rule in XLS (II)" This reverts commit 13d39423a8bb70c08052fb02ef41cf3ea6f731d1. Unfortunately, it breaks copy/pasting slide. Change-Id: I1831aac9e672cf66dea658979e98855529b94b07 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168473 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/include/svl/IndexedStyleSheets.hxx b/include/svl/IndexedStyleSheets.hxx index c58a4b736703..910acd9e2566 100644 --- a/include/svl/IndexedStyleSheets.hxx +++ b/include/svl/IndexedStyleSheets.hxx @@ -144,7 +144,6 @@ public: void Clear(StyleSheetDisposer& cleanup); void Reindex(); - void ReindexOnNameChange(const OUString& rOldName, const OUString& rNewName); /** Warning: counting for n starts at 0, i.e., the 0th style sheet is the first that is found. */ SfxStyleSheetBase* GetNthStyleSheetThatMatchesPredicate(sal_Int32 n, diff --git a/include/svl/style.hxx b/include/svl/style.hxx index 87c5563ed547..fc12dc0be74e 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -275,7 +275,6 @@ public: virtual SfxStyleSheetBase* Find( const OUString&, SfxStyleFamily eFam, SfxStyleSearchBits n=SfxStyleSearchBits::All ); void Reindex(); - void ReindexOnNameChange(const OUString& rOldName, const OUString& rNewName); /** Add a style sheet. * Not an actual public function. Do not call it from non-subclasses. */ diff --git a/svl/source/items/IndexedStyleSheets.cxx b/svl/source/items/IndexedStyleSheets.cxx index 3761f0e427ef..57e2dddbf1c1 100644 --- a/svl/source/items/IndexedStyleSheets.cxx +++ b/svl/source/items/IndexedStyleSheets.cxx @@ -82,18 +82,6 @@ sal_Int32 IndexedStyleSheets::GetNumberOfStyleSheets() const return mStyleSheets.size(); } -void -IndexedStyleSheets::ReindexOnNameChange(const OUString& rOldName, const OUString& rNewName) -{ - auto it = mPositionsByName.find(rOldName); - if (it != mPositionsByName.end()) - { - unsigned nPos = it->second; - mPositionsByName.erase(it); - mPositionsByName.insert(std::make_pair(rNewName, nPos)); - } -} - void IndexedStyleSheets::AddStyleSheet(const rtl::Reference< SfxStyleSheetBase >& style) { diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index bfdbac6f3f93..41551e506498 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -163,24 +163,24 @@ bool SfxStyleSheetBase::SetName(const OUString& rName, bool bReIndexNow) if(rName.isEmpty()) return false; - if( aName == rName ) - return true; - - OUString aOldName = aName; - SfxStyleSheetBase *pOther = m_pPool->Find( rName, nFamily ) ; - if ( pOther && pOther != this ) - return false; + if( aName != rName ) + { + OUString aOldName = aName; + SfxStyleSheetBase *pOther = m_pPool->Find( rName, nFamily ) ; + if ( pOther && pOther != this ) + return false; - if ( !aName.isEmpty() ) - m_pPool->ChangeParent(aName, rName, nFamily, false); + if ( !aName.isEmpty() ) + m_pPool->ChangeParent(aName, rName, nFamily, false); - if ( aFollow == aName ) - aFollow = rName; - aName = rName; - if (bReIndexNow) - m_pPool->ReindexOnNameChange(aOldName, rName); + if ( aFollow == aName ) + aFollow = rName; + aName = rName; + if (bReIndexNow) + m_pPool->Reindex(); - m_pPool->Broadcast( SfxStyleSheetModifiedHint( aOldName, *this ) ); + m_pPool->Broadcast( SfxStyleSheetModifiedHint( aOldName, *this ) ); + } return true; } @@ -890,12 +890,6 @@ SfxStyleSheetBasePool::Reindex() pImpl->mxIndexedStyleSheets->Reindex(); } -void -SfxStyleSheetBasePool::ReindexOnNameChange(const OUString& rOldName, const OUString& rNewName) -{ - pImpl->mxIndexedStyleSheets->ReindexOnNameChange(rOldName, rNewName); -} - const svl::IndexedStyleSheets& SfxStyleSheetBasePool::GetIndexedStyleSheets() const {
