From a5bbbba632c6aecb8cf24d906b05f145dea1fc41 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Tue, 5 May 2020 10:57:59 +0100
Subject: make the family and mask explicit in SfxStyleSheetBasePool::First
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I36655b65ca00e5f7b8779a28d4a1778c8e35dc4e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93461
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
 svl/source/items/style.cxx | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'svl')

diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index e0a722e42edb..be80f702e06c 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -479,7 +479,6 @@ SfxStyleSheetBase* SfxStyleSheetIterator::First()
     }
 }
 
-
 SfxStyleSheetBase* SfxStyleSheetIterator::Next()
 {
     SfxStyleSheetBase* retval = nullptr;
@@ -548,14 +547,10 @@ SfxStyleSearchBits SfxStyleSheetIterator::GetSearchMask() const
     return mask;
 }
 
-
-SfxStyleSheetIterator& SfxStyleSheetBasePool::GetIterator_Impl()
+SfxStyleSheetIterator& SfxStyleSheetBasePool::GetIterator_Impl(SfxStyleFamily eFamily, SfxStyleSearchBits eMask)
 {
-    if( !pImpl->pIter || (pImpl->pIter->GetSearchMask() != nMask) || (pImpl->pIter->GetSearchFamily() != nSearchFamily) )
-    {
-        pImpl->pIter = CreateIterator( nSearchFamily, nMask );
-    }
-
+    if (!pImpl->pIter || (pImpl->pIter->GetSearchMask() != eMask) || (pImpl->pIter->GetSearchFamily() != eFamily))
+        pImpl->pIter = CreateIterator(eFamily, eMask);
     return *pImpl->pIter;
 }
 
@@ -706,21 +701,22 @@ SfxStyleSheetBasePool& SfxStyleSheetBasePool::operator+=( const SfxStyleSheetBas
 }
 
 SfxStyleSheetBase* SfxStyleSheetBasePool::Find(const OUString& rName,
-                                               SfxStyleFamily eFam,
-                                               SfxStyleSearchBits mask)
+                                               SfxStyleFamily eFamily,
+                                               SfxStyleSearchBits eMask)
 {
-    SfxStyleSheetIterator aIter(this,eFam,mask);
+    SfxStyleSheetIterator aIter(this, eFamily, eMask);
     return aIter.Find(rName);
 }
 
-SfxStyleSheetBase* SfxStyleSheetBasePool::First()
+SfxStyleSheetBase* SfxStyleSheetBasePool::First(SfxStyleFamily eFamily, SfxStyleSearchBits eMask)
 {
-    return GetIterator_Impl().First();
+    return GetIterator_Impl(eFamily, eMask).First();
 }
 
 SfxStyleSheetBase* SfxStyleSheetBasePool::Next()
 {
-    return GetIterator_Impl().Next();
+    assert(pImpl->pIter && "Next called without a previous First");
+    return pImpl->pIter->Next();
 }
 
 void SfxStyleSheetBasePool::Remove( SfxStyleSheetBase* p )
@@ -811,7 +807,7 @@ void SfxStyleSheetBasePool::ChangeParent(const OUString& rOld,
 {
     const SfxStyleSearchBits nTmpMask = GetSearchMask();
     SetSearchMask(GetSearchFamily());
-    for( SfxStyleSheetBase* p = First(); p; p = Next() )
+    for( SfxStyleSheetBase* p = First(GetSearchFamily()); p; p = Next() )
     {
         if( p->GetParent() == rOld )
         {
-- 
cgit