[PATCH libreoffice-4-0] fdo#36876 WW8 filter: fix export of table margins

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3915

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/15/3915/1

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.

(cherry picked from commits 335c264d508a9c73845b94483475435a0cebfe64 and
a935a154c3911b466a9b1c8da3c2cf0be2e0014d)

Change-Id: Ifeae93100ca80dcde34fc79f69a91064d44ea8f4
---
M sw/source/filter/ww8/wrtww8.cxx
1 file changed, 3 insertions(+), 1 deletion(-)



diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 269b913..2ee4569 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2121,7 +2121,9 @@
     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();
 

-- 
To view, visit https://gerrit.libreoffice.org/3915
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifeae93100ca80dcde34fc79f69a91064d44ea8f4
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Miklos Vajna <vmiklos@suse.cz>