Kaydet (Commit) e83c1f0e authored tarafından Miklos Vajna's avatar Miklos Vajna

tdf#120515 ODT filter: relax layout requirement before export

This reverts commit 343af46f (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 3ed8466b (EPUB export,
fixed layout: switch to a metafile-based approach, 2017-12-01) switched
to the better metafile-based approach.

Change-Id: Ie404e23db77b8ded1d29f42b6279a3cd06a574b5
Reviewed-on: https://gerrit.libreoffice.org/62924
Tested-by: Jenkins
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst b274e879
...@@ -127,11 +127,6 @@ ErrCode SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) ...@@ -127,11 +127,6 @@ ErrCode SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
if (!pDoc) if (!pDoc)
return ERR_SWG_WRITE_ERROR; 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| if( getExportFlags() & (SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::STYLES|
SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT)) SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT))
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment