mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert SV_DECL_PTRARR(SwEvtLstnrArray) to std::vector

Browse Source 
Change-Id: Ifd81de26432d2e7ceed1a643e3c2009e97f8a5b2
This commit is contained in:
Noel Grandin
2012-05-10 16:04:18 +02:00
committed by Michael Stahl
parent d61282d4a9
commit b16ce6e60f
4 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sw/inc/unoevtlstnr.hxx
View File

@@ -30,6 +30,7 @@
#include <svl/svarray.hxx> #include <svl/svarray.hxx>
#include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Reference.h>
#include <vector>
namespace com{namespace sun{namespace star{ namespace com{namespace sun{namespace star{
namespace lang namespace lang
@@ -41,7 +42,7 @@ namespace com{namespace sun{namespace star{
// Managing the EventListeners. // Managing the EventListeners.
typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > * XEventListenerPtr; typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > * XEventListenerPtr;
SV_DECL_PTRARR(SwEvtLstnrArray, XEventListenerPtr, 4) typedef std::vector<XEventListenerPtr> SwEvtLstnrArray;
class SwEventListenerContainer class SwEventListenerContainer
{ {

25
sw/source/core/unocore/unoevtlstnr.cxx
View File

@@ -37,8 +37,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang; using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
SV_IMPL_PTRARR(SwEvtLstnrArray, XEventListenerPtr);
SwEventListenerContainer::SwEventListenerContainer( uno::XInterface* _pxParent) : SwEventListenerContainer::SwEventListenerContainer( uno::XInterface* _pxParent) :
pListenerArr(0), pListenerArr(0),
pxParent(_pxParent) pxParent(_pxParent)
@@ -47,9 +45,11 @@ SwEventListenerContainer::SwEventListenerContainer( uno::XInterface* _pxParent)
SwEventListenerContainer::~SwEventListenerContainer() SwEventListenerContainer::~SwEventListenerContainer()
{ {
if(pListenerArr && pListenerArr->Count()) if(pListenerArr && !pListenerArr->empty())
{ {
pListenerArr->DeleteAndDestroy(0, pListenerArr->Count()); for(SwEvtLstnrArray::iterator it = pListenerArr->begin(); it != pListenerArr->end(); ++it)
delete *it;
pListenerArr->clear();
} }
delete pListenerArr; delete pListenerArr;
} }
@@ -60,7 +60,7 @@ void SwEventListenerContainer::AddListener(const uno::Reference< lang::XEvent
pListenerArr = new SwEvtLstnrArray; pListenerArr = new SwEvtLstnrArray;
uno::Reference< lang::XEventListener > * pInsert = new uno::Reference< lang::XEventListener > ; uno::Reference< lang::XEventListener > * pInsert = new uno::Reference< lang::XEventListener > ;
*pInsert = rxListener; *pInsert = rxListener;
pListenerArr->Insert(pInsert, pListenerArr->Count()); pListenerArr->push_back(pInsert);
} }
sal_Bool SwEventListenerContainer::RemoveListener(const uno::Reference< lang::XEventListener > & rxListener) sal_Bool SwEventListenerContainer::RemoveListener(const uno::Reference< lang::XEventListener > & rxListener)
@@ -70,13 +70,13 @@ sal_Bool SwEventListenerContainer::RemoveListener(const uno::Reference< lang:
else else
{ {
lang::XEventListener* pLeft = rxListener.get(); lang::XEventListener* pLeft = rxListener.get();
for(sal_uInt16 i = 0; i < pListenerArr->Count(); i++) for(sal_uInt16 i = 0; i < pListenerArr->size(); i++)
{ {
XEventListenerPtr pElem = pListenerArr->GetObject(i); XEventListenerPtr pElem = (*pListenerArr)[i];
lang::XEventListener* pRight = pElem->get(); lang::XEventListener* pRight = pElem->get();
if(pLeft == pRight) if(pLeft == pRight)
{ {
pListenerArr->Remove(i); pListenerArr->erase(pListenerArr->begin() + i);
delete pElem; delete pElem;
return sal_True; return sal_True;
} }
@@ -91,12 +91,13 @@ void SwEventListenerContainer::Disposing()
return; return;
lang::EventObject aObj(pxParent); lang::EventObject aObj(pxParent);
for(sal_uInt16 i = 0; i < pListenerArr->Count(); i++) for(sal_uInt16 i = 0; i < pListenerArr->size(); i++)
{ {
XEventListenerPtr pElem = pListenerArr->GetObject(i); XEventListenerPtr pElem = (*pListenerArr)[i];
(*pElem)->disposing(aObj); (*pElem)->disposing(aObj);
delete pElem;
} }
pListenerArr->DeleteAndDestroy(0, pListenerArr->Count()); pListenerArr->clear();
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
sw/source/core/unocore/unotbl.cxx
View File

@@ -5020,11 +5020,11 @@ void SwChartEventListenerContainer::ChartDataChanged()
aEvent.StartRow = 0; aEvent.StartRow = 0;
aEvent.EndRow = 1; aEvent.EndRow = 1;
for(sal_uInt16 i = 0; i < pListenerArr->Count(); i++) for(sal_uInt16 i = 0; i < pListenerArr->size(); i++)
{ {
try try
{ {
XEventListenerPtr pElem = pListenerArr->GetObject(i); XEventListenerPtr pElem = (*pListenerArr)[i];
uno::Reference<lang::XEventListener> xEventListener = *pElem; uno::Reference<lang::XEventListener> xEventListener = *pElem;
uno::Reference<chart::XChartDataChangeEventListener> xChartEventListener = (chart::XChartDataChangeEventListener*)(*pElem).get(); uno::Reference<chart::XChartDataChangeEventListener> xChartEventListener = (chart::XChartDataChangeEventListener*)(*pElem).get();
xChartEventListener->chartDataChanged( aEvent ); xChartEventListener->chartDataChanged( aEvent );

4
sw/source/ui/uno/RefreshListenerContainer.cxx
View File

@@ -49,9 +49,9 @@ void SwRefreshListenerContainer::Refreshed ()
return; return;
lang::EventObject aObj(pxParent); lang::EventObject aObj(pxParent);
for(sal_uInt16 i = 0, nEnd = pListenerArr->Count(); i < nEnd ; i++) for(sal_uInt16 i = 0, nEnd = pListenerArr->size(); i < nEnd ; i++)
{ {
Reference < XRefreshListener > xRefreshListener = Reference < XRefreshListener > ( *pListenerArr->GetObject(i), UNO_QUERY ); Reference < XRefreshListener > xRefreshListener = Reference < XRefreshListener > ( *(*pListenerArr)[i], UNO_QUERY );
xRefreshListener->refreshed(aObj); xRefreshListener->refreshed(aObj);
} }
} }