diff options
| author | Joseph Powers <jpowers27@cox.net> | 2011-02-10 07:22:02 -0800 |
|---|---|---|
| committer | Joseph Powers <jpowers27@cox.net> | 2011-02-10 07:22:02 -0800 |
| commit | 298b9df14ba23b43db3691d299191d01f3815fc3 (patch) | |
| tree | 72164bc97465a6f1c66866b1f584025b7b5b5c2d | |
| parent | 5aee848d35795e827eb0c909dc44fd08201244b2 (diff) | |
Remove DECLARE_LIST( PopupMenuRefList, uno::Reference< awt::XPopupMenu >* )
| -rw-r--r-- | toolkit/inc/toolkit/awt/vclxmenu.hxx | 6 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxmenu.cxx | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/toolkit/inc/toolkit/awt/vclxmenu.hxx b/toolkit/inc/toolkit/awt/vclxmenu.hxx index 0060d155a01c..ad41e04033f9 100644 --- a/toolkit/inc/toolkit/awt/vclxmenu.hxx +++ b/toolkit/inc/toolkit/awt/vclxmenu.hxx @@ -38,17 +38,19 @@ #include <cppuhelper/weak.hxx> #include <osl/mutex.hxx> -#include <tools/list.hxx> #include <tools/link.hxx> #include <toolkit/helper/listenermultiplexer.hxx> +#include <vector> class Menu; class MenuBar; class VclSimpleEvent; class PopupMenu; -DECLARE_LIST( PopupMenuRefList, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >* ) +typedef ::std::vector< + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >* +> PopupMenuRefList; // ---------------------------------------------------- // class VCLXMenu diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx index 6e1e036fe8e7..8b02edcfd512 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -98,10 +98,8 @@ VCLXMenu::VCLXMenu( Menu* pMenu ) : maMenuListeners( *this ) VCLXMenu::~VCLXMenu() { DBG_DTOR( VCLXMenu, 0 ); - for ( sal_uInt32 n = maPopupMenueRefs.Count(); n; ) - { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > * pRef = maPopupMenueRefs.GetObject( --n ); - delete pRef; + for ( size_t n = maPopupMenueRefs.size(); n; ) { + delete maPopupMenueRefs[ --n ]; } if ( mpMenu ) { @@ -515,7 +513,7 @@ void VCLXMenu::setPopupMenu( sal_Int16 nItemId, const ::com::sun::star::uno::Ref // Selbst eine Ref halten! ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > * pNewRef = new ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > ; *pNewRef = rxPopupMenu; - maPopupMenueRefs.Insert( pNewRef, LIST_APPEND ); + maPopupMenueRefs.push_back( pNewRef ); mpMenu->SetPopupMenu( nItemId, (PopupMenu*) pVCLMenu->GetMenu() ); } @@ -530,9 +528,9 @@ void VCLXMenu::setPopupMenu( sal_Int16 nItemId, const ::com::sun::star::uno::Ref Menu* pMenu = mpMenu ? mpMenu->GetPopupMenu( nItemId ) : NULL; if ( pMenu ) { - for ( sal_uInt32 n = maPopupMenueRefs.Count(); n; ) + for ( size_t n = maPopupMenueRefs.size(); n; ) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > * pRef = maPopupMenueRefs.GetObject( --n ); + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > * pRef = maPopupMenueRefs[ --n ]; Menu* pM = ((VCLXMenu*)pRef->get())->GetMenu(); if ( pM == pMenu ) { |