[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/source

[Libreoffice Gerrit user]

 sw/source/filter/xml/xmlexp.cxx |    5 -----
 1 file changed, 5 deletions(-)

New commits:
commit 8d2abb388b0a2423c9b7e1f52373e1b06dd9786f
Author:     Miklos Vajna <vmiklos at collabora.co.uk>
AuthorDate: Mon Nov 5 21:07:42 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Nov 12 13:10:06 2018 +0100

    tdf#120515 ODT filter: relax layout requirement before export
    
    This reverts commit 343af46fc301a984929e071d477b8fb9f211e289 (ODT
    filter: make sure we have a layout before export, 2017-11-29) as it
    causes a performance problem with large documents (see bugreport).
    
    I added it initially for the EPUB export, but there this is no longer
    needed as commit 3ed8466b55ace15a28761e06b6bb76ebd8758106 (EPUB export,
    fixed layout: switch to a metafile-based approach, 2017-12-01) switched
    to the better metafile-based approach.
    
    (cherry picked from commit e83c1f0ef999bdedaf9a5d5903aa5423c40f6d95)
    
    Change-Id: Ie404e23db77b8ded1d29f42b6279a3cd06a574b5
    Reviewed-on: https://gerrit.libreoffice.org/62963
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index eb13bc3db732..7537d13ffb34 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -128,11 +128,6 @@ ErrCode SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
     if (!pDoc)
         return ERR_SWG_WRITE_ERROR;
 
-    // Make sure the layout is available to have more stability in the output
-    // markup.
-    if (SwViewShell* pViewShell = pDoc->getIDocumentLayoutAccess().GetCurrentViewShell())
-        pViewShell->CalcLayout();
-
     if( getExportFlags() & (SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::STYLES|
                             SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT))
     {