Kaydet (Commit) 5e5ec33e authored tarafından Zolnai Tamás's avatar Zolnai Tamás

Revert "DOCX import: fix relative width of floating tables"

This reverts commit 7ff8414a,
which was the result of a misunderstending.
üst 146d182a
......@@ -1848,18 +1848,6 @@ DECLARE_OOXMLIMPORT_TEST(testFdo69656, "Table_cell_auto_width_fdo69656.docx")
uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables( ), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(sal_Int32(8154), getProperty<sal_Int32>(xTables->getByIndex(0), "Width"));
}
DECLARE_OOXMLIMPORT_TEST(testFloatingTableWithRelativeWidth, "floating-table-with-relative-width.docx")
{
// Floating tables are imported to text frames and the size is defined by the frame size.
// Width of the text frame including table was relative to the paragraph area and not to the page.
uno::Reference<text::XTextFramesSupplier> xTextFramesSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xFrame(xIndexAccess->getByIndex(0), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(sal_Int32(80), getProperty<sal_Int32>(xFrame, "RelativeWidth"));
CPPUNIT_ASSERT_EQUAL(sal_Int16(text::RelOrientation::PAGE_FRAME), getProperty<sal_Int16>(xFrame, "RelativeWidthRelation"));
}
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
......
......@@ -944,12 +944,9 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel)
}
else
{
aFrameProperties.realloc(aFrameProperties.getLength() + 2);
aFrameProperties[aFrameProperties.getLength() - 2].Name = "FrameWidthPercent";
aFrameProperties[aFrameProperties.getLength() - 2].Value = xTableProperties->getPropertyValue("RelativeWidth");
aFrameProperties[aFrameProperties.getLength() - 1].Name = "RelativeWidthRelation";
aFrameProperties[aFrameProperties.getLength() - 1].Value = uno::makeAny(text::RelOrientation::PAGE_FRAME);
aFrameProperties.realloc(aFrameProperties.getLength() + 1);
aFrameProperties[aFrameProperties.getLength() - 1].Name = "FrameWidthPercent";
aFrameProperties[aFrameProperties.getLength() - 1].Value = xTableProperties->getPropertyValue("RelativeWidth");
// Applying the relative width to the frame, needs to have the table width to be 100% of the frame width
xTableProperties->setPropertyValue("RelativeWidth", uno::makeAny(sal_Int16(100)));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment