diff options
| -rw-r--r-- | sd/qa/unit/data/pptx/tdf119015.pptx | bin | 0 -> 11652 bytes | |||
| -rw-r--r-- | sd/qa/unit/import-tests.cxx | 24 | ||||
| -rw-r--r-- | svx/source/table/cellcursor.cxx | 1 | ||||
| -rw-r--r-- | svx/source/table/tablecontroller.cxx | 1 |
4 files changed, 25 insertions, 1 deletions
diff --git a/sd/qa/unit/data/pptx/tdf119015.pptx b/sd/qa/unit/data/pptx/tdf119015.pptx Binary files differnew file mode 100644 index 000000000000..8c2313ad9b27 --- /dev/null +++ b/sd/qa/unit/data/pptx/tdf119015.pptx diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index b9d7b21db3aa..0c7f4debfd99 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -187,6 +187,7 @@ public: bool checkPattern(sd::DrawDocShellRef const & rDocRef, int nShapeNumber, std::vector<sal_uInt8>& rExpected); void testPatternImport(); void testPptCrop(); + void testTdf119015(); CPPUNIT_TEST_SUITE(SdImportTest); @@ -268,6 +269,7 @@ public: CPPUNIT_TEST(testTdf77747); CPPUNIT_TEST(testTdf116266); CPPUNIT_TEST(testPptCrop); + CPPUNIT_TEST(testTdf119015); CPPUNIT_TEST_SUITE_END(); }; @@ -2533,6 +2535,28 @@ void SdImportTest::testTdf116266() CPPUNIT_ASSERT_EQUAL(size_t(1), rLinkManager->GetLinks().size()); } +void SdImportTest::testTdf119015() +{ + ::sd::DrawDocShellRef xDocShRef + = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf119015.pptx"), PPTX); + + const SdrPage* pPage = GetPage(1, xDocShRef); + + sdr::table::SdrTableObj* pTableObj = dynamic_cast<sdr::table::SdrTableObj*>(pPage->GetObj(0)); + CPPUNIT_ASSERT(pTableObj); + // The position was previously not properly initialized: (0, 0, 100, 100) + CPPUNIT_ASSERT_EQUAL(tools::Rectangle(Point(6991, 6902), Size(14099, 1999)), + pTableObj->GetLogicRect()); + uno::Reference<table::XTable> xTable(pTableObj->getTable()); + + // Test that we actually have three cells: this threw css.lang.IndexOutOfBoundsException + uno::Reference<text::XTextRange> xTextRange(xTable->getCellByPosition(2, 0), + uno::UNO_QUERY_THROW); + CPPUNIT_ASSERT_EQUAL(OUString("A3"), xTextRange->getString()); + + xDocShRef->DoClose(); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx index d77dbb3ffc59..bdd7156ef669 100644 --- a/svx/source/table/cellcursor.cxx +++ b/svx/source/table/cellcursor.cxx @@ -251,7 +251,6 @@ void SAL_CALL CellCursor::merge( ) try { mxTable->merge( aStart.mnCol, aStart.mnRow, aEnd.mnCol - aStart.mnCol + 1, aEnd.mnRow - aStart.mnRow + 1 ); - mxTable->optimize(); mxTable->setModified(true); } catch( Exception& ) diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 3241f2c7d304..cf73f2a37143 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -1821,6 +1821,7 @@ void SvxTableController::MergeRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, s } xRange->merge(); + mxTable->optimize(); mbHasJustMerged = true; setSelectedCells( maCursorFirstPos, maCursorFirstPos ); |