diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-05-15 11:47:08 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-05-15 12:04:10 +0200 |
| commit | 335c264d508a9c73845b94483475435a0cebfe64 (patch) | |
| tree | 9e96f3b1e216744841d013b695ee3ce8a7eff5bf | |
| parent | 48e70ad8ad7e8ed11b2b6f511bb0cedd06ab2c98 (diff) | |
fdo#36876 WW8 filter: fix export of table margins
Actually no testcase, as the export bug does not affect our import
filter. The problem was that we wrote SPRM's, which are properties of
floating tables, so once the user edited the resulting document in Word
and imported it back to Writer, frames around tables got created. Fix
this by only writing floating table SPRM's for tables which are already
in a fly frame.
Regression from cbba191cf0fff148935f24d111cb124bd5a5328b.
Change-Id: Ifeae93100ca80dcde34fc79f69a91064d44ea8f4
| -rw-r--r-- | sw/source/filter/ww8/wrtww8.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index b3e652234e01..82233b4db553 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2158,7 +2158,9 @@ void WW8AttributeOutput::TableSpacing(ww8::WW8TableNodeInfoInner::Pointer_t pTab const SwTable * pTable = pTableTextNodeInfoInner->getTable(); const SwTableFmt * pTableFmt = pTable->GetTableFmt(); - if (pTableFmt != NULL) + // Writing these SPRM's will make the table a floating one, so only write + // them in case the table is already inside a frame. + if (pTableFmt != NULL /*&& pTable->GetTableNode()->GetFlyFmt()*/) { const SvxULSpaceItem & rUL = pTableFmt->GetULSpace(); |