summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-07-17 15:25:54 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-07-17 17:05:13 +0200
commit28aa5b950a0db9242ce350704cd443c4c6a05fd5 (patch)
tree5a3339e16a836a00cfbf456cece8a83172723120
parenta61b903e33e6f2f1b881b83e4608b70677955999 (diff)
tdf#118448 style drop downs are static
regression from commit d70f53a8269be31f0412926afa5ba826faed6633 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: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 8548ea55946d..ceb04a541aae 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -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();
}
}
}