diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-10-22 20:44:00 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-22 20:45:00 +0100 |
| commit | 4cf1fcec634cee1080cc748539c07c23b1579de7 (patch) | |
| tree | 432f19b7489771b4052ad85f13cd2218c36e1739 /chart2 | |
| parent | 6ac3fb584409912d7a4e944a643bc9180bc03015 (diff) | |
fix 32bit builds
where for amusing windows historical reasons sal_Int32 is long and not int
Change-Id: Icb73408b6c8ef245bc809aebc8ffc9f28e57a1e5
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/qa/extras/chart2import.cxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index bff7e81a521b..c8137b9ac6ff 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -1137,34 +1137,34 @@ void Chart2ImportTest::testInternalDataProvider() { // Parse 42 array Reference<chart2::data::XDataSequence> xDataSeq = rxDataProvider->createDataSequenceByValueArray("values-y", "{42;42;42;42}"); Sequence<Any> xSequence = xDataSeq->getData(); - CPPUNIT_ASSERT_EQUAL(uno::Any(42), xSequence[0]); - CPPUNIT_ASSERT_EQUAL(uno::Any(42), xSequence[1]); - CPPUNIT_ASSERT_EQUAL(uno::Any(42), xSequence[2]); - CPPUNIT_ASSERT_EQUAL(uno::Any(42), xSequence[3]); + CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(42)), xSequence[0]); + CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(42)), xSequence[1]); + CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(42)), xSequence[2]); + CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(42)), xSequence[3]); // Parse empty first and last xDataSeq = rxDataProvider->createDataSequenceByValueArray("values-y", "{\"\";42;42;\"\"}"); xSequence = xDataSeq->getData(); - CPPUNIT_ASSERT_EQUAL(uno::Any(0), xSequence[0]); - CPPUNIT_ASSERT_EQUAL(uno::Any(42), xSequence[1]); - CPPUNIT_ASSERT_EQUAL(uno::Any(42), xSequence[2]); - CPPUNIT_ASSERT_EQUAL(uno::Any(0), xSequence[3]); + CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(0)), xSequence[0]); + CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(42)), xSequence[1]); + CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(42)), xSequence[2]); + CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(0)), xSequence[3]); // Parse empty middle xDataSeq = rxDataProvider->createDataSequenceByValueArray("values-y", "{42;\"\";\"\";42}"); xSequence = xDataSeq->getData(); - CPPUNIT_ASSERT_EQUAL(uno::Any(42), xSequence[0]); - CPPUNIT_ASSERT_EQUAL(uno::Any(0), xSequence[1]); - CPPUNIT_ASSERT_EQUAL(uno::Any(0), xSequence[2]); - CPPUNIT_ASSERT_EQUAL(uno::Any(42), xSequence[3]); + CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(42)), xSequence[0]); + CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(0)), xSequence[1]); + CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(0)), xSequence[2]); + CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(42)), xSequence[3]); // Parse mixed types, numeric only role xDataSeq = rxDataProvider->createDataSequenceByValueArray("values-y", "{42;\"hello\";0;\"world\"}"); xSequence = xDataSeq->getData(); - CPPUNIT_ASSERT_EQUAL(uno::Any(42), xSequence[0]); - CPPUNIT_ASSERT_EQUAL(uno::Any(0), xSequence[1]); - CPPUNIT_ASSERT_EQUAL(uno::Any(0), xSequence[2]); - CPPUNIT_ASSERT_EQUAL(uno::Any(0), xSequence[3]); + CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(42)), xSequence[0]); + CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(0)), xSequence[1]); + CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(0)), xSequence[2]); + CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(0)), xSequence[3]); // Parse mixed types, mixed role xDataSeq = rxDataProvider->createDataSequenceByValueArray("categories", "{42;\"hello\";0;\"world\"}"); |