[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source

[Miklos Vajna]

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

New commits:
commit 99fccadd08d41e8a4abcc062d075886d4a0910be
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Tue Jan 3 12:22:45 2012 +0100

    fdo#37161 RTF: update layout (if present) before export
    
    (cherry picked from commit 83fbebfea32b27cd722466607aa978244ac53575)

diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx b/sw/source/filter/ww8/rtfexportfilter.cxx
index 7c59694..257c43b 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() );