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

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/42554Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
Tested-by: 's avatarJenkins <ci@libreoffice.org>
üst 917bcea4
......@@ -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
......
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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)
......
......@@ -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>
......
......@@ -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;
......
......@@ -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
[
......
......@@ -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;
......
......@@ -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
......
......@@ -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;
}
......
......@@ -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"/>
......
......@@ -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/>
......
......@@ -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/>
......
......@@ -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/>
......
......@@ -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"/>
......
......@@ -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/>
......
......@@ -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"/>
......
......@@ -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/>
......
......@@ -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/>
......
......@@ -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"/>
......
......@@ -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/>
......
......@@ -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"/>
......
......@@ -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/>
......
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