diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-05-05 10:57:59 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-05-05 13:41:03 +0200 |
| commit | a5bbbba632c6aecb8cf24d906b05f145dea1fc41 (patch) | |
| tree | e4ee31230a6247a4932b6840bfc33e3a6fb05de3 /sc | |
| parent | a46cf617e39be24f16d074c836d558eaa7f1f336 (diff) | |
make the family and mask explicit in SfxStyleSheetBasePool::First
Change-Id: I36655b65ca00e5f7b8779a28d4a1778c8e35dc4e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93461
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/stlpool.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/html/htmlexp.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/docshell/docsh6.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx index eda1f25551ef..8f38c8846da2 100644 --- a/sc/source/core/data/stlpool.cxx +++ b/sc/source/core/data/stlpool.cxx @@ -422,7 +422,7 @@ ScStyleSheet* ScStyleSheetPool::FindCaseIns( const OUString& rName, SfxStyleFami void ScStyleSheetPool::setAllStandard() { - SfxStyleSheetBase* pSheet = First(); + SfxStyleSheetBase* pSheet = First(GetSearchFamily(), GetSearchMask()); while (pSheet) { pSheet->SetMask(SfxStyleSearchBits::ScStandard); diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 2b362fd1cf45..136941bd3965 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -444,7 +444,7 @@ const SfxItemSet& ScHTMLExport::PageDefaults( SCTAB nTab ) SfxStyleFamily::Para ); OSL_ENSURE( pStyleSheet, "ParaStyle not found! :-(" ); if (!pStyleSheet) - pStyleSheet = pStylePool->First(); + pStyleSheet = pStylePool->First(SfxStyleFamily::Para); const SfxItemSet& rSetPara = pStyleSheet->GetItemSet(); aHTMLStyle.nDefaultScriptType = ScGlobal::GetDefaultScriptType(); @@ -465,7 +465,7 @@ const SfxItemSet& ScHTMLExport::PageDefaults( SCTAB nTab ) pStyleSheet = pStylePool->Find( pDoc->GetPageStyle( nTab ), SfxStyleFamily::Page ); OSL_ENSURE( pStyleSheet, "PageStyle not found! :-(" ); if (!pStyleSheet) - pStyleSheet = pStylePool->First(); + pStyleSheet = pStylePool->First(SfxStyleFamily::Page); const SfxItemSet& rSet = pStyleSheet->GetItemSet(); if ( !aHTMLStyle.bInitialized ) { diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index 9cd7b72474d2..b5bc2303d0e9 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -205,7 +205,7 @@ SfxStyleSheetBasePool* ScDocShell::GetStyleSheetPool() static void lcl_AdjustPool( SfxStyleSheetBasePool* pStylePool ) { pStylePool->SetSearchMask(SfxStyleFamily::Page); - SfxStyleSheetBase *pStyle = pStylePool->First(); + SfxStyleSheetBase *pStyle = pStylePool->First(SfxStyleFamily::Page); while ( pStyle ) { SfxItemSet& rStyleSet = pStyle->GetItemSet(); |