From a5bbbba632c6aecb8cf24d906b05f145dea1fc41 Mon Sep 17 00:00:00 2001 From: Caolán McNamara 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 --- svx/source/dialog/srchdlg.cxx | 4 ++-- svx/source/tbxctrls/tbcontrl.cxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'svx') diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 15204847d528..6e974372f80a 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -907,7 +907,7 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern ) m_xReplaceTmplLB->clear(); SfxStyleSheetBasePool* pStylePool = pShell->GetStyleSheetPool(); pStylePool->SetSearchMask( pSearchItem->GetFamily() ); - SfxStyleSheetBase* pBase = pStylePool->First(); + SfxStyleSheetBase* pBase = pStylePool->First(pSearchItem->GetFamily()); while ( pBase ) { @@ -1599,7 +1599,7 @@ void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool ) rPool.SetSearchMask( pSearchItem->GetFamily() ); m_xSearchTmplLB->freeze(); m_xReplaceTmplLB->freeze(); - SfxStyleSheetBase* pBase = rPool.First(); + SfxStyleSheetBase* pBase = rPool.First(pSearchItem->GetFamily()); while ( pBase ) { diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 89fce7fea547..883ddbf83143 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -972,7 +972,7 @@ void SvxStyleBox_Base::Select(bool bNonTravelSelect) { pPool->SetSearchMask( eStyleFamily ); - pStyle = pPool->First(); + pStyle = pPool->First(eStyleFamily); while ( pStyle && pStyle->GetName() != aSearchEntry ) pStyle = pPool->Next(); } @@ -1143,7 +1143,7 @@ void SvxStyleBox_Base::SetupEntry(vcl::RenderContext& rRenderContext, sal_Int32 { pPool->SetSearchMask( eStyleFamily ); - pStyle = pPool->First(); + pStyle = pPool->First(eStyleFamily); while (pStyle && pStyle->GetName() != rStyleName) pStyle = pPool->Next(); } -- cgit