summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8/wrtww8.cxx
diff options
context:
space:
mode:
authorVinaya Mandke <vinaya.mandke@synerzip.com>2014-04-04 15:07:52 +0530
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-04-14 08:49:58 +0200
commitc1e563f6efd09cd3463f1b92a3022ae288c92087 (patch)
tree79b4290ea72ee188905702050566757c29a64c56 /sw/source/filter/ww8/wrtww8.cxx
parent8a3eeff238d97d9d5ae548193e32c8b00a22219e (diff)
fdo#76741 [DOCX] Table Alignment and width type
There are two issue related to table in the saved(exported) file - the table alignment in saved file is "left" instead of "center" - the table width type in properties is "auto" instead of "dxa" In the issue file alignment was specified in w:tblpXSpec="center" and so were missed at import. Added support to fetch HORI_ORIENT from frame properties if its not set in Table Properties The ::GetTablePageSize returns 0 if the table width is FIXED. Modified it to return the tableWidth in such case. Conflicts: writerfilter/source/dmapper/DomainMapperTableHandler.cxx Reviewed on: https://gerrit.libreoffice.org/8846 Change-Id: I02a3af5e9d8ef3746c4d6bec0a07a24e01cc12a4
Diffstat (limited to 'sw/source/filter/ww8/wrtww8.cxx')
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index fdb323c25eb1..c05aa512587d 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2382,6 +2382,11 @@ void AttributeOutputBase::GetTablePageSize( ww8::WW8TableNodeInfoInner * pTableT
nPageSize /= 100;
}
}
+ else
+ {
+ // As the table width is not relative, the TablePageSize equals its width
+ nPageSize = nTblSz;
+ }
rPageSize = nPageSize;
rRelBoxSize = bRelBoxSize;