summaryrefslogtreecommitdiff
path: root/sc/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui')
-rw-r--r--sc/source/ui/unoobj/cellsuno.cxx35
-rw-r--r--sc/source/ui/unoobj/chart2uno.cxx24
-rw-r--r--sc/source/ui/unoobj/dapiuno.cxx18
3 files changed, 38 insertions, 39 deletions
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index d33d8e47f5c0..0f7e3278e565 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -885,7 +885,6 @@ SC_SIMPLE_SERVICE_INFO( ScTableRowObj, "ScTableRowObj", "com.sun.star.table.Tabl
//------------------------------------------------------------------------
-SV_IMPL_PTRARR( XModifyListenerArr_Impl, XModifyListenerPtr );
SV_IMPL_PTRARR( ScNamedEntryArr_Impl, ScNamedEntryPtr );
//------------------------------------------------------------------------
@@ -1601,7 +1600,7 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
RefChanged();
// any change of the range address is broadcast to value (modify) listeners
- if ( aValueListeners.Count() )
+ if ( !aValueListeners.empty() )
bGotDataChangedHint = sal_True;
if ( pUndoRanges )
@@ -1618,16 +1617,16 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
ForgetCurrentAttrs();
pDocShell = NULL; // invalid
- if ( aValueListeners.Count() != 0 )
+ if ( !aValueListeners.empty() )
{
// dispose listeners
lang::EventObject aEvent;
aEvent.Source.set(static_cast<cppu::OWeakObject*>(this));
- for ( sal_uInt16 n=0; n<aValueListeners.Count(); n++ )
- (*aValueListeners[n])->disposing( aEvent );
+ for ( sal_uInt16 n=0; n<aValueListeners.size(); n++ )
+ aValueListeners[n]->disposing( aEvent );
- aValueListeners.DeleteAndDestroy( 0, aValueListeners.Count() );
+ aValueListeners.clear();
// The listeners can't have the last ref to this, as it's still held
// by the DocShell.
@@ -1654,8 +1653,8 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
// the EventObject holds a Ref to this object until after the listener calls
ScDocument* pDoc = pDocShell->GetDocument();
- for ( sal_uInt16 n=0; n<aValueListeners.Count(); n++ )
- pDoc->AddUnoListenerCall( *aValueListeners[n], aEvent );
+ for ( sal_uInt16 n=0; n<aValueListeners.size(); n++ )
+ pDoc->AddUnoListenerCall( aValueListeners[n], aEvent );
bGotDataChangedHint = false;
}
@@ -1665,7 +1664,7 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
// broadcast from DoHardRecalc - set bGotDataChangedHint
// (SFX_HINT_DATACHANGED follows separately)
- if ( aValueListeners.Count() )
+ if ( !aValueListeners.empty() )
bGotDataChangedHint = sal_True;
}
}
@@ -1679,7 +1678,7 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
aRanges = rUndoHint.GetRanges();
RefChanged();
- if ( aValueListeners.Count() )
+ if ( !aValueListeners.empty() )
bGotDataChangedHint = sal_True; // need to broadcast the undo, too
}
}
@@ -1689,7 +1688,7 @@ void ScCellRangesBase::RefChanged()
{
//! adjust XChartDataChangeEventListener
- if ( pValueListener && aValueListeners.Count() != 0 )
+ if ( pValueListener && !aValueListeners.empty() )
{
pValueListener->EndListeningAll();
@@ -3412,9 +3411,9 @@ void SAL_CALL ScCellRangesBase::addModifyListener( const uno::Reference<util::XM
uno::Reference<util::XModifyListener> *pObj =
new uno::Reference<util::XModifyListener>( aListener );
- aValueListeners.Insert( pObj, aValueListeners.Count() );
+ aValueListeners.push_back( pObj );
- if ( aValueListeners.Count() == 1 )
+ if ( aValueListeners.size() == 1 )
{
if (!pValueListener)
pValueListener = new ScLinkListener( LINK( this, ScCellRangesBase, ValueListenerHdl ) );
@@ -3437,15 +3436,15 @@ void SAL_CALL ScCellRangesBase::removeModifyListener( const uno::Reference<util:
acquire(); // in case the listeners have the last ref - released below
- sal_uInt16 nCount = aValueListeners.Count();
+ sal_uInt16 nCount = aValueListeners.size();
for ( sal_uInt16 n=nCount; n--; )
{
- uno::Reference<util::XModifyListener> *pObj = aValueListeners[n];
- if ( *pObj == aListener )
+ uno::Reference<util::XModifyListener>& rObj = aValueListeners[n];
+ if ( rObj == aListener )
{
- aValueListeners.DeleteAndDestroy( n );
+ aValueListeners.erase( aValueListeners.begin() + n );
- if ( aValueListeners.Count() == 0 )
+ if ( aValueListeners.empty() )
{
if (pValueListener)
pValueListener->EndListeningAll();
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 03028fcef702..35408afbfe05 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -2512,7 +2512,7 @@ ScChart2DataSequence::~ScChart2DataSequence()
void ScChart2DataSequence::RefChanged()
{
- if( m_pValueListener && m_aValueListeners.Count() != 0 )
+ if( m_pValueListener && !m_aValueListeners.empty() )
{
m_pValueListener->EndListeningAll();
@@ -2773,7 +2773,7 @@ void ScChart2DataSequence::UpdateTokensFromRanges(const ScRangeList& rRanges)
RefChanged();
// any change of the range address is broadcast to value (modify) listeners
- if ( m_aValueListeners.Count() )
+ if ( !m_aValueListeners.empty() )
m_bGotDataChangedHint = true;
}
@@ -2854,8 +2854,8 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint
if( m_pDocument )
{
- for ( sal_uInt16 n=0; n<m_aValueListeners.Count(); n++ )
- m_pDocument->AddUnoListenerCall( *m_aValueListeners[n], aEvent );
+ for ( sal_uInt16 n=0; n<m_aValueListeners.size(); n++ )
+ m_pDocument->AddUnoListenerCall( m_aValueListeners[n], aEvent );
}
m_bGotDataChangedHint = false;
@@ -2866,7 +2866,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint
// broadcast from DoHardRecalc - set m_bGotDataChangedHint
// (SFX_HINT_DATACHANGED follows separately)
- if ( m_aValueListeners.Count() )
+ if ( !m_aValueListeners.empty() )
m_bGotDataChangedHint = true;
}
}
@@ -3405,9 +3405,9 @@ void SAL_CALL ScChart2DataSequence::addModifyListener( const uno::Reference< uti
ScRefTokenHelper::getRangeListFromTokens(aRanges, *m_pTokens);
uno::Reference<util::XModifyListener> *pObj =
new uno::Reference<util::XModifyListener>( aListener );
- m_aValueListeners.Insert( pObj, m_aValueListeners.Count() );
+ m_aValueListeners.push_back( pObj );
- if ( m_aValueListeners.Count() == 1 )
+ if ( m_aValueListeners.size() == 1 )
{
if (!m_pValueListener)
m_pValueListener = new ScLinkListener( LINK( this, ScChart2DataSequence, ValueListenerHdl ) );
@@ -3446,15 +3446,15 @@ void SAL_CALL ScChart2DataSequence::removeModifyListener( const uno::Reference<
acquire(); // in case the listeners have the last ref - released below
- sal_uInt16 nCount = m_aValueListeners.Count();
+ sal_uInt16 nCount = m_aValueListeners.size();
for ( sal_uInt16 n=nCount; n--; )
{
- uno::Reference<util::XModifyListener> *pObj = m_aValueListeners[n];
- if ( *pObj == aListener )
+ uno::Reference<util::XModifyListener>& rObj = m_aValueListeners[n];
+ if ( rObj == aListener )
{
- m_aValueListeners.DeleteAndDestroy( n );
+ m_aValueListeners.erase( m_aValueListeners.begin() + n );
- if ( m_aValueListeners.Count() == 0 )
+ if ( m_aValueListeners.empty() )
{
if (m_pValueListener)
m_pValueListener->EndListeningAll();
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 6b424e21c48f..dab0786b61c5 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -1341,9 +1341,9 @@ void SAL_CALL ScDataPilotTableObj::addModifyListener( const uno::Reference<util:
SolarMutexGuard aGuard;
uno::Reference<util::XModifyListener> *pObj = new uno::Reference<util::XModifyListener>( aListener );
- aModifyListeners.Insert( pObj, aModifyListeners.Count() );
+ aModifyListeners.push_back( pObj );
- if ( aModifyListeners.Count() == 1 )
+ if ( aModifyListeners.size() == 1 )
{
acquire(); // don't lose this object (one ref for all listeners)
}
@@ -1356,15 +1356,15 @@ void SAL_CALL ScDataPilotTableObj::removeModifyListener( const uno::Reference<ut
acquire(); // in case the listeners have the last ref - released below
- sal_uInt16 nCount = aModifyListeners.Count();
+ sal_uInt16 nCount = aModifyListeners.size();
for ( sal_uInt16 n=nCount; n--; )
{
- uno::Reference<util::XModifyListener> *pObj = aModifyListeners[n];
- if ( *pObj == aListener )
+ uno::Reference<util::XModifyListener>& rObj = aModifyListeners[n];
+ if ( rObj == aListener )
{
- aModifyListeners.DeleteAndDestroy( n );
+ aModifyListeners.erase( aModifyListeners.begin() + n );
- if ( aModifyListeners.Count() == 0 )
+ if ( aModifyListeners.empty() )
{
release(); // release the ref for the listeners
}
@@ -1412,8 +1412,8 @@ void ScDataPilotTableObj::Refreshed_Impl()
// the EventObject holds a Ref to this object until after the listener calls
ScDocument* pDoc = GetDocShell()->GetDocument();
- for ( sal_uInt16 n=0; n<aModifyListeners.Count(); n++ )
- pDoc->AddUnoListenerCall( *aModifyListeners[n], aEvent );
+ for ( sal_uInt16 n=0; n<aModifyListeners.size(); n++ )
+ pDoc->AddUnoListenerCall( aModifyListeners[n], aEvent );
}
// ============================================================================
generated by cgit (git 2.34.1) at 2025-03-06 12:53:37 +0000