diff options
| author | Joseph Powers <jpowers27@cox.net> | 2011-01-02 07:54:57 -0800 |
|---|---|---|
| committer | Joseph Powers <jpowers27@cox.net> | 2011-01-02 07:54:57 -0800 |
| commit | 20b1f129a893d0ab85a22b1e98572418fa6da3ae (patch) | |
| tree | 42eda4cc3a2092c3662ec1f28965cd42425e4081 /sfx2/source/dialog/mgetempl.cxx | |
| parent | 4a956d892ad7f9fe7244862d1c5a54402773bc84 (diff) | |
Remove DECLARE_LIST(SfxStyleFilter, SfxFilterTupel*)
Diffstat (limited to 'sfx2/source/dialog/mgetempl.cxx')
| -rw-r--r-- | sfx2/source/dialog/mgetempl.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index e2baecd99c85..64fbb74a88e3 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -193,9 +193,9 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem aBaseFt.Disable(); aBaseLb.Disable(); } - USHORT nCount = pFamilies->Count(); - USHORT i; + size_t nCount = pFamilies->Count(); + size_t i; for ( i = 0; i < nCount; ++i ) { pItem = pFamilies->GetObject(i); @@ -209,7 +209,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem USHORT nStyleFilterIdx = 0xffff; // Filterflags const SfxStyleFilter& rList = pItem->GetFilterList(); - nCount = (USHORT)rList.Count(); + nCount = rList.size(); USHORT nIdx = 0; USHORT nMask = pStyle->GetMask() & ~SFXSTYLEBIT_USERDEF; @@ -218,11 +218,10 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem for ( i = 0; i < nCount; ++i ) { - SfxFilterTupel* pTupel = rList.GetObject(i); + SfxFilterTupel* pTupel = rList[ i ]; if ( pTupel->nFlags != SFXSTYLEBIT_AUTO && pTupel->nFlags != SFXSTYLEBIT_USED && -// pTupel->nFlags != SFXSTYLEBIT_USERDEF && pTupel->nFlags != SFXSTYLEBIT_ALL ) { aFilterLb.InsertEntry( pTupel->aName, nIdx ); @@ -441,9 +440,8 @@ BOOL SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet ) SfxFilterTupel* p; p = pItem->GetFilterList().GetObject( nIdx ); #endif - USHORT nMask = pItem->GetFilterList().GetObject( - (USHORT)(long)aFilterLb.GetEntryData( nFilterIdx ) )->nFlags | - SFXSTYLEBIT_USERDEF; + USHORT nMask = pItem->GetFilterList().at( + (size_t)aFilterLb.GetEntryData( nFilterIdx ) )->nFlags | SFXSTYLEBIT_USERDEF; pStyle->SetMask( nMask ); } if(aAutoCB.IsVisible() && |