From a01789ec7c2e65cd3737e180d42ea1c23c3a51bb Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 13 Jun 2012 14:18:39 +0200 Subject: Convert SV_DECL_PTRARR_DEL(BibToolBarListenerArr) to boost::ptr_vector Change-Id: I851a3ef2bda7f427f6562ed946c7889c97ad83a0 --- extensions/source/bibliography/toolbar.cxx | 10 ++++------ extensions/source/bibliography/toolbar.hxx | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'extensions') diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 152a41b23355..2db8f807108c 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -190,8 +190,6 @@ void BibTBEditListener::statusChanged(const frame::FeatureStateEvent& rEvt)throw } } -SV_IMPL_PTRARR( BibToolBarListenerArr, BibToolBarListenerPtr); - BibToolBar::BibToolBar(Window* pParent, Link aLink, WinBits nStyle): ToolBox(pParent,BibResId(RID_BIB_TOOLBAR)), aImgLst(BibResId( RID_TOOLBAR_IMGLIST )), @@ -299,9 +297,9 @@ void BibToolBar::InitListener() pListener=new BibToolBarListener(this,aURL.Complete,nId); } - BibToolBarListenerPtr pxInsert = new Reference; + BibToolBarListenerRef* pxInsert = new Reference; (*pxInsert) = pListener; - aListenerArr.Insert( pxInsert, aListenerArr.Count() ); + aListenerArr.push_back( pxInsert ); xDisp->addStatusListener(uno::Reference< frame::XStatusListener > (pListener),aURL); } } @@ -529,9 +527,9 @@ IMPL_LINK( BibToolBar, MenuHdl, ToolBox*, /*pToolbox*/) void BibToolBar::statusChanged(const frame::FeatureStateEvent& rEvent) throw( uno::RuntimeException ) { - for(sal_uInt16 i = 0; i < aListenerArr.Count(); i++) + for(sal_uInt16 i = 0; i < aListenerArr.size(); i++) { - BibToolBarListenerPtr pListener = aListenerArr.GetObject(i); + BibToolBarListenerRef* pListener = &aListenerArr[i]; (*pListener)->statusChanged(rEvent); } } diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index be2e95c09c8d..80cabc8f6e15 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -37,9 +37,9 @@ #include #include #include -#include #include #include // helper for implementations +#include class BibDataManager; class BibToolBar; @@ -110,8 +110,8 @@ public: }; -typedef ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener>* BibToolBarListenerPtr; -SV_DECL_PTRARR_DEL( BibToolBarListenerArr, BibToolBarListenerPtr, 4 ) +typedef ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener> BibToolBarListenerRef; +typedef boost::ptr_vector BibToolBarListenerArr; class BibToolBar: public ToolBox { -- cgit