sw/source/filter/ww8/wrtw8nds.cxx | 2 +-
sw/source/filter/ww8/wrtww8.hxx | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 3ade281c1da91b7646a56227cffba8eb8818ea30
Author: Justin Luth <justin_l...@sil.org>
Date: Mon Oct 17 21:31:48 2016 +0300
tdf#103261 allow postponed text except in .doc
fixes regression from tdf#89317,
commit b39feae4f12b07a0fdb2c8c2a48d5aae613cd7c9.
Change-Id: I0590579997e2c29de171aac91ba4459e0c776cc0
Reviewed-on: https://gerrit.libreoffice.org/29984
Tested-by: Justin Luth <justin_l...@sil.org>
Reviewed-by: Justin Luth <justin_l...@sil.org>
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index 80a059d..491694c 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2176,7 +2176,7 @@ void MSWordExportBase::OutputTextNode( const SwTextNode&
rNode )
if( rNode.IsTextNode()
&& aStr != aStringForImage && !aStr.isEmpty()
&& !rNode.GetFlyFormat()
- && !IsInTable()
+ && !(IsInTable() && !AllowPostponedTextInTable())
&& aAttrIter.IsAnchorLinkedToThisNode(rNode.GetIndex()) )
{
bPostponeWritingText = true ;
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 35c08e1..c1dc4de 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -658,6 +658,9 @@ public:
/// If saving page break is preferred as a paragraph attribute (yes) or as
a special character (no).
virtual bool PreferPageBreakBefore() const = 0;
+ /// Text in tables can be postponed except for .doc
+ virtual bool AllowPostponedTextInTable() const { return true; }
+
/// Guess the script (asian/western).
///
/// Sadly word does not have two different sizes for asian font size and
@@ -969,6 +972,8 @@ public:
virtual bool PreferPageBreakBefore() const override { return true; }
+ virtual bool AllowPostponedTextInTable() const override { return false; }
+
virtual bool SupportsOneColumnBreak() const override { return false; }
virtual bool FieldsQuoted() const override { return false; }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
