[Libreoffice-commits] core.git: sd/qa svx/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Jul 31 15:58:23 UTC 2018
sd/qa/unit/data/pptx/tdf119015.pptx |binary
sd/qa/unit/import-tests.cxx | 24 ++++++++++++++++++++++++
svx/source/table/cellcursor.cxx | 1 -
svx/source/table/tablecontroller.cxx | 1 +
4 files changed, 25 insertions(+), 1 deletion(-)
New commits:
commit d6f73641ff10286339562075e11c7cbb8e3d2b74
Author: Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Tue Jul 31 15:25:18 2018 +0300
Commit: Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Tue Jul 31 17:58:00 2018 +0200
tdf#119015: don't call TableModel::optimize in CellCursor::merge()
Better do that explicitly in the SvxTableController::MergeRange, so
that the UI-driven operation still optimizes the table, but import
code gets the initial column count, and not throw trying to access
the deleted column.
Change-Id: Ib4b4d716935ec2036ccb839c36f1be5b0cb878d5
Reviewed-on: https://gerrit.libreoffice.org/58359
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
diff --git a/sd/qa/unit/data/pptx/tdf119015.pptx b/sd/qa/unit/data/pptx/tdf119015.pptx
new file mode 100644
index 000000000000..8c2313ad9b27
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf119015.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 3159a7ed9ce8..2427b3dbdc20 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -188,6 +188,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);
@@ -269,6 +270,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 0b4378b7091c..b9c4e8dd23bb 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 );
More information about the Libreoffice-commits
mailing list