diff options
author | Marco Cecchetti <mrcekets@gmail.com> | 2019-03-26 14:34:42 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2019-04-30 12:04:10 +0200 |
commit | 3fb298f673db169a38c1258d66ec24821386eb40 (patch) | |
tree | 44a726d3efbf607855f3a744c67028a3b258382e /sd | |
parent | a1f8bc9f610e7dd234d837202bfd24337d171fdc (diff) |
lok: writer: svg export transformed images
Change-Id: I908a6e01573c35c0641519f4995730af0b033c33
Diffstat (limited to 'sd')
-rw-r--r-- | sd/qa/unit/tiledrendering/tiledrendering.cxx | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index 1765db27be7d..1feb91f37efa 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -864,11 +864,11 @@ void SdTiledRenderingTest::testResizeTable() auto pTableObject = dynamic_cast<sdr::table::SdrTableObj*>(pObject); CPPUNIT_ASSERT(pTableObject); - SdrHdlList handleList(nullptr); - pObject->AddToHdlList(handleList); - CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(14), handleList.GetHdlCount()); - // Take the top left handle - SdrHdl* pHdl = handleList.GetHdl(0); + // Select the table by marking it + starting and ending text edit. + SdrView* pView = pViewShell->GetView(); + pView->MarkObj(pObject, pView->GetSdrPageView()); + pView->SdrBeginTextEdit(pObject); + pView->SdrEndTextEdit(); // Remember the original row heights. uno::Reference<table::XColumnRowRange> xTable(pTableObject->getTable(), uno::UNO_QUERY); @@ -879,14 +879,15 @@ void SdTiledRenderingTest::testResizeTable() sal_Int32 nExpectedRow2 = xRow2->getPropertyValue("Size").get<sal_Int32>(); // Resize the upper row, decrease its height by 1 cm. - pXImpressDocument->setGraphicSelection(LOK_SETGRAPHICSELECTION_START, convertMm100ToTwip(pHdl->GetPos().getX()), convertMm100ToTwip(pHdl->GetPos().getY())); - pXImpressDocument->setGraphicSelection(LOK_SETGRAPHICSELECTION_END, convertMm100ToTwip(pHdl->GetPos().getX()), convertMm100ToTwip(pHdl->GetPos().getY() + 1000)); + Point aInnerRowEdge = pObject->GetSnapRect().Center(); + pXImpressDocument->setGraphicSelection(LOK_SETGRAPHICSELECTION_START, convertMm100ToTwip(aInnerRowEdge.getX()), convertMm100ToTwip(aInnerRowEdge.getY())); + pXImpressDocument->setGraphicSelection(LOK_SETGRAPHICSELECTION_END, convertMm100ToTwip(aInnerRowEdge.getX()), convertMm100ToTwip(aInnerRowEdge.getY() - 1000)); // Remember the resized row heights. sal_Int32 nResizedRow1 = xRow1->getPropertyValue("Size").get<sal_Int32>(); CPPUNIT_ASSERT(nResizedRow1 < nExpectedRow1); sal_Int32 nResizedRow2 = xRow2->getPropertyValue("Size").get<sal_Int32>(); - CPPUNIT_ASSERT(nResizedRow2 < nExpectedRow2); + CPPUNIT_ASSERT_EQUAL(nExpectedRow2, nResizedRow2); // Now undo the resize. pXImpressDocument->GetDocShell()->GetUndoManager()->Undo(); @@ -896,7 +897,7 @@ void SdTiledRenderingTest::testResizeTable() CPPUNIT_ASSERT_EQUAL(nExpectedRow1, nActualRow1); sal_Int32 nActualRow2 = xRow2->getPropertyValue("Size").get<sal_Int32>(); // Expected was 4000, actual was 4572, i.e. the second row after undo was larger than expected. - CPPUNIT_ASSERT_DOUBLES_EQUAL(nExpectedRow2, nActualRow2, 1.0); + CPPUNIT_ASSERT_EQUAL(nExpectedRow2, nActualRow2); comphelper::LibreOfficeKit::setActive(false); } @@ -911,11 +912,11 @@ void SdTiledRenderingTest::testResizeTableColumn() auto pTableObject = dynamic_cast<sdr::table::SdrTableObj*>(pObject); CPPUNIT_ASSERT(pTableObject); - SdrHdlList handleList(nullptr); - pObject->AddToHdlList(handleList); - CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(14), handleList.GetHdlCount()); - // Take the top left handle - SdrHdl* pHdl = handleList.GetHdl(0); + // Select the table by marking it + starting and ending text edit. + SdrView* pView = pViewShell->GetView(); + pView->MarkObj(pObject, pView->GetSdrPageView()); + pView->SdrBeginTextEdit(pObject); + pView->SdrEndTextEdit(); // Remember the original cell widths. xmlDocPtr pXmlDoc = parseXmlDump(); @@ -926,15 +927,16 @@ void SdTiledRenderingTest::testResizeTableColumn() pXmlDoc = nullptr; // Resize the left column, decrease its width by 1 cm. - pXImpressDocument->setGraphicSelection(LOK_SETGRAPHICSELECTION_START, convertMm100ToTwip(pHdl->GetPos().getX()), convertMm100ToTwip(pHdl->GetPos().getY())); - pXImpressDocument->setGraphicSelection(LOK_SETGRAPHICSELECTION_END, convertMm100ToTwip(pHdl->GetPos().getX() + 1000), convertMm100ToTwip(pHdl->GetPos().getY())); + Point aInnerRowEdge = pObject->GetSnapRect().Center(); + pXImpressDocument->setGraphicSelection(LOK_SETGRAPHICSELECTION_START, convertMm100ToTwip(aInnerRowEdge.getX()), convertMm100ToTwip(aInnerRowEdge.getY())); + pXImpressDocument->setGraphicSelection(LOK_SETGRAPHICSELECTION_END, convertMm100ToTwip(aInnerRowEdge.getX() - 1000), convertMm100ToTwip(aInnerRowEdge.getY())); // Remember the resized column widths. pXmlDoc = parseXmlDump(); sal_Int32 nResizedColumn1 = getXPath(pXmlDoc, aPrefix + "TableLayouter_Layout[1]", "size").toInt32(); CPPUNIT_ASSERT(nResizedColumn1 < nExpectedColumn1); sal_Int32 nResizedColumn2 = getXPath(pXmlDoc, aPrefix + "TableLayouter_Layout[2]", "size").toInt32(); - CPPUNIT_ASSERT(nResizedColumn2 < nExpectedColumn2); + CPPUNIT_ASSERT(nResizedColumn2 > nExpectedColumn2); xmlFreeDoc(pXmlDoc); pXmlDoc = nullptr; |