offapi/com/sun/star/text/MailMerge.idl | 2
officecfg/registry/schema/org/openoffice/Office/Writer.xcs | 15 --
officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs | 8 -
sw/inc/modcfg.hxx | 4
sw/inc/printdata.hxx | 6 -
sw/inc/unoprnms.hxx | 1
sw/source/core/unocore/unomap.cxx | 1
sw/source/core/view/printdata.cxx | 1
sw/source/filter/xml/xmlimp.cxx | 1
sw/source/ui/config/optpage.cxx | 1
sw/source/ui/envelp/mailmrge.cxx | 11 --
sw/source/uibase/config/modcfg.cxx | 52 ++++-----
sw/source/uibase/config/prtopt.cxx | 53 ++++------
sw/source/uibase/inc/unomailmerge.hxx | 1
sw/source/uibase/uno/unomailmerge.cxx | 12 --
sw/source/uibase/uno/unomod.cxx | 10 -
sw/source/uibase/uno/unotxdoc.cxx | 1
sw/uiconfig/swriter/ui/mailmerge.ui | 15 --
18 files changed, 52 insertions(+), 143 deletions(-)
New commits:
commit c9d5bf3fe0e6b59f30107c42eac3d4603bf8f2b6
Author: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
AuthorDate: Thu Dec 14 10:21:31 2023 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
CommitDate: Mon Dec 18 07:48:05 2023 +0100
[API CHANGE] tdf#158041 Remove unused SinglePrintJobs config option from sw
This is handled by the print dialog directly
Change-Id: Ieb4221d97444216f332501da9a3aba7dc6b8500a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160762
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
diff --git a/offapi/com/sun/star/text/MailMerge.idl
b/offapi/com/sun/star/text/MailMerge.idl
index 843cb44104cf..68809e081407 100644
--- a/offapi/com/sun/star/text/MailMerge.idl
+++ b/offapi/com/sun/star/text/MailMerge.idl
@@ -181,6 +181,8 @@ published service MailMerge
/** determines whether single print jobs will be generated per output
document.
<p>This property is only evaluated for printer output.</p>
+
+ @deprecated since 24.8, use
::com::sun::star::view::PrintOptions::SinglePrintJobs instead.
*/
[property] boolean SinglePrintJobs;
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 2bd5995a1e5d..b014281aed9d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1868,14 +1868,6 @@
<info>
<desc>Contains other output settings.</desc>
</info>
- <prop oor:name="SinglePrintJob" oor:type="xs:boolean"
oor:nillable="false">
- <!-- UIHints: Tools - Options - Text document - Print - [Section]
Output -->
- <info>
- <desc>Controls the print output to avoid problems with duplex
printing and odd page numbers.</desc>
- <label>Create single print jobs</label>
- </info>
- <value>false</value>
- </prop>
<prop oor:name="Fax" oor:type="xs:string" oor:nillable="false">
<!-- UIHints: Tools - Options - Text document Print - [Section] Fax
-->
<info>
@@ -5662,13 +5654,6 @@
<info>
<desc>Specifies the settings for form letter output to
printer.</desc>
</info>
- <prop oor:name="SinglePrintJobs" oor:type="xs:boolean"
oor:nillable="false">
- <!-- UIHints: Form letter - Printer output - Single print jobs-->
- <info>
- <desc>Prints each form letter individually with the selected
printer (true).</desc>
- </info>
- <value>false</value>
- </prop>
<prop oor:name="AskForMerge" oor:type="xs:boolean"
oor:nillable="false">
<info>
<desc>Determines whether printing a document that contains
database fields triggers a 'do you want to call mailmerge' query</desc>
diff --git a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
index 4ecee7fa61e3..32b2c52e3ae7 100644
--- a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
@@ -610,14 +610,6 @@
<info>
<desc>Contains output-specific settings.</desc>
</info>
- <prop oor:name="SinglePrintJob" oor:type="xs:boolean"
oor:nillable="false">
- <!-- UIHints: Tools - Option - HTML-Document - Print - [Section]
Output -->
- <info>
- <desc>Controls the print output.</desc>
- <label>Create single print jobs</label>
- </info>
- <value>false</value>
- </prop>
<prop oor:name="Fax" oor:type="xs:string" oor:nillable="false">
<!-- UIHints: Tools - Option - HTML-Document Print - [Section] Fax
-->
<info>
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index 16862c5536c7..abfea9159e29 100644
--- a/sw/inc/modcfg.hxx
+++ b/sw/inc/modcfg.hxx
@@ -180,7 +180,6 @@ class SAL_DLLPUBLIC_RTTI SwMiscConfig final : public
utl::ConfigItem
bool m_bShowIndexPreview; // Index/ShowPreview
bool m_bGrfToGalleryAsLnk; // Misc/GraphicToGalleryAsLink
bool m_bNumAlignSize; // Numbering/Graphic/KeepRatio
- bool m_bSinglePrintJob; //
FormLetter/PrintOutput/SinglePrintJobs
bool m_bIsNameFromColumn; //
FormLetter/FileOutput/FileName/Generation
bool m_bIsPasswordFromColumn; //
FormLetter/FileOutput/FilePassword/Generation
bool m_bAskForMailMergeInPrint; // Ask if documents containing
fields should be 'mailmerged'
@@ -325,9 +324,6 @@ public:
void SetMailingFormats( MailTextFormats nSet ) {
m_aMiscConfig.m_nMailingFormats = nSet;
m_aMiscConfig.SetModified();}
- void SetSinglePrintJob( bool b ) {
m_aMiscConfig.m_bSinglePrintJob = b;
- m_aMiscConfig.SetModified();}
-
bool IsNameFromColumn() const { return
m_aMiscConfig.m_bIsNameFromColumn; }
void SetIsNameFromColumn( bool bSet )
{
diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index 35f0aa72505c..3063b4eb0d07 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -61,7 +61,7 @@ public:
m_bPrintHiddenText, m_bPrintTextPlaceholder,
m_bPrintLeftPages, m_bPrintRightPages, m_bPrintReverse,
m_bPrintProspect,
m_bPrintProspectRTL,
- m_bPrintSingleJobs, m_bPaperFromSetup,
+ m_bPaperFromSetup,
/// Print empty pages
m_bPrintEmptyPages;
@@ -85,7 +85,6 @@ public:
m_bPrintReverse =
m_bPrintProspect =
m_bPrintProspectRTL =
- m_bPrintSingleJobs =
m_bPrintBlackFont =
m_bPrintHiddenText =
m_bPrintTextPlaceholder = false;
@@ -114,7 +113,6 @@ public:
m_bPrintReverse == rData.m_bPrintReverse &&
m_bPrintProspect == rData.m_bPrintProspect &&
m_bPrintProspectRTL == rData.m_bPrintProspectRTL &&
- m_bPrintSingleJobs == rData.m_bPrintSingleJobs &&
m_bPaperFromSetup == rData.m_bPaperFromSetup &&
m_bPrintEmptyPages == rData.m_bPrintEmptyPages &&
m_nPrintPostIts == rData.m_nPrintPostIts &&
@@ -141,7 +139,6 @@ public:
bool IsPrintProspectRTL() const { return m_bPrintProspectRTL; }
bool IsPrintPageBackground() const { return m_bPrintPageBackground; }
bool IsPrintBlackFont() const { return m_bPrintBlackFont; }
- bool IsPrintSingleJobs() const { return m_bPrintSingleJobs; }
SwPostItMode GetPrintPostIts() const { return m_nPrintPostIts; }
const OUString& GetFaxName() const { return m_sFaxName; }
bool IsPrintHiddenText() const { return m_bPrintHiddenText; }
@@ -161,7 +158,6 @@ public:
void SetPrintProspect_RTL( bool b ) { doSetModified();
m_bPrintProspectRTL = b; }
void SetPrintPageBackground( bool b ) { doSetModified();
m_bPrintPageBackground = b; }
void SetPrintBlackFont( bool b ) { doSetModified();
m_bPrintBlackFont = b; }
- void SetPrintSingleJobs( bool b ) { doSetModified();
m_bPrintSingleJobs = b; }
void SetFaxName( const OUString& rSet ) { m_sFaxName = rSet; }
void SetPrintHiddenText( bool b ) { doSetModified();
m_bPrintHiddenText = b; }
void SetPrintTextPlaceholder( bool b ) { doSetModified();
m_bPrintTextPlaceholder = b; }
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index 2c98a87dba5a..360c2c1953d0 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -745,7 +745,6 @@ inline constexpr OUString UNO_NAME_DOCUMENT_URL =
u"DocumentURL"_ustr;
inline constexpr OUString UNO_NAME_OUTPUT_URL = u"OutputURL"_ustr;
inline constexpr OUString UNO_NAME_OUTPUT_TYPE = u"OutputType"_ustr;
inline constexpr OUString UNO_NAME_ESCAPE_PROCESSING =
u"EscapeProcessing"_ustr;
-inline constexpr OUString UNO_NAME_SINGLE_PRINT_JOBS = u"SinglePrintJobs"_ustr;
inline constexpr OUString UNO_NAME_FILE_NAME_FROM_COLUMN =
u"FileNameFromColumn"_ustr;
inline constexpr OUString UNO_NAME_FILE_NAME_PREFIX = u"FileNamePrefix"_ustr;
inline constexpr OUString UNO_NAME_CHAR_STYLE_NAMES = u"CharStyleNames"_ustr;
diff --git a/sw/source/core/unocore/unomap.cxx
b/sw/source/core/unocore/unomap.cxx
index 3004fb684e9c..8be847e1031e 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -1388,7 +1388,6 @@ std::span<const SfxItemPropertyMapEntry>
SwUnoPropertyMapProvider::GetPropertyMa
{ UNO_NAME_DAD_COMMAND_TYPE, WID_DATA_COMMAND_TYPE,
cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, 0},
{ UNO_NAME_OUTPUT_TYPE, WID_OUTPUT_TYPE,
cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0},
{ UNO_NAME_ESCAPE_PROCESSING, WID_ESCAPE_PROCESSING,
cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
- { UNO_NAME_SINGLE_PRINT_JOBS, WID_SINGLE_PRINT_JOBS,
cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
{ UNO_NAME_FILE_NAME_FROM_COLUMN,
WID_FILE_NAME_FROM_COLUMN, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
{ UNO_NAME_FILE_NAME_PREFIX, WID_FILE_NAME_PREFIX,
cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
{ UNO_NAME_SUBJECT, WID_MAIL_SUBJECT,
cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
diff --git a/sw/source/core/view/printdata.cxx
b/sw/source/core/view/printdata.cxx
index 478e553aafd0..a1e467e8895b 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -141,7 +141,6 @@ void SwRenderData::MakeSwPrtOptions(
rOptions.m_bPrintReverse = false; /*handled by print dialog now*/
rOptions.m_bPrintProspect = pOpt->IsPrintProspect();
rOptions.m_bPrintProspectRTL = pOpt->IsPrintProspectRTL();
- // bPrintSingleJobs <-- not set here; mail merge and or
configuration
// bModified <-- not set here; mail merge only
rOptions.m_bPrintBlackFont = pOpt->IsPrintWithBlackTextColor();
rOptions.m_bPrintHiddenText = pOpt->IsPrintHiddenText();
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 81ddfbbb5ffa..17d153910c8f 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1260,7 +1260,6 @@ void SwXMLImport::SetConfigurationSettings(const Sequence
< PropertyValue > & aC
"PrintPaperFromSetup",
"PrintTables",
"PrintTextPlaceholder",
- "PrintSingleJobs",
"UpdateFromTemplate",
"PrinterIndependentLayout",
"PrintEmptyPages",
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index a2af6912b75a..77ff2b43fbac 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -556,7 +556,6 @@ bool SwAddPrinterTabPage::FillItemSet( SfxItemSet*
rCoreSet )
aAddPrinterAttr.m_bPrintProspectRTL =
m_xProspectCB_RTL->get_active();
aAddPrinterAttr.m_bPaperFromSetup =
m_xPaperFromSetupCB->get_active();
aAddPrinterAttr.m_bPrintEmptyPages =
m_xPrintEmptyPagesCB->get_active();
- aAddPrinterAttr.m_bPrintSingleJobs = true; // handled by vcl in new
print dialog since CWS printerpullpages /*m_xSingleJobsCB->get_active()*/;
if (m_xNoRB->get_active()) aAddPrinterAttr.m_nPrintPostIts =
SwPostItMode::NONE;
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 8567b1144307..8745be1a73a9 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -131,7 +131,6 @@ SwMailMergeDlg::SwMailMergeDlg(weld::Window* pParent,
SwWrtShell& rShell,
, m_xPrinterRB(m_xBuilder->weld_radio_button("printer"))
, m_xMailingRB(m_xBuilder->weld_radio_button("electronic"))
, m_xFileRB(m_xBuilder->weld_radio_button("file"))
- , m_xSingleJobsCB(m_xBuilder->weld_check_button("singlejobs"))
, m_xPasswordCB(m_xBuilder->weld_check_button("passwd-check"))
, m_xSaveMergedDocumentFT(m_xBuilder->weld_label("savemergeddoclabel"))
, m_xSaveSingleDocRB(m_xBuilder->weld_radio_button("singledocument"))
@@ -158,7 +157,6 @@ SwMailMergeDlg::SwMailMergeDlg(weld::Window* pParent,
SwWrtShell& rShell,
, m_xFormatSwCB(m_xBuilder->weld_check_button("swriter"))
, m_xOkBTN(m_xBuilder->weld_button("ok"))
{
- m_xSingleJobsCB->hide(); // not supported in since cws printerpullpages
anymore
//task #97066# mailing of form letters is currently not supported
m_xMailingRB->hide();
m_xSubjectFT->hide();
@@ -358,8 +356,6 @@ IMPL_LINK_NOARG(SwMailMergeDlg, ButtonHdl, weld::Button&,
void)
IMPL_LINK_NOARG(SwMailMergeDlg, OutputTypeHdl, weld::Toggleable&, void)
{
bool bPrint = m_xPrinterRB->get_active();
- m_xSingleJobsCB->set_sensitive(bPrint);
-
m_xSaveMergedDocumentFT->set_sensitive( !bPrint );
m_xSaveSingleDocRB->set_sensitive( !bPrint );
m_xSaveIndividualRB->set_sensitive( !bPrint );
@@ -535,13 +531,6 @@ bool SwMailMergeDlg::ExecQryShell()
}
}
}
- IDocumentDeviceAccess& rIDDA = m_rSh.getIDocumentDeviceAccess();
- SwPrintData aPrtData( rIDDA.getPrintData() );
- aPrtData.SetPrintSingleJobs(m_xSingleJobsCB->get_active());
- rIDDA.setPrintData(aPrtData);
-
- m_pModOpt->SetSinglePrintJob(m_xSingleJobsCB->get_active());
-
MailTextFormats nMailingMode = MailTextFormats::NONE;
if (m_xFormatSwCB->get_active())
diff --git a/sw/source/uibase/config/modcfg.cxx
b/sw/source/uibase/config/modcfg.cxx
index ff36e0a3e1fa..23ec87364d97 100644
--- a/sw/source/uibase/config/modcfg.cxx
+++ b/sw/source/uibase/config/modcfg.cxx
@@ -1161,7 +1161,6 @@ SwMiscConfig::SwMiscConfig() :
m_bShowIndexPreview(false),
m_bGrfToGalleryAsLnk(true),
m_bNumAlignSize(true),
- m_bSinglePrintJob(false),
m_bIsNameFromColumn(true),
m_bIsPasswordFromColumn(false),
m_bAskForMailMergeInPrint(true),
@@ -1183,15 +1182,14 @@ const Sequence<OUString>&
SwMiscConfig::GetPropertyNames()
"Index/ShowPreview", // 2
"Misc/GraphicToGalleryAsLink", // 3
"Numbering/Graphic/KeepRatio", // 4
- "FormLetter/PrintOutput/SinglePrintJobs", // 5
- "FormLetter/MailingOutput/Format", // 6
- "FormLetter/FileOutput/FileName/FromDatabaseField", // 7
- "FormLetter/FileOutput/Path", // 8
- "FormLetter/FileOutput/FileName/FromManualSetting", // 9
- "FormLetter/FileOutput/FileName/Generation",//10
- "FormLetter/PrintOutput/AskForMerge", //11
- "FormLetter/FileOutput/FilePassword/FromDatabaseField", // 12
- "FormLetter/FileOutput/FilePassword/Generation" //13
+ "FormLetter/MailingOutput/Format", // 5
+ "FormLetter/FileOutput/FileName/FromDatabaseField", // 6
+ "FormLetter/FileOutput/Path", // 7
+ "FormLetter/FileOutput/FileName/FromManualSetting", // 8
+ "FormLetter/FileOutput/FileName/Generation",//9
+ "FormLetter/PrintOutput/AskForMerge", //10
+ "FormLetter/FileOutput/FilePassword/FromDatabaseField", // 11
+ "FormLetter/FileOutput/FilePassword/Generation" //12
};
return aNames;
}
@@ -1216,15 +1214,14 @@ void SwMiscConfig::ImplCommit()
case 2 : pValues[nProp] <<= m_bShowIndexPreview; break;
case 3 : pValues[nProp] <<= m_bGrfToGalleryAsLnk; break;
case 4 : pValues[nProp] <<= m_bNumAlignSize; break;
- case 5 : pValues[nProp] <<= m_bSinglePrintJob; break;
- case 6 : pValues[nProp] <<=
static_cast<sal_Int32>(m_nMailingFormats); break;
- case 7 : pValues[nProp] <<= m_sNameFromColumn; break;
- case 8 : pValues[nProp] <<= m_sMailingPath; break;
- case 9 : pValues[nProp] <<= m_sMailName; break;
- case 10: pValues[nProp] <<= m_bIsNameFromColumn; break;
- case 11: pValues[nProp] <<= m_bAskForMailMergeInPrint; break;
- case 12: pValues[nProp] <<= m_sPasswordFromColumn; break;
- case 13: pValues[nProp] <<= m_bIsPasswordFromColumn; break;
+ case 5 : pValues[nProp] <<=
static_cast<sal_Int32>(m_nMailingFormats); break;
+ case 6 : pValues[nProp] <<= m_sNameFromColumn; break;
+ case 7 : pValues[nProp] <<= m_sMailingPath; break;
+ case 8 : pValues[nProp] <<= m_sMailName; break;
+ case 9: pValues[nProp] <<= m_bIsNameFromColumn; break;
+ case 10: pValues[nProp] <<= m_bAskForMailMergeInPrint; break;
+ case 11: pValues[nProp] <<= m_sPasswordFromColumn; break;
+ case 12: pValues[nProp] <<= m_bIsPasswordFromColumn; break;
}
}
PutProperties(aNames, aValues);
@@ -1250,15 +1247,14 @@ void SwMiscConfig::Load()
case 2 : m_bShowIndexPreview =
*o3tl::doAccess<bool>(pValues[nProp]); break;
case 3 : m_bGrfToGalleryAsLnk =
*o3tl::doAccess<bool>(pValues[nProp]); break;
case 4 : m_bNumAlignSize =
*o3tl::doAccess<bool>(pValues[nProp]); break;
- case 5 : m_bSinglePrintJob =
*o3tl::doAccess<bool>(pValues[nProp]); break;
- case 6 : m_nMailingFormats =
static_cast<MailTextFormats>(*o3tl::doAccess<sal_Int32>(pValues[nProp])); break;
- case 7 : pValues[nProp] >>= sTmp; m_sNameFromColumn = sTmp;
break;
- case 8 : pValues[nProp] >>= sTmp; m_sMailingPath = sTmp;
break;
- case 9 : pValues[nProp] >>= sTmp; m_sMailName = sTmp;
break;
- case 10: m_bIsNameFromColumn =
*o3tl::doAccess<bool>(pValues[nProp]); break;
- case 11: pValues[nProp] >>= m_bAskForMailMergeInPrint; break;
- case 12: pValues[nProp] >>= sTmp; m_sPasswordFromColumn =
sTmp; break;
- case 13: m_bIsPasswordFromColumn =
*o3tl::doAccess<bool>(pValues[nProp]); break;
+ case 5 : m_nMailingFormats =
static_cast<MailTextFormats>(*o3tl::doAccess<sal_Int32>(pValues[nProp])); break;
+ case 6 : pValues[nProp] >>= sTmp; m_sNameFromColumn = sTmp;
break;
+ case 7 : pValues[nProp] >>= sTmp; m_sMailingPath = sTmp;
break;
+ case 8 : pValues[nProp] >>= sTmp; m_sMailName = sTmp;
break;
+ case 9: m_bIsNameFromColumn =
*o3tl::doAccess<bool>(pValues[nProp]); break;
+ case 10: pValues[nProp] >>= m_bAskForMailMergeInPrint; break;
+ case 11: pValues[nProp] >>= sTmp; m_sPasswordFromColumn =
sTmp; break;
+ case 12: m_bIsPasswordFromColumn =
*o3tl::doAccess<bool>(pValues[nProp]); break;
}
}
}
diff --git a/sw/source/uibase/config/prtopt.cxx
b/sw/source/uibase/config/prtopt.cxx
index 68764fab1ad8..2ec2493354ad 100644
--- a/sw/source/uibase/config/prtopt.cxx
+++ b/sw/source/uibase/config/prtopt.cxx
@@ -40,17 +40,16 @@ Sequence<OUString> SwPrintOptions::GetPropertyNames() const
"Page/Reversed", // 6
"Page/Brochure", // 7
"Page/BrochureRightToLeft", // 8
- "Output/SinglePrintJob", // 9
- "Output/Fax", // 10
- "Papertray/FromPrinterSetup", // 11
- "Content/Drawing", // 12 not in SW/Web
- "Page/LeftPage", // 13 not in SW/Web
- "Page/RightPage", // 14 not in SW/Web
- "EmptyPages", // 15 not in SW/Web
- "Content/PrintPlaceholders", // 16 not in Sw/Web
- "Content/PrintHiddenText" // 17 not in Sw/Web
+ "Output/Fax", // 9
+ "Papertray/FromPrinterSetup", // 10
+ "Content/Drawing", // 11 not in SW/Web
+ "Page/LeftPage", // 12 not in SW/Web
+ "Page/RightPage", // 13 not in SW/Web
+ "EmptyPages", // 14 not in SW/Web
+ "Content/PrintPlaceholders", // 15 not in Sw/Web
+ "Content/PrintHiddenText" // 16 not in Sw/Web
};
- const int nCount = m_bIsWeb ? 12 : 18;
+ const int nCount = m_bIsWeb ? 11 : 17;
Sequence<OUString> aNames(nCount);
OUString* pNames = aNames.getArray();
for(int i = 0; i < nCount; i++)
@@ -98,15 +97,14 @@ SwPrintOptions::SwPrintOptions(bool bWeb) :
case 6: m_bPrintReverse =
*o3tl::doAccess<bool>(pValues[nProp]); break;
case 7: m_bPrintProspect =
*o3tl::doAccess<bool>(pValues[nProp]); break;
case 8: m_bPrintProspectRTL =
*o3tl::doAccess<bool>(pValues[nProp]); break;
- case 9: m_bPrintSingleJobs =
*o3tl::doAccess<bool>(pValues[nProp]); break;
- case 10: pValues[nProp] >>= m_sFaxName; break;
- case 11: m_bPaperFromSetup =
*o3tl::doAccess<bool>(pValues[nProp]); break;
- case 12: m_bPrintDraw =
*o3tl::doAccess<bool>(pValues[nProp]); break;
- case 13: m_bPrintLeftPages =
*o3tl::doAccess<bool>(pValues[nProp]); break;
- case 14: m_bPrintRightPages =
*o3tl::doAccess<bool>(pValues[nProp]); break;
- case 15: m_bPrintEmptyPages =
*o3tl::doAccess<bool>(pValues[nProp]); break;
- case 16: m_bPrintTextPlaceholder =
*o3tl::doAccess<bool>(pValues[nProp]); break;
- case 17: m_bPrintHiddenText =
*o3tl::doAccess<bool>(pValues[nProp]); break;
+ case 9: pValues[nProp] >>= m_sFaxName; break;
+ case 10: m_bPaperFromSetup =
*o3tl::doAccess<bool>(pValues[nProp]); break;
+ case 11: m_bPrintDraw =
*o3tl::doAccess<bool>(pValues[nProp]); break;
+ case 12: m_bPrintLeftPages =
*o3tl::doAccess<bool>(pValues[nProp]); break;
+ case 13: m_bPrintRightPages =
*o3tl::doAccess<bool>(pValues[nProp]); break;
+ case 14: m_bPrintEmptyPages =
*o3tl::doAccess<bool>(pValues[nProp]); break;
+ case 15: m_bPrintTextPlaceholder =
*o3tl::doAccess<bool>(pValues[nProp]); break;
+ case 16: m_bPrintHiddenText =
*o3tl::doAccess<bool>(pValues[nProp]); break;
}
}
}
@@ -145,15 +143,14 @@ void SwPrintOptions::ImplCommit()
case 6: pValues[nProp] <<= m_bPrintReverse; break;
case 7: pValues[nProp] <<= m_bPrintProspect; break;
case 8: pValues[nProp] <<= m_bPrintProspectRTL; break;
- case 9: pValues[nProp] <<= m_bPrintSingleJobs; break;
- case 10: pValues[nProp] <<= m_sFaxName; break;
- case 11: pValues[nProp] <<= m_bPaperFromSetup; break;
- case 12: pValues[nProp] <<= m_bPrintDraw; break;
- case 13: pValues[nProp] <<= m_bPrintLeftPages; break;
- case 14: pValues[nProp] <<= m_bPrintRightPages; break;
- case 15: pValues[nProp] <<= m_bPrintEmptyPages; break;
- case 16: pValues[nProp] <<= m_bPrintTextPlaceholder; break;
- case 17: pValues[nProp] <<= m_bPrintHiddenText; break;
+ case 9: pValues[nProp] <<= m_sFaxName; break;
+ case 10: pValues[nProp] <<= m_bPaperFromSetup; break;
+ case 11: pValues[nProp] <<= m_bPrintDraw; break;
+ case 12: pValues[nProp] <<= m_bPrintLeftPages; break;
+ case 13: pValues[nProp] <<= m_bPrintRightPages; break;
+ case 14: pValues[nProp] <<= m_bPrintEmptyPages; break;
+ case 15: pValues[nProp] <<= m_bPrintTextPlaceholder; break;
+ case 16: pValues[nProp] <<= m_bPrintHiddenText; break;
}
}
diff --git a/sw/source/uibase/inc/unomailmerge.hxx
b/sw/source/uibase/inc/unomailmerge.hxx
index 722d80448352..35200f837b79 100644
--- a/sw/source/uibase/inc/unomailmerge.hxx
+++ b/sw/source/uibase/inc/unomailmerge.hxx
@@ -104,7 +104,6 @@ class SwXMailMerge final :
sal_Int32 m_nDataCommandType;
sal_Int16 m_nOutputType;
bool m_bEscapeProcessing;
- bool m_bSinglePrintJobs;
bool m_bFileNameFromColumn;
OUString m_sInServerPassword;
diff --git a/sw/source/uibase/uno/unomailmerge.cxx
b/sw/source/uibase/uno/unomailmerge.cxx
index 2b5fecf21b65..085cc707fcf2 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -369,7 +369,6 @@ SwXMailMerge::SwXMailMerge() :
m_nDataCommandType(sdb::CommandType::TABLE),
m_nOutputType(MailMergeType::PRINTER),
m_bEscapeProcessing(true), //!! allow to process properties like
"Filter", "Order", ...
- m_bSinglePrintJobs(false),
m_bFileNameFromColumn(false),
m_bSendAsHTML(false),
m_bSendAsAttachment(false),
@@ -449,7 +448,6 @@ uno::Any SAL_CALL SwXMailMerge::execute(
sal_Int32 nCurDataCommandType = m_nDataCommandType;
sal_Int16 nCurOutputType = m_nOutputType;
bool bCurEscapeProcessing = m_bEscapeProcessing;
- bool bCurSinglePrintJobs = m_bSinglePrintJobs;
bool bCurFileNameFromColumn = m_bFileNameFromColumn;
SfxObjectShellRef xCurDocSh = m_xDocSh; // the document
@@ -500,8 +498,6 @@ uno::Any SAL_CALL SwXMailMerge::execute(
bOK = rValue >>= nCurOutputType;
else if (rName == UNO_NAME_ESCAPE_PROCESSING)
bOK = rValue >>= bCurEscapeProcessing;
- else if (rName == UNO_NAME_SINGLE_PRINT_JOBS)
- bOK = rValue >>= bCurSinglePrintJobs;
else if (rName == UNO_NAME_FILE_NAME_FROM_COLUMN)
bOK = rValue >>= bCurFileNameFromColumn;
else if (rName == UNO_NAME_SUBJECT)
@@ -676,10 +672,6 @@ uno::Any SAL_CALL SwXMailMerge::execute(
{
case MailMergeType::PRINTER:
{
- IDocumentDeviceAccess& rIDDA = rSh.getIDocumentDeviceAccess();
- SwPrintData aPrtData( rIDDA.getPrintData() );
- aPrtData.SetPrintSingleJobs( bCurSinglePrintJobs );
- rIDDA.setPrintData( aPrtData );
// #i25686# printing should not be done asynchronously to prevent
dangling offices
// when mail merge is called as command line macro
aMergeDesc.aPrintOptions = m_aPrintSettings;
@@ -882,7 +874,6 @@ void SAL_CALL SwXMailMerge::setPropertyValue(
case WID_DATA_COMMAND_TYPE : pData = &m_nDataCommandType;
break;
case WID_OUTPUT_TYPE : pData = &m_nOutputType; break;
case WID_ESCAPE_PROCESSING : pData = &m_bEscapeProcessing;
break;
- case WID_SINGLE_PRINT_JOBS : pData = &m_bSinglePrintJobs;
break;
case WID_FILE_NAME_FROM_COLUMN : pData =
&m_bFileNameFromColumn; break;
case WID_FILE_NAME_PREFIX : pData = &m_aFileNamePrefix;
break;
case WID_MAIL_SUBJECT: pData = &m_sSubject; break;
@@ -952,8 +943,6 @@ void SAL_CALL SwXMailMerge::setPropertyValue(
bOK = rValue >>= m_nOutputType;
else if (pData == &m_bEscapeProcessing)
bOK = rValue >>= m_bEscapeProcessing;
- else if (pData == &m_bSinglePrintJobs)
- bOK = rValue >>= m_bSinglePrintJobs;
else if (pData == &m_bFileNameFromColumn)
bOK = rValue >>= m_bFileNameFromColumn;
else if (pData == &m_aFileNamePrefix)
@@ -1033,7 +1022,6 @@ uno::Any SAL_CALL SwXMailMerge::getPropertyValue(
case WID_DATA_COMMAND_TYPE : aRet <<= m_nDataCommandType;
break;
case WID_OUTPUT_TYPE : aRet <<= m_nOutputType; break;
case WID_ESCAPE_PROCESSING : aRet <<= m_bEscapeProcessing;
break;
- case WID_SINGLE_PRINT_JOBS : aRet <<= m_bSinglePrintJobs;
break;
case WID_FILE_NAME_FROM_COLUMN : aRet <<= m_bFileNameFromColumn;
break;
case WID_FILE_NAME_PREFIX : aRet <<= m_aFileNamePrefix; break;
case WID_MAIL_SUBJECT: aRet <<= m_sSubject; break;
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index 63250ede8526..3c57e20c6c8c 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -114,7 +114,6 @@ enum SwPrintSettingsPropertyHandles
HANDLE_PRINTSET_FAX_NAME,
HANDLE_PRINTSET_PAPER_FROM_SETUP,
HANDLE_PRINTSET_TABLES,
- HANDLE_PRINTSET_SINGLE_JOBS,
HANDLE_PRINTSET_EMPTY_PAGES,
HANDLE_PRINTSET_PROSPECT_RTL,
HANDLE_PRINTSET_PLACEHOLDER,
@@ -200,7 +199,6 @@ static rtl::Reference<ChainablePropertySetInfo>
lcl_createPrintSettingsInfo()
{ OUString( "PrintPaperFromSetup" ), HANDLE_PRINTSET_PAPER_FROM_SETUP
, cppu::UnoType<bool>::get(), PROPERTY_NONE},
{ OUString( "PrintTables" ), HANDLE_PRINTSET_TABLES
, cppu::UnoType<bool>::get(), PROPERTY_NONE},
{ OUString( "PrintTextPlaceholder"), HANDLE_PRINTSET_PLACEHOLDER
, cppu::UnoType<bool>::get(), PROPERTY_NONE},
- { OUString( "PrintSingleJobs" ), HANDLE_PRINTSET_SINGLE_JOBS
, cppu::UnoType<bool>::get(), PROPERTY_NONE},
{ OUString( "PrintEmptyPages" ), HANDLE_PRINTSET_EMPTY_PAGES
, cppu::UnoType<bool>::get(), PROPERTY_NONE},
{ OUString(), 0, css::uno::Type(), 0}
};
@@ -347,11 +345,6 @@ void SwXPrintSettings::_setSingleValue( const
comphelper::PropertyInfo & rInfo,
mpPrtOpt->SetPrintBlackFont(tryBoolAccess(rInfo.maName, rValue));
}
break;
- case HANDLE_PRINTSET_SINGLE_JOBS:
- {
- mpPrtOpt->SetPrintSingleJobs(tryBoolAccess(rInfo.maName, rValue));
- }
- break;
case HANDLE_PRINTSET_PAPER_FROM_SETUP:
{
mpPrtOpt->SetPaperFromSetup(tryBoolAccess(rInfo.maName, rValue));
@@ -458,9 +451,6 @@ void SwXPrintSettings::_getSingleValue( const
comphelper::PropertyInfo & rInfo,
case HANDLE_PRINTSET_BLACK_FONTS:
rValue <<= mpPrtOpt->IsPrintBlackFont();
break;
- case HANDLE_PRINTSET_SINGLE_JOBS:
- rValue <<= mpPrtOpt->IsPrintSingleJobs();
- break;
case HANDLE_PRINTSET_EMPTY_PAGES:
rValue <<= mpPrtOpt->IsPrintEmptyPages();
break;
diff --git a/sw/source/uibase/uno/unotxdoc.cxx
b/sw/source/uibase/uno/unotxdoc.cxx
index fdbb3f28b7d0..75d4776e4b18 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -2452,7 +2452,6 @@ static void lcl_SavePrintUIOptionsToDocumentPrintData(
aDocPrintData.SetPrintProspect_RTL( rPrintUIOptions.IsPrintProspectRTL() );
aDocPrintData.SetPrintPageBackground(
rPrintUIOptions.IsPrintPageBackground() );
aDocPrintData.SetPrintBlackFont(
rPrintUIOptions.IsPrintWithBlackTextColor() );
- // aDocPrintData.SetPrintSingleJobs( b ); handled by File/Print dialog
itself
// arDocPrintData.SetFaxName( s ); n/a in File/Print dialog
aDocPrintData.SetPrintHiddenText( rPrintUIOptions.IsPrintHiddenText() );
aDocPrintData.SetPrintTextPlaceholder(
rPrintUIOptions.IsPrintTextPlaceholders() );
diff --git a/sw/uiconfig/swriter/ui/mailmerge.ui
b/sw/uiconfig/swriter/ui/mailmerge.ui
index f81e6f052d9a..0f5fe76f0bf0 100644
--- a/sw/uiconfig/swriter/ui/mailmerge.ui
+++ b/sw/uiconfig/swriter/ui/mailmerge.ui
@@ -360,21 +360,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkCheckButton" id="singlejobs">
- <property name="label" translatable="yes"
context="mailmerge|singlejobs">_Single print jobs</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="use-underline">True</property>
- <property name="draw-indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
<child>
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
