Kaydet (Commit) 28aa5b95 authored tarafından Noel Grandin's avatar Noel Grandin

tdf#118448 style drop downs are static

regression from
	commit d70f53a8
	tdf#100894 freeze when editing calc file with bazillions of cond
formatting

Change-Id: Ia2fcb254b5f1ce7cb0512566e2453bd527be3cd9
Reviewed-on: https://gerrit.libreoffice.org/57557
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst a61b903e
......@@ -2711,10 +2711,10 @@ void SvxStyleToolBoxControl::FillStyleBox()
SfxStyleSheetBase* pStyle = nullptr;
bool bDoFill = false;
SfxStyleSheetIterator aIter( pStyleSheetPool, eFamily, SfxStyleSearchBits::Used );
pStyleSheetPool->SetSearchMask( eFamily, SfxStyleSearchBits::Used );
// Check whether fill is necessary
pStyle = aIter.First();
pStyle = pStyleSheetPool->First();
//!!! TODO: This condition isn't right any longer, because we always show some default entries
//!!! so the list doesn't show the count
if ( nCount != pBox->GetEntryCount() )
......@@ -2727,7 +2727,7 @@ void SvxStyleToolBoxControl::FillStyleBox()
while ( pStyle && !bDoFill )
{
bDoFill = ( pBox->GetEntry(i) != pStyle->GetName() );
pStyle = aIter.Next();
pStyle = pStyleSheetPool->Next();
i++;
}
}
......@@ -2738,7 +2738,7 @@ void SvxStyleToolBoxControl::FillStyleBox()
pBox->Clear();
{
pStyle = aIter.First();
pStyle = pStyleSheetPool->Next();
if( pImpl->bSpecModeWriter || pImpl->bSpecModeCalc )
{
......@@ -2758,7 +2758,7 @@ void SvxStyleToolBoxControl::FillStyleBox()
if( bInsert )
pBox->InsertEntry( aName );
pStyle = aIter.Next();
pStyle = pStyleSheetPool->Next();
}
}
else
......@@ -2766,7 +2766,7 @@ void SvxStyleToolBoxControl::FillStyleBox()
while ( pStyle )
{
pBox->InsertEntry( pStyle->GetName() );
pStyle = aIter.Next();
pStyle = pStyleSheetPool->Next();
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment