EPUB export: add uno command to bypass options dialog

Similarly how this is possible with PDF. The toolbar button is hidden by
default in Writer, though.

Change-Id: Iaf3b61ac2160578f7eaabd194ce8932792575c29
Reviewed-on: https://gerrit.libreoffice.org/42554
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>

31 files changed, 104 insertions, 3 deletions

diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index 6a3a1218432b..4e4c34ce697b 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -1364,6 +1364,10 @@ sw/res/styfamnu.png cmd/sc_defaultbullet.png
 sw/res/zetlhor2.png svx/res/zetlhor2.png
 sw/res/zetlver2.png svx/res/zetlver2.png
 
+# writer epub export
+cmd/lc_exportdirecttoepub.png cmd/lc_exportdirecttopdf.png
+cmd/sc_exportdirecttoepub.png cmd/sc_exportdirecttopdf.png
+
 # vcl
 # ==============================================
 vcl/res/index.png cmd/sc_insertmultiindex.png
diff --git a/icon-themes/breeze_dark/links.txt b/icon-themes/breeze_dark/links.txt
index 71f6d187af33..7381f78d275c 100644
--- a/icon-themes/breeze_dark/links.txt
+++ b/icon-themes/breeze_dark/links.txt
@@ -1376,3 +1376,7 @@ cmd/sc_rowoperations.png cmd/sc_entirerow.png
 
 cmd/sc_cellprotection.png cmd/sc_protect.png
 cmd/lc_cellprotection.png cmd/lc_protect.png
+
+# writer epub export
+cmd/lc_exportdirecttoepub.png cmd/lc_exportdirecttopdf.png
+cmd/sc_exportdirecttoepub.png cmd/sc_exportdirecttopdf.png
diff --git a/icon-themes/breeze_svg/links.txt b/icon-themes/breeze_svg/links.txt
index 71f6d187af33..7381f78d275c 100644
--- a/icon-themes/breeze_svg/links.txt
+++ b/icon-themes/breeze_svg/links.txt
@@ -1376,3 +1376,7 @@ cmd/sc_rowoperations.png cmd/sc_entirerow.png
 
 cmd/sc_cellprotection.png cmd/sc_protect.png
 cmd/lc_cellprotection.png cmd/lc_protect.png
+
+# writer epub export
+cmd/lc_exportdirecttoepub.png cmd/lc_exportdirecttopdf.png
+cmd/sc_exportdirecttoepub.png cmd/sc_exportdirecttopdf.png
diff --git a/icon-themes/crystal/links.txt b/icon-themes/crystal/links.txt
index 2604ae436681..5129d31fa698 100644
--- a/icon-themes/crystal/links.txt
+++ b/icon-themes/crystal/links.txt
@@ -25,3 +25,7 @@ cmd/lc_columnoperations.png cmd/lc_entirecolumn.png
 cmd/sc_columnoperations.png cmd/sc_entirecolumn.png 
 cmd/lc_rowoperations.png cmd/lc_entirerow.png 
 cmd/sc_rowoperations.png cmd/sc_entirerow.png
+
+# writer epub export
+cmd/lc_exportdirecttoepub.png cmd/lc_exportdirecttopdf.png
+cmd/sc_exportdirecttoepub.png cmd/sc_exportdirecttopdf.png
diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt
index 8232190685dc..60419a9b6366 100644
--- a/icon-themes/elementary/links.txt
+++ b/icon-themes/elementary/links.txt
@@ -670,3 +670,7 @@ cmd/lc_rowoperations.png cmd/lc_entirerow.png
 cmd/sc_rowoperations.png cmd/sc_entirerow.png
 
 cmd/sc_cellprotection.png cmd/sc_protect.png
+
+# writer epub export
+cmd/lc_exportdirecttoepub.png cmd/lc_exportdirecttopdf.png
+cmd/sc_exportdirecttoepub.png cmd/sc_exportdirecttopdf.png
diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt
index bb6bacc26813..8cbe216c3cab 100644
--- a/icon-themes/galaxy/links.txt
+++ b/icon-themes/galaxy/links.txt
@@ -68,6 +68,10 @@ cmd/sc_arrangemenu.png cmd/sc_bringtofront.png
 cmd/sc_updatecurindex.png cmd/sc_reload.png
 cmd/sc_removetableof.png cmd/sc_cancel.png
 
+# writer epub export
+cmd/lc_exportdirecttoepub.png cmd/lc_exportdirecttopdf.png
+cmd/sc_exportdirecttoepub.png cmd/sc_exportdirecttopdf.png
+
 # calc insert page breaks
 cmd/lc_insertrowbreak.png cmd/lc_insertpagebreak.png
 cmd/sc_insertrowbreak.png cmd/sc_insertpagebreak.png
diff --git a/icon-themes/hicontrast/links.txt b/icon-themes/hicontrast/links.txt
index f5dd5531dd4a..7df11a7d8207 100644
--- a/icon-themes/hicontrast/links.txt
+++ b/icon-themes/hicontrast/links.txt
@@ -52,3 +52,7 @@ cmd/lc_columnoperations.png cmd/lc_entirecolumn.png
 cmd/sc_columnoperations.png cmd/sc_entirecolumn.png 
 cmd/lc_rowoperations.png cmd/lc_entirerow.png 
 cmd/sc_rowoperations.png cmd/sc_entirerow.png
+
+# writer epub export
+cmd/lc_exportdirecttoepub.png cmd/lc_exportdirecttopdf.png
+cmd/sc_exportdirecttoepub.png cmd/sc_exportdirecttopdf.png
diff --git a/icon-themes/oxygen/links.txt b/icon-themes/oxygen/links.txt
index b30c383de71b..4e3ec36c6226 100644
--- a/icon-themes/oxygen/links.txt
+++ b/icon-themes/oxygen/links.txt
@@ -43,3 +43,7 @@ cmd/lc_columnoperations.png cmd/lc_entirecolumn.png
 cmd/sc_columnoperations.png cmd/sc_entirecolumn.png 
 cmd/lc_rowoperations.png cmd/lc_entirerow.png 
 cmd/sc_rowoperations.png cmd/sc_entirerow.png
+
+# writer epub export
+cmd/lc_exportdirecttoepub.png cmd/lc_exportdirecttopdf.png
+cmd/sc_exportdirecttoepub.png cmd/sc_exportdirecttopdf.png
diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index 41381ef1fbcc..f8dcd1649f45 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -205,3 +205,7 @@ cmd/lc_objectforwardone.png cmd/lc_forward.png
 cmd/sc_objectforwardone.png cmd/sc_forward.png
 cmd/lc_objectbackone.png cmd/lc_backward.png
 cmd/sc_objectbackone.png cmd/sc_backward.png
+
+# writer epub export
+cmd/lc_exportdirecttoepub.png cmd/lc_exportdirecttopdf.png
+cmd/sc_exportdirecttoepub.png cmd/sc_exportdirecttopdf.png
diff --git a/icon-themes/sifr_dark/links.txt b/icon-themes/sifr_dark/links.txt
index 41381ef1fbcc..f8dcd1649f45 100644
--- a/icon-themes/sifr_dark/links.txt
+++ b/icon-themes/sifr_dark/links.txt
@@ -205,3 +205,7 @@ cmd/lc_objectforwardone.png cmd/lc_forward.png
 cmd/sc_objectforwardone.png cmd/sc_forward.png
 cmd/lc_objectbackone.png cmd/lc_backward.png
 cmd/sc_objectbackone.png cmd/sc_backward.png
+
+# writer epub export
+cmd/lc_exportdirecttoepub.png cmd/lc_exportdirecttopdf.png
+cmd/sc_exportdirecttoepub.png cmd/sc_exportdirecttopdf.png
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index 5971d135d580..f2cc18ccea2a 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -608,3 +608,7 @@ cmd/lc_cellprotection.png cmd/lc_protect.png
 # formatting style toolbar
 cmd/lc_bulletliststyle.png cmd/lc_defaultbullet.png
 cmd/lc_numberliststyle.png cmd/lc_defaultnumbering.png
+
+# writer epub export
+cmd/lc_exportdirecttoepub.png cmd/lc_exportdirecttopdf.png
+cmd/sc_exportdirecttoepub.png cmd/sc_exportdirecttopdf.png
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 062117dc4b4f..91baa6c56606 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -126,6 +126,7 @@
 #define SID_EXPORTDOCASPDF                  (SID_SFX_START + 1673)
 #define SID_DIRECTEXPORTDOCASPDF            (SID_SFX_START + 1674)
 #define SID_EXPORTDOCASEPUB                 (SID_SFX_START + 1677)
+#define SID_DIRECTEXPORTDOCASEPUB           (SID_SFX_START + 1678)
 #define SID_UPDATEDOCMODE                   (SID_SFX_START + 1668)
 #define SID_CHECKOUT                        (SID_SFX_START + 512)
 #define SID_CANCELCHECKOUT                  (SID_SFX_START + 513)
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index e1c3806b02e0..f7a6f30818ce 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -4869,6 +4869,20 @@
           <value>1</value>
         </prop>
       </node>
+      <node oor:name=".uno:ExportDirectToEPUB" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">EPUB</value>
+        </prop>
+        <prop oor:name="ContextLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Export Directly as EPUB</value>
+        </prop>
+        <prop oor:name="TooltipLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Export as EPUB</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
       <node oor:name=".uno:ConfigureDialog" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">~Customize...</value>
diff --git a/sfx2/sdi/docslots.sdi b/sfx2/sdi/docslots.sdi
index 04039af5728a..a6da56c2488d 100644
--- a/sfx2/sdi/docslots.sdi
+++ b/sfx2/sdi/docslots.sdi
@@ -239,6 +239,11 @@ shell SfxObjectShell
         ExecMethod = ExecFile_Impl ;
         StateMethod = GetState_Impl ;
     ]
+    SID_DIRECTEXPORTDOCASEPUB
+    [
+        ExecMethod = ExecFile_Impl ;
+        StateMethod = GetState_Impl ;
+    ]
     SID_SIGNATURE
     [
         ExecMethod = ExecFile_Impl;
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 75b883ae5508..bb32b9745c71 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -4795,6 +4795,23 @@ SfxVoidItem ExportToEPUB SID_EXPORTDOCASEPUB
     GroupId = SfxGroupId::Document;
 ]
 
+SfxVoidItem ExportDirectToEPUB SID_DIRECTEXPORTDOCASEPUB
+(SfxStringItem URL SID_FILE_NAME, SfxStringItem FilterName SID_FILTER_NAME)
+[
+    AutoUpdate = FALSE,
+    FastCall = FALSE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = TRUE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    ToolBoxConfig = TRUE,
+    GroupId = SfxGroupId::Document;
+]
+
 SfxImageItem ImageOrientation SID_IMAGE_ORIENTATION
 
 [
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 534baecfe967..84e113e8bca6 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -170,7 +170,7 @@ static bool isMediaDescriptor( sal_uInt16 nSlotId )
              nSlotId == SID_SAVEASDOC || nSlotId == SID_SAVEDOC ||
              nSlotId == SID_SAVETO || nSlotId == SID_SAVEACOPY ||
              nSlotId == SID_EXPORTDOCASPDF || nSlotId == SID_DIRECTEXPORTDOCASPDF ||
-             nSlotId == SID_EXPORTDOCASEPUB ||
+             nSlotId == SID_EXPORTDOCASEPUB || nSlotId == SID_DIRECTEXPORTDOCASEPUB ||
              nSlotId == SID_SAVEACOPYITEM);
 }
 
@@ -1331,7 +1331,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
 
     if ( nSlotId == SID_OPENDOC || nSlotId == SID_EXPORTDOC || nSlotId == SID_SAVEASDOC ||  nSlotId == SID_SAVEDOC ||
          nSlotId == SID_SAVETO || nSlotId == SID_EXPORTDOCASPDF || nSlotId == SID_DIRECTEXPORTDOCASPDF ||
-         nSlotId == SID_EXPORTDOCASEPUB ||
+         nSlotId == SID_EXPORTDOCASEPUB || nSlotId == SID_DIRECTEXPORTDOCASEPUB ||
          nSlotId == SID_SAVEACOPY )
     {
         const SfxPoolItem *pItem=nullptr;
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 4fff1155a0a7..75a6c4f9353b 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -114,6 +114,7 @@
 #define SAVEAS_REQUESTED            32
 #define SAVEACOPY_REQUESTED         64
 #define EPUBEXPORT_REQUESTED       128
+#define EPUBDIRECTEXPORT_REQUESTED 256
 #define SAVEASREMOTE_REQUESTED      -1
 
 // possible statuses of save operation
@@ -145,6 +146,8 @@ sal_uInt16 getSlotIDFromMode( sal_Int16 nStoreMode )
         nResult = SID_EXPORTDOCASEPUB;
     else if ( nStoreMode == ( EXPORT_REQUESTED | PDFEXPORT_REQUESTED | PDFDIRECTEXPORT_REQUESTED ) )
         nResult = SID_DIRECTEXPORTDOCASPDF;
+    else if ( nStoreMode == ( EXPORT_REQUESTED | EPUBEXPORT_REQUESTED | EPUBDIRECTEXPORT_REQUESTED ) )
+        nResult = SID_DIRECTEXPORTDOCASEPUB;
     else if ( nStoreMode == SAVEAS_REQUESTED || nStoreMode == ( EXPORT_REQUESTED | WIDEEXPORT_REQUESTED ) )
         nResult = SID_SAVEASDOC;
     else if ( nStoreMode == SAVEASREMOTE_REQUESTED )
@@ -168,6 +171,8 @@ sal_Int16 getStoreModeFromSlotName( const OUString& aSlotName )
         nResult = EXPORT_REQUESTED | PDFEXPORT_REQUESTED | PDFDIRECTEXPORT_REQUESTED;
     else if ( aSlotName == "ExportToEPUB" )
         nResult = EXPORT_REQUESTED | EPUBEXPORT_REQUESTED;
+    else if ( aSlotName == "ExportDirectToEPUB" )
+        nResult = EXPORT_REQUESTED | EPUBEXPORT_REQUESTED | EPUBDIRECTEXPORT_REQUESTED;
     else if ( aSlotName == "Save" )
         nResult = SAVE_REQUESTED;
     else if ( aSlotName == "SaveAs" )
@@ -1448,7 +1453,7 @@ bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >& xMo
     const OUString sFilterFlagsString("FilterFlags");
 
     bool bPDFOptions = (nStoreMode & PDFEXPORT_REQUESTED) && !(nStoreMode & PDFDIRECTEXPORT_REQUESTED);
-    bool bEPUBOptions = (nStoreMode & EPUBEXPORT_REQUESTED);
+    bool bEPUBOptions = (nStoreMode & EPUBEXPORT_REQUESTED) && !(nStoreMode & EPUBDIRECTEXPORT_REQUESTED);
     if ( ( nStoreMode & EXPORT_REQUESTED ) && (bPDFOptions || bEPUBOptions) )
     {
         // this is PDF or EPUB export, the filter options dialog should be shown before the export
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index da09164f0317..0dfd5b80959f 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -500,6 +500,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
             bIsPDFExport = true;
             SAL_FALLTHROUGH;
         case SID_EXPORTDOCASEPUB:
+        case SID_DIRECTEXPORTDOCASEPUB:
         case SID_EXPORTDOC:
         case SID_SAVEASDOC:
         case SID_SAVEASREMOTE:
@@ -979,6 +980,7 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
             case SID_EXPORTDOCASPDF:
             case SID_DIRECTEXPORTDOCASPDF:
             case SID_EXPORTDOCASEPUB:
+            case SID_DIRECTEXPORTDOCASEPUB:
             {
                 break;
             }
diff --git a/sw/uiconfig/sglobal/toolbar/standardbar.xml b/sw/uiconfig/sglobal/toolbar/standardbar.xml
index 6c261f702d8c..c0c98ad2529a 100644
--- a/sw/uiconfig/sglobal/toolbar/standardbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/standardbar.xml
@@ -29,6 +29,7 @@
  <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExportDirectToEPUB" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:Print"/>
  <toolbar:toolbaritem xlink:href=".uno:PrintPreview"/>
diff --git a/sw/uiconfig/sglobal/toolbar/viewerbar.xml b/sw/uiconfig/sglobal/toolbar/viewerbar.xml
index eeb4e8823ea9..369a7023efe6 100644
--- a/sw/uiconfig/sglobal/toolbar/viewerbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/viewerbar.xml
@@ -24,6 +24,7 @@
  <toolbar:toolbaritem xlink:href=".uno:SendMail"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExportDirectToEPUB" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:Print"/>
  <toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/sweb/toolbar/standardbar.xml b/sw/uiconfig/sweb/toolbar/standardbar.xml
index 1ddc93058f42..e96c9debec67 100644
--- a/sw/uiconfig/sweb/toolbar/standardbar.xml
+++ b/sw/uiconfig/sweb/toolbar/standardbar.xml
@@ -29,6 +29,7 @@
  <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExportDirectToEPUB" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:Print"/>
  <toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/sweb/toolbar/viewerbar.xml b/sw/uiconfig/sweb/toolbar/viewerbar.xml
index eeb4e8823ea9..369a7023efe6 100644
--- a/sw/uiconfig/sweb/toolbar/viewerbar.xml
+++ b/sw/uiconfig/sweb/toolbar/viewerbar.xml
@@ -24,6 +24,7 @@
  <toolbar:toolbaritem xlink:href=".uno:SendMail"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExportDirectToEPUB" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:Print"/>
  <toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swform/toolbar/standardbar.xml b/sw/uiconfig/swform/toolbar/standardbar.xml
index 6c261f702d8c..c0c98ad2529a 100644
--- a/sw/uiconfig/swform/toolbar/standardbar.xml
+++ b/sw/uiconfig/swform/toolbar/standardbar.xml
@@ -29,6 +29,7 @@
  <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExportDirectToEPUB" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:Print"/>
  <toolbar:toolbaritem xlink:href=".uno:PrintPreview"/>
diff --git a/sw/uiconfig/swform/toolbar/viewerbar.xml b/sw/uiconfig/swform/toolbar/viewerbar.xml
index eeb4e8823ea9..369a7023efe6 100644
--- a/sw/uiconfig/swform/toolbar/viewerbar.xml
+++ b/sw/uiconfig/swform/toolbar/viewerbar.xml
@@ -24,6 +24,7 @@
  <toolbar:toolbaritem xlink:href=".uno:SendMail"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExportDirectToEPUB" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:Print"/>
  <toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swreport/toolbar/standardbar.xml b/sw/uiconfig/swreport/toolbar/standardbar.xml
index 6c261f702d8c..c0c98ad2529a 100644
--- a/sw/uiconfig/swreport/toolbar/standardbar.xml
+++ b/sw/uiconfig/swreport/toolbar/standardbar.xml
@@ -29,6 +29,7 @@
  <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExportDirectToEPUB" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:Print"/>
  <toolbar:toolbaritem xlink:href=".uno:PrintPreview"/>
diff --git a/sw/uiconfig/swreport/toolbar/viewerbar.xml b/sw/uiconfig/swreport/toolbar/viewerbar.xml
index eeb4e8823ea9..369a7023efe6 100644
--- a/sw/uiconfig/swreport/toolbar/viewerbar.xml
+++ b/sw/uiconfig/swreport/toolbar/viewerbar.xml
@@ -24,6 +24,7 @@
  <toolbar:toolbaritem xlink:href=".uno:SendMail"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExportDirectToEPUB" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:Print"/>
  <toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swriter/toolbar/singlemode.xml b/sw/uiconfig/swriter/toolbar/singlemode.xml
index 111b6c188504..78a69958f812 100644
--- a/sw/uiconfig/swriter/toolbar/singlemode.xml
+++ b/sw/uiconfig/swriter/toolbar/singlemode.xml
@@ -22,6 +22,7 @@
  <toolbar:toolbaritem xlink:href=".uno:OpenFromWriter"/>
  <toolbar:toolbaritem xlink:href=".uno:Save"/>
  <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExportDirectToEPUB" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:Print"/>
  <toolbar:toolbaritem xlink:href=".uno:PrintPreview" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml b/sw/uiconfig/swriter/toolbar/standardbar.xml
index 9a959e2d3bf6..10c5b6edf05b 100644
--- a/sw/uiconfig/swriter/toolbar/standardbar.xml
+++ b/sw/uiconfig/swriter/toolbar/standardbar.xml
@@ -30,6 +30,7 @@
  <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExportDirectToEPUB" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:Print"/>
  <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:PrintPreview"/>
diff --git a/sw/uiconfig/swriter/toolbar/viewerbar.xml b/sw/uiconfig/swriter/toolbar/viewerbar.xml
index eeb4e8823ea9..369a7023efe6 100644
--- a/sw/uiconfig/swriter/toolbar/viewerbar.xml
+++ b/sw/uiconfig/swriter/toolbar/viewerbar.xml
@@ -24,6 +24,7 @@
  <toolbar:toolbaritem xlink:href=".uno:SendMail"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExportDirectToEPUB" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:Print"/>
  <toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swxform/toolbar/standardbar.xml b/sw/uiconfig/swxform/toolbar/standardbar.xml
index e7f8eba56d0e..f1601ec87b9c 100644
--- a/sw/uiconfig/swxform/toolbar/standardbar.xml
+++ b/sw/uiconfig/swxform/toolbar/standardbar.xml
@@ -29,6 +29,7 @@
  <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExportDirectToEPUB" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:Print"/>
  <toolbar:toolbaritem xlink:href=".uno:PrintPreview"/>
diff --git a/sw/uiconfig/swxform/toolbar/viewerbar.xml b/sw/uiconfig/swxform/toolbar/viewerbar.xml
index eeb4e8823ea9..369a7023efe6 100644
--- a/sw/uiconfig/swxform/toolbar/viewerbar.xml
+++ b/sw/uiconfig/swxform/toolbar/viewerbar.xml
@@ -24,6 +24,7 @@
  <toolbar:toolbaritem xlink:href=".uno:SendMail"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExportDirectToEPUB" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:Print"/>
  <toolbar:toolbarseparator/>