summaryrefslogtreecommitdiff
path: root/testtools/source/bridgetest/bridgetest.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'testtools/source/bridgetest/bridgetest.cxx')
-rw-r--r--testtools/source/bridgetest/bridgetest.cxx14
1 files changed, 6 insertions, 8 deletions
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx
index 6228d9423411..bb1c3af497f2 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -56,6 +56,7 @@
#include "currentcontextchecker.hxx"
#include "multi.hxx"
#include <memory>
+#include <utility>
using namespace osl;
using namespace cppu;
@@ -381,7 +382,7 @@ static bool performTest(
bRet &= check(aData.Any == xI, "### unexpected any!");
bRet &= check(!(aData.Any != xI), "### unexpected any!");
aData.Sequence.realloc(2);
- aData.Sequence[0] = *static_cast<TestElement const *>(&aData);
+ aData.Sequence.getArray()[0] = *static_cast<TestElement const *>(&aData);
// aData.Sequence[1] is empty
// aSetData is a manually copy of aData for first setting:
TestData aSetData;
@@ -391,7 +392,7 @@ static bool performTest(
aData.Hyper, aData.UHyper, aData.Float, aData.Double, aData.Enum,
aData.String, aData.Byte2, aData.Short2, xI, Any(&xI, cppu::UnoType<XInterface>::get()));
aSetData.Sequence.realloc(2);
- aSetData.Sequence[0] = *static_cast<TestElement const *>(&aSetData);
+ aSetData.Sequence.getArray()[0] = *static_cast<TestElement const *>(&aSetData);
// aSetData.Sequence[1] is empty
xLBT->setValues(
aSetData.Bool,
@@ -462,9 +463,8 @@ static bool performTest(
aRet2));
// Check inout sequence order (=> inout sequence parameter was
// switched by test objects):
- TestElement temp(aRet.Sequence[0]);
- aRet.Sequence[0] = aRet.Sequence[1];
- aRet.Sequence[1] = temp;
+ auto pRetSequence = aRet.Sequence.getArray();
+ std::swap(pRetSequence[0], pRetSequence[1]);
bRet &= check(
equals(aData, aSV2ret) && equals(aData, aRet2),
"getValues2 test");
@@ -648,9 +648,7 @@ static bool performTest(
TestPolyStruct< sal_Int64 > tps1(12345);
xLBT->transportPolyHyper(tps1);
bRet &= check(tps1.member == 12345, "transportPolyHyper");
- Sequence< Any > seq(2);
- seq[0] <<= static_cast< sal_uInt32 >(33);
- seq[1] <<= OUString("ABC");
+ Sequence< Any > seq{ Any(static_cast< sal_uInt32 >(33)), Any(OUString("ABC")) };
TestPolyStruct< Sequence< Any > > tps2(seq);
TestPolyStruct< Sequence< Any > > tps3;
xLBT->transportPolySequence(tps2, tps3);