commit 00e89430a2f8cd1f9ec702a7583a1e4c886a2b46
author Gülşah Köse <gulsah.kose@collabora.com> Thu Feb 21 01:24:31 2019 +0300
committer Andras Timar <andras.timar@collabora.com> Thu Feb 21 11:52:32 2019 +0100
tree 5e3cd4e67e1c0cb19f48ec7d05a571919f20e7ab
parent 4d32ad37b86200fe207dd1eda2bed11109b08d00

tdf#123090 unit test for handling gridSpan

Change-Id: Id2782a16d6118676b0638727b368e4628335e055
Signed-off-by: Gülşah Köse <gulsah.kose@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/68128
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>

sd/qa/unit/data/pptx/tdf123090.pptx

diff --git a/sd/qa/unit/data/pptx/tdf123090.pptx b/sd/qa/unit/data/pptx/tdf123090.pptx
new file mode 100644
index 0000000..c219f52
--- /dev/null
+++ b/sd/qa/unit/data/pptx/tdf123090.pptx
Binary files differ

sd/qa/unit/import-tests.cxx

diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index a085a1a..56f7a11 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -190,6 +190,7 @@ public:
    void testPatternImport();
    void testPptCrop();
    void testTdf119015();
    void testTdf123090();
    void testTdf120028();
    void testTdf120028b();
    void testTdf44223();
@@ -275,6 +276,7 @@ public:
    CPPUNIT_TEST(testTdf116266);
    CPPUNIT_TEST(testPptCrop);
    CPPUNIT_TEST(testTdf119015);
    CPPUNIT_TEST(testTdf123090);
    CPPUNIT_TEST(testTdf120028);
    CPPUNIT_TEST(testTdf120028b);
    CPPUNIT_TEST(testTdf44223);
@@ -2525,6 +2527,33 @@ void SdImportTest::testTdf119015()
    xDocShRef->DoClose();
}

void SdImportTest::testTdf123090()
{
    ::sd::DrawDocShellRef xDocShRef
        = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf123090.pptx"), PPTX);

    const SdrPage* pPage = GetPage(1, xDocShRef);

    sdr::table::SdrTableObj* pTableObj = dynamic_cast<sdr::table::SdrTableObj*>(pPage->GetObj(0));
    CPPUNIT_ASSERT(pTableObj);

    uno::Reference<table::XTable> xTable(pTableObj->getTable());

    // Test that we actually have two cells: this threw css.lang.IndexOutOfBoundsException
    uno::Reference<text::XTextRange> xTextRange(xTable->getCellByPosition(1, 0),
                                                uno::UNO_QUERY_THROW);
    CPPUNIT_ASSERT_EQUAL(OUString("aaa"), xTextRange->getString());

    sal_Int32 nWidth;
    const OUString sWidth("Width");
    uno::Reference< css::table::XTableColumns > xColumns( xTable->getColumns(), uno::UNO_QUERY_THROW);
    uno::Reference< beans::XPropertySet > xRefColumn( xColumns->getByIndex(1), uno::UNO_QUERY_THROW );
    xRefColumn->getPropertyValue( sWidth ) >>= nWidth;
    CPPUNIT_ASSERT_EQUAL( sal_Int32(9136), nWidth);

    xDocShRef->DoClose();
}

void SdImportTest::testTdf120028()
{
    // Check that the table shape has 4 columns.