summaryrefslogtreecommitdiff
path: root/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-02-13 20:19:04 +0100
committerZolnai Tamás <tamas.zolnai@collabora.com>2014-02-13 20:19:49 +0100
commit5e5ec33eb4a4e10afd9c7ee7c269c2c18144d033 (patch)
treecf7c34a098f32051d851c1bf41aa6a3b7bda8e6c /writerfilter/source/dmapper/DomainMapperTableHandler.cxx
parent146d182a3e489d840c0d753666725ebe2c90368a (diff)
Revert "DOCX import: fix relative width of floating tables"
This reverts commit 7ff8414a411ae35e1fe56e9724646d0e94fa17f6, which was the result of a misunderstending.
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapperTableHandler.cxx')
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableHandler.cxx9
1 files changed, 3 insertions, 6 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 03be88dc4333..3bc66fac72d7 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -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)));