diff options
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/unoobj/fielduno.cxx | 66 |
1 files changed, 20 insertions, 46 deletions
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 94c29dcc50dd..b5ec70bdba6a 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -410,32 +410,19 @@ void SAL_CALL ScCellFieldsObj::refresh( ) if (mpRefreshListeners) { // Call all listeners. - uno::Sequence< uno::Reference< uno::XInterface > > aListeners(mpRefreshListeners->getElements()); - sal_uInt32 nLength(aListeners.getLength()); - if (nLength) + std::vector< uno::Reference< uno::XInterface > > aListeners(mpRefreshListeners->getElementsAsVector()); + if (!aListeners.empty()) { - const uno::Reference< uno::XInterface >* pInterfaces = aListeners.getConstArray(); - if (pInterfaces) + lang::EventObject aEvent; + aEvent.Source.set(uno::Reference< util::XRefreshable >(this)); + for (auto & x : aListeners) { - lang::EventObject aEvent; - aEvent.Source.set(uno::Reference< util::XRefreshable >(this)); - sal_uInt32 i(0); - while (i < nLength) + try + { + static_cast< util::XRefreshListener* >(x.get())->refreshed(aEvent); + } + catch(uno::RuntimeException&) { - try - { - while(i < nLength) - { - static_cast< util::XRefreshListener* >(pInterfaces->get())->refreshed(aEvent); - ++pInterfaces; - ++i; - } - } - catch(uno::RuntimeException&) - { - ++pInterfaces; - ++i; - } } } } @@ -590,32 +577,19 @@ void SAL_CALL ScHeaderFieldsObj::refresh( ) if (mpRefreshListeners) { // Call all listeners. - uno::Sequence< uno::Reference< uno::XInterface > > aListeners(mpRefreshListeners->getElements()); - sal_uInt32 nLength(aListeners.getLength()); - if (nLength) + std::vector< uno::Reference< uno::XInterface > > aListeners(mpRefreshListeners->getElementsAsVector()); + if (!aListeners.empty()) { - const uno::Reference< uno::XInterface >* pInterfaces = aListeners.getConstArray(); - if (pInterfaces) + lang::EventObject aEvent; + aEvent.Source.set(uno::Reference< util::XRefreshable >(this)); + for (auto & x : aListeners) { - lang::EventObject aEvent; - aEvent.Source.set(uno::Reference< util::XRefreshable >(this)); - sal_uInt32 i(0); - while (i < nLength) + try + { + static_cast< util::XRefreshListener* >(x.get())->refreshed(aEvent); + } + catch(uno::RuntimeException&) { - try - { - while(i < nLength) - { - static_cast< util::XRefreshListener* >(pInterfaces->get())->refreshed(aEvent); - ++pInterfaces; - ++i; - } - } - catch(uno::RuntimeException&) - { - ++pInterfaces; - ++i; - } } } } |