[Libreoffice-commits] .: cui/source
Joseph Powers
jpowers at kemper.freedesktop.org
Sat Jan 1 08:09:28 PST 2011
cui/source/tabpages/macroass.cxx | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit fc2990161c803ac82f15bb25ae6ab5e2c0d2302f
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sat Jan 1 08:09:16 2011 -0800
Remove DECLARE_LIST( _SfxEventNamesList, SfxEventName* )
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 94098f0..cf6cc6f 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -273,16 +273,16 @@ BOOL _SfxMacroTabPage::FillItemSet( SfxItemSet& rSet )
return FALSE;
}
-void _SfxMacroTabPage::PageCreated (SfxAllItemSet aSet)
+void _SfxMacroTabPage::PageCreated (SfxAllItemSet aSet)
{
const SfxPoolItem* pEventsItem;
if( !mpImpl->bGotEvents && SFX_ITEM_SET == aSet.GetItemState( SID_EVENTCONFIG, TRUE, &pEventsItem ) )
{
mpImpl->bGotEvents = TRUE;
const SfxEventNamesList& rList = ((SfxEventNamesItem*)pEventsItem)->GetEvents();
- for ( USHORT nNo = 0; nNo < rList.Count(); ++nNo )
+ for ( size_t nNo = 0, nCnt = rList.size(); nNo < nCnt; ++nNo )
{
- const SfxEventName *pOwn = rList.GetObject(nNo);
+ const SfxEventName *pOwn = rList.at(nNo);
AddEvent( pOwn->maUIName, pOwn->mnId );
}
}
@@ -299,9 +299,9 @@ void _SfxMacroTabPage::Reset( const SfxItemSet& rSet )
{
mpImpl->bGotEvents = TRUE;
const SfxEventNamesList& rList = ((SfxEventNamesItem*)pEventsItem)->GetEvents();
- for ( USHORT nNo = 0; nNo < rList.Count(); ++nNo )
+ for ( size_t nNo = 0, nCnt = rList.size(); nNo < nCnt; ++nNo )
{
- const SfxEventName *pOwn = rList.GetObject(nNo);
+ const SfxEventName *pOwn = rList.at(nNo);
AddEvent( pOwn->maUIName, pOwn->mnId );
}
}
More information about the Libreoffice-commits
mailing list