diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-07-27 16:54:50 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-07-27 17:15:55 +0200 |
| commit | a1c081a7c213a56321b0b60651a1dbd63bcaec80 (patch) | |
| tree | 52d8070fc39e37d42f5d9c9a4c0147757859fab8 /sw/source/ui/fmtui | |
| parent | 21a4f5df04849a943764918147183ffba3710e87 (diff) | |
Revert "SfxStyleSheetBasePool: remove internal iterator"
This reverts commit 3a46d91f8de420f38dd763028e91229c846dff52.
This breaks the Stylist, not sure why (does it depend on something
setting the search flags before?) so revert for now.
Change-Id: Ia50feeebae8bf852c827e4f270e81e9f08d2b1ac
Diffstat (limited to 'sw/source/ui/fmtui')
| -rw-r--r-- | sw/source/ui/fmtui/tmpdlg.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index ca6da1fae5dc..af1c631843e9 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -420,14 +420,13 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) }//<-end ListBox & rBox = ((SwParagraphNumTabPage&)rPage).GetStyleBox(); SfxStyleSheetBasePool* pPool = pWrtShell->GetView().GetDocShell()->GetStyleSheetPool(); - SfxStyleSheetIterator iter(pPool, - SFX_STYLE_FAMILY_PSEUDO, SFXSTYLEBIT_ALL); - const SfxStyleSheetBase* pBase = iter.First(); + pPool->SetSearchMask(SFX_STYLE_FAMILY_PSEUDO, SFXSTYLEBIT_ALL); + const SfxStyleSheetBase* pBase = pPool->First(); std::set<String> aNames; while(pBase) { aNames.insert(pBase->GetName()); - pBase = iter.Next(); + pBase = pPool->Next(); } for(std::set<String>::const_iterator it = aNames.begin(); it != aNames.end(); ++it) rBox.InsertEntry(*it); @@ -489,13 +488,12 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { SfxStyleSheetBasePool* pStyleSheetPool = pWrtShell-> GetView().GetDocShell()->GetStyleSheetPool(); - SfxStyleSheetIterator iter(pStyleSheetPool, - SFX_STYLE_FAMILY_PARA, SFXSTYLEBIT_ALL); - SfxStyleSheetBase *pFirstStyle = iter.First(); + pStyleSheetPool->SetSearchMask(SFX_STYLE_FAMILY_PARA); + SfxStyleSheetBase *pFirstStyle = pStyleSheetPool->First(); while(pFirstStyle) { aList.push_back( pFirstStyle->GetName() ); - pFirstStyle = iter.Next(); + pFirstStyle = pStyleSheetPool->Next(); } } aSet.Put (SfxStringListItem(SID_COLLECT_LIST, &aList)); |