diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-01-17 09:07:19 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-01-17 20:19:56 +0100 |
| commit | 00710aebdf339415f1fa2072ef6a76c8bb6a591a (patch) | |
| tree | 669200b5592fef733e62cfaaf044f11152c13e25 /sw | |
| parent | dca52ec998946d3e5213190d04cdf98bace50e2c (diff) | |
ofz#20169 Integer-overflow
runtime error: signed integer overflow: -2147478239 * 127 cannot be represented in type 'int'
72 points in an inch, TWentyInPoint TWIPs in a point,
1440 twips in an inch, 25.4 mm in an inch
Change-Id: I4ea1c524cd9a16ab6e58ccf2a19fb8e41d68ffe6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86955
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 2 | ||||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport8.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx index 6aeec25e80b6..a7803e1aad75 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx @@ -433,7 +433,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo69656, "Table_cell_auto_width_fdo69656.docx") { uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables( ), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(sal_Int32(8154), getProperty<sal_Int32>(xTables->getByIndex(0), "Width")); + CPPUNIT_ASSERT_EQUAL(sal_Int32(8153), getProperty<sal_Int32>(xTables->getByIndex(0), "Width")); } DECLARE_OOXMLEXPORT_TEST(testFloatingTablesAnchor, "floating-tables-anchor.docx") diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx index 8972bb3fddd0..0a575a103491 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx @@ -1022,7 +1022,7 @@ DECLARE_OOXMLEXPORT_TEST(testTableAutoColumnFixedSize2, "table-auto-column-fixed uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY); uno::Reference<text::XTextTable> xTextTable(xTables->getByIndex(0), uno::UNO_QUERY); // This was 17907, i.e. the sum of the width of the 3 cells (10152 twips each), which is too wide. - CPPUNIT_ASSERT_EQUAL(sal_Int32(16893), getProperty<sal_Int32>(xTextTable, "Width")); + CPPUNIT_ASSERT_EQUAL(sal_Int32(16891), getProperty<sal_Int32>(xTextTable, "Width")); } DECLARE_OOXMLEXPORT_TEST(testFdo46361, "fdo46361.docx") @@ -1068,7 +1068,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo66474, "fdo66474.docx") // The table width was too small, so the text in the second cell was unreadable: this was 1397. uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables( ), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(sal_Int32(10493), getProperty<sal_Int32>(xTables->getByIndex(0), "Width")); + CPPUNIT_ASSERT_EQUAL(sal_Int32(10492), getProperty<sal_Int32>(xTables->getByIndex(0), "Width")); } DECLARE_OOXMLEXPORT_TEST(testGroupshapeRotation, "groupshape-rotation.docx") |