summaryrefslogtreecommitdiff
path: root/embedserv
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2015-05-16 11:12:48 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-06-29 07:25:22 +0000
commite57314f61f67b093510c5a8a8f34a62126ba8734 (patch)
tree7991c3a6f20c93b752628528196022474c6b4a7f /embedserv
parent371200675c2fb2fef0ac8362ebd7bf4203835440 (diff)
return and use std::vector from OInterfaceContainerHelper
since most of the time we don’t need a heavyweight uno::Sequence. Adds a new method getElementsAsVector(). Change-Id: I9e72bef0c0c723ffd0dd7d4152db5baec6784a7a Reviewed-on: https://gerrit.libreoffice.org/15747 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'embedserv')
-rw-r--r--embedserv/source/embed/intercept.cxx12
1 files changed, 5 insertions, 7 deletions
diff --git a/embedserv/source/embed/intercept.cxx b/embedserv/source/embed/intercept.cxx
index 20dcfd116511..e335d122c6ae 100644
--- a/embedserv/source/embed/intercept.cxx
+++ b/embedserv/source/embed/intercept.cxx
@@ -218,10 +218,10 @@ void Interceptor::generateFeatureStateEvent()
cppu::OInterfaceContainerHelper* pICH =
m_pStatCL->getContainer(m_aInterceptedURL[i]);
- uno::Sequence<uno::Reference<uno::XInterface> > aSeq;
+ std::vector<uno::Reference<uno::XInterface> > aSeq;
if(pICH)
- aSeq = pICH->getElements();
- if(!aSeq.getLength())
+ aSeq = pICH->getElementsAsVector();
+ if(aSeq.empty())
continue;
frame::FeatureStateEvent aStateEvent;
@@ -249,13 +249,11 @@ void Interceptor::generateFeatureStateEvent()
}
- for(sal_Int32 k = 0; k < aSeq.getLength(); ++k)
+ for(uno::Reference<uno::XInterface> & x : aSeq)
{
- uno::Reference<frame::XStatusListener>
- Control(aSeq[k],uno::UNO_QUERY);
+ uno::Reference<frame::XStatusListener> Control(x,uno::UNO_QUERY);
if(Control.is())
Control->statusChanged(aStateEvent);
-
}
}
}