diff options
Diffstat (limited to 'sfx2/source/dialog/mgetempl.cxx')
| -rw-r--r-- | sfx2/source/dialog/mgetempl.cxx | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index bc630affac..fa663e745e 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ // include --------------------------------------------------------------- -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <vcl/field.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> @@ -208,24 +207,23 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem aBaseFt.Disable(); aBaseLb.Disable(); } - USHORT nCount = pFamilies->Count(); - USHORT i; + size_t nCount = pFamilies->size(); + size_t i; for ( i = 0; i < nCount; ++i ) { - pItem = pFamilies->GetObject(i); + pItem = pFamilies->at( i ); if ( pItem->GetFamily() == pStyle->GetFamily() ) break; } - USHORT nStyleFilterIdx = 0xffff; - if ( i < nCount ) { + 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; @@ -234,11 +232,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 ); @@ -454,12 +451,9 @@ BOOL SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet ) // geht nur bei Benutzervorlagen #if OSL_DEBUG_LEVEL > 1 USHORT nIdx = (USHORT)(long)aFilterLb.GetEntryData( nFilterIdx ); - SfxFilterTupel* p; - p = pItem->GetFilterList().GetObject( nIdx ); + SfxFilterTupel* p = pItem->GetFilterList()[ nIdx ]; #endif - USHORT nMask = pItem->GetFilterList().GetObject( - (USHORT)(long)aFilterLb.GetEntryData( nFilterIdx ) )->nFlags | - SFXSTYLEBIT_USERDEF; + USHORT nMask = pItem->GetFilterList()[ (size_t)aFilterLb.GetEntryData( nFilterIdx ) ]->nFlags | SFXSTYLEBIT_USERDEF; pStyle->SetMask( nMask ); } if(aAutoCB.IsVisible() && @@ -680,3 +674,4 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) return nRet; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |