sw/source/filter/ww8/docxattributeoutput.cxx | 7 +++++++
1 file changed, 7 insertions(+)
New commits:
commit 2bcd3ed723463279f7f3e90966a5589e5b8592cf
Author: Serge Krot <serge.k...@cib.de>
AuthorDate: Tue Jan 14 16:03:08 2020 +0100
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Fri Jan 17 11:18:28 2020 +0100
tdf#126795 docx export: do not output tab stops twice
Change-Id: I70235df7fb73133f413863ee5eb7c76905a60248
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86767
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
(cherry picked from commit 264d27c94d7286a407b05a32f4097ac9d543e1a3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86896
Reviewed-by: Serge Krot (CIB) <serge.k...@cib.de>
(cherry picked from commit 6358fb7d3139a7b5ce0ea2394faa55ea1e2e4b6c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86954
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index d1eb890ddc62..eefacf9c7047 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -7824,6 +7824,13 @@ void DocxAttributeOutput::ParaTabStop( const
SvxTabStopItem& rTabStop )
return;
}
+ // do not output inherited tabs twice (inside styles and inside inline
properties)
+ if ( nCount == nInheritedTabCount && nCount > 0 )
+ {
+ if ( *pInheritedTabs == rTabStop )
+ return;
+ }
+
m_pSerializer->startElementNS(XML_w, XML_tabs);
// Get offset for tabs
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
