diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2020-11-05 13:23:57 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2020-11-05 17:43:53 +0100 |
| commit | 54daa022df46d07171201b3fe236cf3f5726e271 (patch) | |
| tree | a6d89a3ae08f5d1848566ae22b4caa76d593974b /sd | |
| parent | d64bd977a430182826252695f041a6ddd62e45ef (diff) | |
tdf#138011: Revert "tdf#137949 Fix table row heigths."
This reverts commit 7dc234fa57ca409d0db131c93abea738014b5e1f.
Reason for revert: introduced tdf#138011
Change-Id: I44229135878524557dee29a6976f9bb1cf42766b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105351
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/data/pptx/tablescale.pptx | bin | 44606 -> 0 bytes | |||
| -rw-r--r-- | sd/qa/unit/import-tests.cxx | 20 |
2 files changed, 1 insertions, 19 deletions
diff --git a/sd/qa/unit/data/pptx/tablescale.pptx b/sd/qa/unit/data/pptx/tablescale.pptx Binary files differdeleted file mode 100644 index c4d946e5c619..000000000000 --- a/sd/qa/unit/data/pptx/tablescale.pptx +++ /dev/null diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 6e6b08d2bad2..11cbbb4f98b7 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -1482,27 +1482,9 @@ void SdImportTest::testRowHeight() uno::Reference< css::table::XTableRows > xRows( xTable->getRows(), uno::UNO_SET_THROW); uno::Reference< beans::XPropertySet > xRefRow( xRows->getByIndex(0), uno::UNO_QUERY_THROW ); xRefRow->getPropertyValue( "Height" ) >>= nHeight; - CPPUNIT_ASSERT_EQUAL( sal_Int32(508), nHeight); + CPPUNIT_ASSERT_EQUAL( sal_Int32(507), nHeight); xDocShRef->DoClose(); - - sd::DrawDocShellRef xDocShRef2 = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tablescale.pptx"), PPTX ); - const SdrPage *pPage2 = GetPage( 1, xDocShRef2 ); - - sdr::table::SdrTableObj *pTableObj2 = dynamic_cast<sdr::table::SdrTableObj*>(pPage2->GetObj(0)); - CPPUNIT_ASSERT( pTableObj2 ); - - uno::Reference< css::table::XTable > xTable2(pTableObj2->getTable(), uno::UNO_SET_THROW); - uno::Reference< css::table::XTableRows > xRows2( xTable2->getRows(), uno::UNO_SET_THROW); - - for(sal_Int32 nRow = 0; nRow < 7; ++nRow) - { - uno::Reference< beans::XPropertySet > xRefRow2( xRows2->getByIndex(nRow), uno::UNO_QUERY_THROW ); - xRefRow2->getPropertyValue( "Height" ) >>= nHeight; - CPPUNIT_ASSERT_EQUAL( sal_Int32(800), nHeight); - } - - xDocShRef2->DoClose(); } void SdImportTest::testTdf93830() |