diff options
| author | Noel Grandin <noel@peralex.com> | 2015-06-29 10:11:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-06-29 10:11:53 +0200 |
| commit | b55166d266f31caf7bd85e54a59c7e8b49204b16 (patch) | |
| tree | f4d98e90c214a6e588e2b4e22c05b9c0f44309aa /cppuhelper/qa | |
| parent | 39fd37f39db37a83c4a1491d68518e721b04fc5f (diff) | |
Revert "return and use std::vector from OInterfaceContainerHelper"
This reverts commit e57314f61f67b093510c5a8a8f34a62126ba8734.
Diffstat (limited to 'cppuhelper/qa')
| -rw-r--r-- | cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx index e98aab205adc..ff7c7925276c 100644 --- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx +++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx @@ -112,11 +112,12 @@ namespace cppu_ifcontainer pContainer->addInterface(xRef); aListeners.push_back(xRef); } - std::vector< Reference< XInterface > > aElements = pContainer->getElementsAsVector(); + Sequence< Reference< XInterface > > aElements; + aElements = pContainer->getElements(); CPPUNIT_ASSERT_MESSAGE("query contents", - (int)aElements.size() == nTests); - if ((int)aElements.size() == nTests) + (int)aElements.getLength() == nTests); + if ((int)aElements.getLength() == nTests) { for (i = 0; i < nTests; i++) { @@ -156,8 +157,8 @@ namespace cppu_ifcontainer pHelper = pContainer->getContainer(pTypes[i]); CPPUNIT_ASSERT_MESSAGE("no helper", pHelper != NULL); - std::vector<Reference< XInterface > > aSeq = pHelper->getElementsAsVector(); - CPPUNIT_ASSERT_MESSAGE("wrong num elements", aSeq.size() == 2); + Sequence<Reference< XInterface > > aSeq = pHelper->getElements(); + CPPUNIT_ASSERT_MESSAGE("wrong num elements", aSeq.getLength() == 2); CPPUNIT_ASSERT_MESSAGE("match", aSeq[0] == xRefs[i*2]); CPPUNIT_ASSERT_MESSAGE("match", aSeq[1] == xRefs[i*2+1]); } @@ -174,8 +175,8 @@ namespace cppu_ifcontainer pHelper = pContainer->getContainer(pTypes[i]); CPPUNIT_ASSERT_MESSAGE("no helper", pHelper != NULL); - std::vector<Reference< XInterface > > aSeq = pHelper->getElementsAsVector(); - CPPUNIT_ASSERT_MESSAGE("wrong num elements", aSeq.size() == 1); + Sequence<Reference< XInterface > > aSeq = pHelper->getElements(); + CPPUNIT_ASSERT_MESSAGE("wrong num elements", aSeq.getLength() == 1); CPPUNIT_ASSERT_MESSAGE("match", aSeq[0] == xRefs[i*2]); } @@ -190,8 +191,8 @@ namespace cppu_ifcontainer pHelper = pContainer->getContainer(pTypes[i]); CPPUNIT_ASSERT_MESSAGE("no helper", pHelper != NULL); - std::vector<Reference< XInterface > > aSeq = pHelper->getElementsAsVector(); - CPPUNIT_ASSERT_MESSAGE("wrong num elements", aSeq.size() == 0); + Sequence<Reference< XInterface > > aSeq = pHelper->getElements(); + CPPUNIT_ASSERT_MESSAGE("wrong num elements", aSeq.getLength() == 0); } delete pContainer; |