summaryrefslogtreecommitdiff
path: root/sw/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui')
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx10
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx2
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx59
3 files changed, 69 insertions, 2 deletions
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 20097ec6c385..a715f6280c44 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -645,11 +645,21 @@ bool AbstractMailMergeDlg_Impl::IsGenerateFromDataBase() const
return pDlg->IsGenerateFromDataBase();
}
+bool AbstractMailMergeDlg_Impl::IsFileEncyrptedFromDataBase() const
+{
+ return pDlg->IsFileEncyrptedFromDataBase();
+}
+
OUString AbstractMailMergeDlg_Impl::GetColumnName() const
{
return pDlg->GetColumnName();
}
+OUString AbstractMailMergeDlg_Impl::GetPasswordColumnName() const
+{
+ return pDlg->GetPasswordColumnName();
+}
+
OUString AbstractMailMergeDlg_Impl::GetTargetURL() const
{
return pDlg->GetTargetURL();
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 295b56f92348..3a7ecc581512 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -507,7 +507,9 @@ class AbstractMailMergeDlg_Impl : public AbstractMailMergeDlg
virtual css::uno::Reference< css::sdbc::XResultSet> GetResultSet() const override;
virtual bool IsSaveSingleDoc() const override;
virtual bool IsGenerateFromDataBase() const override;
+ virtual bool IsFileEncyrptedFromDataBase() const override;
virtual OUString GetColumnName() const override;
+ virtual OUString GetPasswordColumnName() const override;
virtual OUString GetTargetURL() const override;
};
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index f9648fdd83fa..0eca50378902 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -170,6 +170,10 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell,
get(m_pFormatRtfCB, "rtf");
get(m_pFormatSwCB, "swriter");
+ get(m_pPasswordCB, "passwd-check");
+ get(m_pPasswordFT, "passwd-label");
+ get(m_pPasswordLB, "passwd-combobox");
+
get(m_pOkBTN, "ok");
m_pSingleJobsCB->Show(false); // not supported in since cws printerpullpages anymore
@@ -184,6 +188,9 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell,
m_pAttachFT->Show(false);
m_pAttachED->Show(false);
m_pAttachPB->Show(false);
+ m_pPasswordCB->Show(false);
+ m_pPasswordFT->Show(false);
+ m_pPasswordLB->Show(false);
Point aMailPos = m_pMailingRB->GetPosPixel();
Point aFilePos = m_pFileRB->GetPosPixel();
@@ -276,13 +283,21 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell,
m_pFromNF->SetMax(SAL_MAX_INT32);
m_pToNF->SetMax(SAL_MAX_INT32);
+ Link<ListBox&,void> aLk3 = LINK(this, SwMailMergeDlg, FileFormatHdl);
+ m_pFilterLB->SetSelectHdl(aLk3);
+
SwDBManager* pDBManager = rSh.GetDBManager();
+
if(_xConnection.is())
SwDBManager::GetColumnNames(m_pAddressFieldLB, _xConnection, rTableName);
else
pDBManager->GetColumnNames(m_pAddressFieldLB, rSourceName, rTableName);
+
for(sal_Int32 nEntry = 0; nEntry < m_pAddressFieldLB->GetEntryCount(); ++nEntry)
+ {
m_pColumnLB->InsertEntry(m_pAddressFieldLB->GetEntry(nEntry));
+ m_pPasswordLB->InsertEntry(m_pAddressFieldLB->GetEntry(nEntry));
+ }
m_pAddressFieldLB->SelectEntry("EMAIL");
@@ -297,15 +312,23 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell,
else
m_pPathED->SetText(aURL.GetFull());
- if (!bColumn ) {
+ if (!bColumn )
+ {
m_pColumnLB->SelectEntry("NAME");
- } else
+ m_pPasswordLB->SelectEntry("PASSWORD");
+ }
+ else
+ {
m_pColumnLB->SelectEntry(pModOpt->GetNameFromColumn());
+ m_pPasswordLB->SelectEntry(pModOpt->GetPasswordFromColumn());
+ }
if (m_pAddressFieldLB->GetSelectedEntryCount() == 0)
m_pAddressFieldLB->SelectEntryPos(0);
if (m_pColumnLB->GetSelectedEntryCount() == 0)
m_pColumnLB->SelectEntryPos(0);
+ if (m_pPasswordLB->GetSelectedEntryCount() == 0)
+ m_pPasswordLB->SelectEntryPos(0);
const bool bEnable = m_aSelection.getLength() != 0;
m_pMarkedRB->Enable(bEnable);
@@ -437,6 +460,9 @@ IMPL_LINK( SwMailMergeDlg, OutputTypeHdl, Button *, pBtn, void )
m_pFilterFT->Enable(false);
m_pFilterLB->Enable(false);
m_pGenerateFromDataBaseCB->Enable(false);
+ m_pPasswordCB->Enable(false);
+ m_pPasswordFT->Enable(false);
+ m_pPasswordLB->Enable(false);
}
}
@@ -455,6 +481,9 @@ IMPL_LINK( SwMailMergeDlg, SaveTypeHdl, Button*, pBtn, void )
m_pPathPB->Enable( false );
m_pFilterFT->Enable( false );
m_pFilterLB->Enable( false );
+ m_pPasswordCB->Enable(false);
+ m_pPasswordFT->Enable(false);
+ m_pPasswordLB->Enable(false);
}
}
@@ -468,6 +497,29 @@ IMPL_LINK( SwMailMergeDlg, FilenameHdl, Button*, pBox, void )
m_pPathPB->Enable( bEnable );
m_pFilterFT->Enable( bEnable );
m_pFilterLB->Enable( bEnable );
+
+ if(m_pFilterLB->GetSelectedEntry() == "PDF - Portable Document Format")
+ {
+ m_pPasswordCB->Show(true);
+ m_pPasswordFT->Show(true);
+ m_pPasswordLB->Show(true);
+ m_pPasswordCB->Enable(true);
+ m_pPasswordFT->Enable(true);
+ m_pPasswordLB->Enable(true);
+ }
+}
+
+IMPL_LINK_NOARG( SwMailMergeDlg, FileFormatHdl, ListBox&, void )
+{
+ OUString sSelectedFilter = m_pFilterLB->GetSelectedEntry();
+ bool bEnable = sSelectedFilter == "PDF - Portable Document Format";
+
+ m_pPasswordCB->Show(bEnable);
+ m_pPasswordFT->Show(bEnable);
+ m_pPasswordLB->Show(bEnable);
+ m_pPasswordCB->Enable(bEnable);
+ m_pPasswordFT->Enable(bEnable);
+ m_pPasswordLB->Enable(bEnable);
}
IMPL_LINK_NOARG(SwMailMergeDlg, ModifyHdl, Edit&, void)
@@ -507,15 +559,18 @@ bool SwMailMergeDlg::ExecQryShell()
nMergeType = DBMGR_MERGE_FILE;
pModOpt->SetMailingPath( GetURLfromPath() );
pModOpt->SetIsNameFromColumn(m_pGenerateFromDataBaseCB->IsChecked());
+ pModOpt->SetIsFileEncyrptedFromColumn(m_pPasswordCB->IsChecked());
if (!AskUserFilename()) {
pModOpt->SetNameFromColumn(m_pColumnLB->GetSelectedEntry());
+ pModOpt->SetPasswordFromColumn(m_pPasswordLB->GetSelectedEntry());
if( m_pFilterLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND)
m_sSaveFilter = *static_cast<const OUString*>(m_pFilterLB->GetSelectedEntryData());
m_sFilename = OUString();
} else {
//#i97667# reset column name - otherwise it's remembered from the last run
pModOpt->SetNameFromColumn(OUString());
+ pModOpt->SetPasswordFromColumn(OUString());
//start save as dialog
OUString sFilter;
m_sFilename = SwMailMergeHelper::CallSaveAsDialog(GetFrameWeld(), sFilter);
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 19:30:41 +0000