[Libreoffice-commits] .: sw/source

[Miklos Vajna]

 sw/source/filter/ww8/docxexportfilter.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 867eed75e6f3e742ac383b65659cc7e98fa1c83c
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Tue Jan 3 12:43:19 2012 +0100

    Related: fdo#37161 update layout (if present) before DOCX export

diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx
index 38faf1c..a780c5c 100644
--- a/sw/source/filter/ww8/docxexportfilter.cxx
+++ b/sw/source/filter/ww8/docxexportfilter.cxx
@@ -32,6 +32,7 @@
 #include "docxexport.hxx"
 
 #include <docsh.hxx>
+#include <editsh.hxx>
 #include <pam.hxx>
 #include <unotxdoc.hxx>
 
@@ -62,6 +63,12 @@ bool DocxExportFilter::exportDocument()
     if ( !pDoc )
         return false;
 
+    // update layout (if present), for SwWriteTable
+    ViewShell* pViewShell = NULL;
+    pDoc->GetEditShell(&pViewShell);
+    if (pViewShell != NULL)
+        pViewShell->CalcLayout();
+
     // get SwPaM*
     // FIXME so far we get SwPaM for the entire document; probably we should
     // be able to output just the selection as well - though no idea how to