summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx2
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx5
2 files changed, 6 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 80a059d36eef..491694c8e9b1 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 35c08e1477f6..c1dc4de3791b 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; }