diff options
| author | Justin Luth <justin_luth@sil.org> | 2016-12-22 09:00:42 +0300 |
|---|---|---|
| committer | Justin Luth <justin_luth@sil.org> | 2016-12-22 07:22:30 +0000 |
| commit | cc07f1c044b47e08b1fb0cab631be057b34ee1bc (patch) | |
| tree | b8c9798df46b6d507397c4cb48a89ae0ab36bfa6 | |
| parent | b1c145876007352a59f389126746c8ef0f660ee5 (diff) | |
fix tinderbox int to sal_Int32 conversion failure
note: template argument deduction/substitution failed:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx:737:186:
note: deduced conflicting types for parameter
‘const T’ (‘int’ and ‘sal_Int32 {aka long int}’)
CPPUNIT_ASSERT_EQUAL_MESSAGE("# of frames/shapes", 0, xDraws->getCount() );
Change-Id: I96d074a420ac16d9c5e3a3d200372289366039e9
Reviewed-on: https://gerrit.libreoffice.org/32325
Reviewed-by: Justin Luth <justin_luth@sil.org>
Tested-by: Justin Luth <justin_luth@sil.org>
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 2372307b3778..7fd1f0383f2d 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -730,11 +730,11 @@ DECLARE_OOXMLIMPORT_TEST(testTdf75573_lostTable, "tdf75573_lostTable.docx") { uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL_MESSAGE("# of tables", 1, xTables->getCount() ); + CPPUNIT_ASSERT_EQUAL_MESSAGE("# of tables", sal_Int32(1), xTables->getCount() ); uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL_MESSAGE("# of frames/shapes", 0, xDraws->getCount() ); + CPPUNIT_ASSERT_EQUAL_MESSAGE("# of frames/shapes", sal_Int32(0), xDraws->getCount() ); CPPUNIT_ASSERT_EQUAL_MESSAGE("# of paragraphs", 6, getParagraphs() ); |