diff options
| author | Steve Yin <steve_y@apache.org> | 2013-11-29 13:03:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-12-02 10:25:33 +0000 |
| commit | 76c549eb01dcb7b5bf28a271ce00e386f3d388ba (patch) | |
| tree | bb09874a25b3b29c52556228abdf4aafb9ca6515 /sw/source/ui/chrdlg | |
| parent | 84972949a3501003b0b6ad98f07f1b4ab83f3ca1 (diff) | |
Integrate branch of IAccessible2
Conflicts:
everything
Change-Id: I9619634ee1e60d449025c006803da29c1e9d14b3
Diffstat (limited to 'sw/source/ui/chrdlg')
| -rw-r--r-- | sw/source/ui/chrdlg/swuiccoll.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index 369f6c5fade7..d0d6091905bc 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -106,12 +106,15 @@ SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet) break; } - const SfxStyleFilter& rFilterList = pFamilyItem->GetFilterList(); - for( size_t i = 0; i < rFilterList.size(); ++i ) + if (pFamilyItem) { - m_pFilterLB->InsertEntry( rFilterList[ i ]->aName); - sal_uInt16* pFilter = new sal_uInt16(rFilterList[i]->nFlags); - m_pFilterLB->SetEntryData(i, pFilter); + const SfxStyleFilter& rFilterList = pFamilyItem->GetFilterList(); + for( size_t i = 0; i < rFilterList.size(); ++i ) + { + m_pFilterLB->InsertEntry( rFilterList[ i ]->aName); + sal_uInt16* pFilter = new sal_uInt16(rFilterList[i]->nFlags); + m_pFilterLB->SetEntryData(i, pFilter); + } } m_pFilterLB->SelectEntryPos(1); |