include/svl/IndexedStyleSheets.hxx | 1 include/svl/style.hxx | 1 svl/source/items/IndexedStyleSheets.cxx | 12 ---------- svl/source/items/style.cxx | 36 +++++++++++++------------------- 4 files changed, 15 insertions(+), 35 deletions(-)
New commits: commit 7c08fe7168def858fb947f4a0b8b858d1aee4102 Author: Henry Castro <[email protected]> AuthorDate: Wed Jun 5 08:35:25 2024 -0400 Commit: Caolán McNamara <[email protected]> CommitDate: Wed Jun 5 15:53:23 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/+/168435 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 64cb723f3649..db265fc98340 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -280,7 +280,6 @@ public: const OUString &rParent); 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 a6e5b130adda..4f4ae926f461 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; } @@ -915,12 +915,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 {
