[Libreoffice-commits] core.git: writerperfect/source

Miklos Vajna vmiklos at collabora.co.uk
Mon Dec 4 08:09:42 UTC 2017


 writerperfect/source/writer/EPUBExportDialog.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 32fd735a6a30a8e552488f78a1577755a0e3db3d
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Dec 1 16:35:05 2017 +0100

    EPUB export, fixed layout always means "split at the end of the page"
    
    So disable split type on the UI, as it has no effect.
    
    Change-Id: Ia16e8050a732fce2f7881eee1b64e4487e843574
    Reviewed-on: https://gerrit.libreoffice.org/45691
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/writerperfect/source/writer/EPUBExportDialog.cxx b/writerperfect/source/writer/EPUBExportDialog.cxx
index 232ca4128fec..2d429abf657c 100644
--- a/writerperfect/source/writer/EPUBExportDialog.cxx
+++ b/writerperfect/source/writer/EPUBExportDialog.cxx
@@ -9,8 +9,11 @@
 
 #include "EPUBExportDialog.hxx"
 
+#include <libepubgen/libepubgen.h>
+
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/ui/dialogs/FolderPicker.hpp>
+#include <config_libepubgen.h>
 #include <sfx2/opengrf.hxx>
 
 #include "EPUBExportFilter.hxx"
@@ -147,6 +150,9 @@ IMPL_LINK_NOARG(EPUBExportDialog, LayoutSelectHdl, ListBox &, void)
     // No conversion, 1:1 mapping between entry positions and
     // libepubgen::EPUBLayoutMethod.
     mrFilterData["EPUBLayoutMethod"] <<= m_pLayout->GetSelectedEntryPos();
+#if LIBEPUBGEN_VERSION_SUPPORT
+    m_pSplit->Enable(m_pLayout->GetSelectedEntryPos() != libepubgen::EPUB_LAYOUT_METHOD_FIXED);
+#endif
 }
 
 IMPL_LINK_NOARG(EPUBExportDialog, CoverClickHdl, Button *, void)


More information about the Libreoffice-commits mailing list