summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2012-01-03 12:22:45 +0100
committerMiklos Vajna <vmiklos@frugalware.org>2012-01-03 12:30:55 +0100
commit99fccadd08d41e8a4abcc062d075886d4a0910be (patch)
tree484248268f44f763b8ca5843861fee33ce35db80
parent9460d62f91ef0ca78d09cb2be2f33fd4e131fd1c (diff)
fdo#37161 RTF: update layout (if present) before export
(cherry picked from commit 83fbebfea32b27cd722466607aa978244ac53575)
-rw-r--r--sw/source/filter/ww8/rtfexportfilter.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx b/sw/source/filter/ww8/rtfexportfilter.cxx
index 7c5969497865..257c43bbf918 100644
--- a/sw/source/filter/ww8/rtfexportfilter.cxx
+++ b/sw/source/filter/ww8/rtfexportfilter.cxx
@@ -31,6 +31,7 @@
#include <rtfexport.hxx>
#include <docsh.hxx>
+#include <editsh.hxx>
#include <unotxdoc.hxx>
#include <comphelper/mediadescriptor.hxx>
@@ -72,6 +73,12 @@ sal_Bool RtfExportFilter::filter( const uno::Sequence< beans::PropertyValue >& a
return sal_False;
}
+ // fdo#37161 - update layout (if present), for SwWriteTable
+ ViewShell* pViewShell = NULL;
+ pDoc->GetEditShell(&pViewShell);
+ if (pViewShell != NULL)
+ pViewShell->CalcLayout();
+
// get SwPaM*
// we get SwPaM for the entire document; copy&paste is handled internally, not via UNO
SwPaM aPam( pDoc->GetNodes().GetEndOfContent() );