ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#144771 Preserve last options in Mail Merge Print

Browse Source 
Add missing options of Mail Merge dialog:
- m_bIsOutputFile (false = printer)
- m_bIsSingleDoc (false = individual documents)
- m_sFileFormat

Change-Id: I15ec94a28bb9a592adc0b6b792a981de43b645e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/203942
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
This commit is contained in:
Laurent Balland
2026-05-27 15:54:04 +02:00
committed by Michael Weghorn
parent efaff8e0aa
commit f0ed53f36d
3 changed files with 50 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/inc/modcfg.hxx
+21
View File
@@ -178,6 +178,8 @@ 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_bIsOutputFile; // FormLetter/FileOutput
bool m_bIsSingleDoc; // FormLetter/FileOutput/SingleDoc
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'
@@ -185,6 +187,7 @@ class SAL_DLLPUBLIC_RTTI SwMiscConfig final : public utl::ConfigItem
OUString m_sNameFromColumn; // FormLetter/FileOutput/FileName/FromDatabaseField (string!)
OUString m_sPasswordFromColumn; // FormLetter/FileOutput/FilePassword/FromDatabaseField (string!)
OUString m_sMailingPath; // FormLetter/FileOutput/Path
OUString m_sFileFormat; // FormLetter/FileOutput/FileFormat
OUString m_sMailName; // FormLetter/FileOutput/FileName/FromManualSetting (string!)
static const css::uno::Sequence<OUString>& GetPropertyNames();
@@ -322,6 +325,20 @@ public:
void SetMailingFormats( MailTextFormats nSet ) { m_aMiscConfig.m_nMailingFormats = nSet;
m_aMiscConfig.SetModified();}
bool IsOutputFile() const { return m_aMiscConfig.m_bIsOutputFile; }
void SetIsOutputFile( bool bSet )
{
m_aMiscConfig.SetModified();
m_aMiscConfig.m_bIsOutputFile = bSet;
}
bool IsSingleDoc() const { return m_aMiscConfig.m_bIsSingleDoc; }
void SetIsSingleDoc( bool bSet )
{
m_aMiscConfig.SetModified();
m_aMiscConfig.m_bIsSingleDoc = bSet;
}
bool IsNameFromColumn() const { return m_aMiscConfig.m_bIsNameFromColumn; }
void SetIsNameFromColumn( bool bSet )
{
@@ -345,6 +362,10 @@ public:
void SetPasswordFromColumn( const OUString& rSet ) { m_aMiscConfig.m_sPasswordFromColumn = rSet;
m_aMiscConfig.SetModified();}
const OUString& GetFileFormat() const { return m_aMiscConfig.m_sFileFormat; }
void SetFileFormat(const OUString& sPath) { m_aMiscConfig.m_sFileFormat = sPath;
m_aMiscConfig.SetModified();}
const OUString& GetMailingPath() const { return m_aMiscConfig.m_sMailingPath; }
void SetMailingPath(const OUString& sPath) { m_aMiscConfig.m_sMailingPath = sPath;
m_aMiscConfig.SetModified();}
sw/source/ui/envelp/mailmrge.cxx
+21 -11
View File
@@ -231,13 +231,16 @@ SwMailMergeDlg::SwMailMergeDlg(weld::Window* pParent, SwWrtShell& rShell,
m_xPathPB->connect_clicked(LINK(this, SwMailMergeDlg, InsertPathHdl));
m_xPrinterRB->connect_toggled(LINK(this, SwMailMergeDlg, OutputTypeHdl));
m_xFileRB->connect_toggled(LINK(this, SwMailMergeDlg, OutputTypeHdl));
//#i63267# printing might be disabled
bool bIsPrintable = !Application::GetSettings().GetMiscSettings().GetDisablePrinting();
m_xPrinterRB->set_sensitive(bIsPrintable);
OutputTypeHdl(bIsPrintable ? *m_xPrinterRB : *m_xFileRB);
bool bIsPrinter = bIsPrintable && !m_pModOpt->IsOutputFile();
m_xPrinterRB->set_active( bIsPrinter );
m_xPrinterRB->connect_toggled(LINK(this, SwMailMergeDlg, OutputTypeHdl));
m_xFileRB->set_active( !bIsPrinter );
m_xFileRB->connect_toggled(LINK(this, SwMailMergeDlg, OutputTypeHdl));
OutputTypeHdl( bIsPrinter ? *m_xPrinterRB : *m_xFileRB );
m_xGenerateFromDataBaseCB->connect_toggled(LINK(this, SwMailMergeDlg, FilenameHdl));
bool bColumn = m_pModOpt->IsNameFromColumn();
@@ -245,8 +248,9 @@ SwMailMergeDlg::SwMailMergeDlg(weld::Window* pParent, SwWrtShell& rShell,
m_xGenerateFromDataBaseCB->set_active(true);
FilenameHdl(*m_xGenerateFromDataBaseCB);
m_xSaveSingleDocRB->set_active(true);
m_xSaveSingleDocRB->set_active(m_pModOpt->IsSingleDoc());
m_xSaveSingleDocRB->connect_toggled(LINK(this, SwMailMergeDlg, SaveTypeHdl));
m_xSaveIndividualRB->set_active(!m_pModOpt->IsSingleDoc());
m_xSaveIndividualRB->connect_toggled(LINK(this, SwMailMergeDlg, SaveTypeHdl));
SaveTypeHdl(*m_xSaveSingleDocRB);
@@ -319,7 +323,8 @@ SwMailMergeDlg::SwMailMergeDlg(weld::Window* pParent, SwWrtShell& rShell,
+ ":default_first");
uno::Reference< container::XEnumeration > xList = xQuery->createSubSetEnumerationByQuery(sCommand);
static constexpr OUStringLiteral sName(u"Name");
sal_Int32 nODT = -1;
sal_Int32 nFilterIndex = -1;
const OUString sInitialFilter = m_pModOpt->GetFileFormat().isEmpty() ? "writer8" : m_pModOpt->GetFileFormat();
while(xList->hasMoreElements()) {
comphelper::SequenceAsHashMap aFilter(xList->nextElement());
const OUString sFilter = aFilter.getUnpackedValueOrDefault(sName, OUString());
@@ -333,12 +338,13 @@ SwMailMergeDlg::SwMailMergeDlg(weld::Window* pParent, SwWrtShell& rShell,
if (pProp != std::cend(aFilterProperties))
pProp->Value >>= sUIName2;
if( !sUIName2.isEmpty() ) {
if( sFilter == "writer8" )
nODT = m_xFilterLB->get_count();
if( sFilter == sInitialFilter )
nFilterIndex = m_xFilterLB->get_count();
m_xFilterLB->append(sFilter, sUIName2);
}
}
m_xFilterLB->set_active( nODT );
m_xFilterLB->set_active( nFilterIndex );
FileFormatHdl( *m_xFilterLB );
} catch (const uno::Exception&) {
}
}
@@ -388,7 +394,7 @@ IMPL_LINK_NOARG(SwMailMergeDlg, SaveTypeHdl, weld::Toggleable&, void)
{
bool bIndividual = m_xSaveIndividualRB->get_active();
m_xGenerateFromDataBaseCB->set_sensitive( bIndividual );
m_xGenerateFromDataBaseCB->set_sensitive( bIndividual && m_xFileRB->get_active() );
if( bIndividual )
{
FilenameHdl(*m_xGenerateFromDataBaseCB);
@@ -410,7 +416,7 @@ IMPL_LINK_NOARG(SwMailMergeDlg, SaveTypeHdl, weld::Toggleable&, void)
IMPL_LINK( SwMailMergeDlg, FilenameHdl, weld::Toggleable&, rBox, void )
{
bool bEnable = rBox.get_active();
bool bEnable = rBox.get_active() && m_xFileRB->get_active();
m_xColumnFT->set_sensitive( bEnable );
m_xColumnLB->set_sensitive(bEnable);
m_xPathFT->set_sensitive( bEnable );
@@ -482,11 +488,13 @@ bool SwMailMergeDlg::ExecQryShell()
m_pImpl->xSelSupp->removeSelectionChangeListener( m_pImpl->xChgLstnr );
}
m_pModOpt->SetIsOutputFile( m_xFileRB->get_active() );
if (m_xPrinterRB->get_active())
m_nMergeType = DBManagerOptions::MailMergePrinter;
else {
m_nMergeType = DBManagerOptions::MailMergeFile;
m_pModOpt->SetMailingPath( GetURLfromPath() );
m_pModOpt->SetIsSingleDoc( m_xSaveSingleDocRB->get_active() );
m_pModOpt->SetIsNameFromColumn(m_xGenerateFromDataBaseCB->get_active());
m_pModOpt->SetIsFileEncryptedFromColumn(m_xPasswordCB->get_active());
@@ -494,8 +502,10 @@ bool SwMailMergeDlg::ExecQryShell()
{
m_pModOpt->SetNameFromColumn(m_xColumnLB->get_active_text());
m_pModOpt->SetPasswordFromColumn(m_xPasswordLB->get_active_text());
if (m_xFilterLB->get_active() != -1)
if (m_xFilterLB->get_active() != -1) {
m_sSaveFilter = m_xFilterLB->get_active_id();
m_pModOpt->SetFileFormat( m_sSaveFilter );
}
m_sFilename = OUString();
} else {
//#i97667# reset column name - otherwise it's remembered from the last run
sw/source/uibase/config/modcfg.cxx
+8
View File
@@ -1168,6 +1168,8 @@ SwMiscConfig::SwMiscConfig() :
m_bShowIndexPreview(false),
m_bGrfToGalleryAsLnk(true),
m_bNumAlignSize(true),
m_bIsOutputFile(false),
m_bIsSingleDoc(true),
m_bIsNameFromColumn(true),
m_bIsPasswordFromColumn(false),
m_bAskForMailMergeInPrint(true),
@@ -1233,6 +1235,9 @@ void SwMiscConfig::ImplCommit()
case 10: pValues[nProp] <<= m_bAskForMailMergeInPrint; break;
case 11: pValues[nProp] <<= m_sPasswordFromColumn; break;
case 12: pValues[nProp] <<= m_bIsPasswordFromColumn; break;
case 13: pValues[nProp] <<= m_bIsOutputFile; break;
case 14: pValues[nProp] <<= m_bIsSingleDoc; break;
case 15: pValues[nProp] <<= m_sFileFormat; break;
}
}
PutProperties(aNames, aValues);
@@ -1266,6 +1271,9 @@ void SwMiscConfig::Load()
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;
case 13: m_bIsOutputFile = *o3tl::doAccess<bool>(pValues[nProp]); break;
case 14: m_bIsSingleDoc = *o3tl::doAccess<bool>(pValues[nProp]); break;
case 15: pValues[nProp] >>= sTmp; m_sFileFormat = sTmp; break;
}
}
}