diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-07-02 16:16:49 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-07-02 16:16:49 +0200 |
| commit | b5b4805f60f2a86adc1d76cc7d176830f1303c8e (patch) | |
| tree | 6f39e5701622202c97895bfb081fd4846259c7cc /toolkit | |
| parent | a8770e97294b4011e6986eba6d308373c06c19bb (diff) | |
| parent | 14eccc62b53e202cd9ed63442481922a320fc02e (diff) | |
Merge branch 'libreoffice-6-4'
into distro/lhm/libreoffice-6-4+backports
Conflicts:
writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/qa/cppunit/EventContainer.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toolkit/qa/cppunit/EventContainer.cxx b/toolkit/qa/cppunit/EventContainer.cxx index 300c8e5adb74..97a125c60824 100644 --- a/toolkit/qa/cppunit/EventContainer.cxx +++ b/toolkit/qa/cppunit/EventContainer.cxx @@ -70,7 +70,7 @@ CPPUNIT_TEST_FIXTURE(EventContainerTest, testInsertOrder) Sequence<OUString> aEventNames(xEvents->getElementNames()); sal_Int32 nEventCount = aEventNames.getLength(); - CPPUNIT_ASSERT_EQUAL(4, nEventCount); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(4), nEventCount); CPPUNIT_ASSERT_EQUAL(OUString("b"), aEventNames[0]); CPPUNIT_ASSERT_EQUAL(OUString("a"), aEventNames[1]); |