summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Specht <os@openoffice.org>2001-01-19 14:14:21 +0000
committerOliver Specht <os@openoffice.org>2001-01-19 14:14:21 +0000
commit536600bd9517d8bd4386bd165c0565c5e8d82a6a (patch)
treed72902b6493531b84446a9cb4cdab1d0095b5c36
parent2e89e665e40d7bcf885f17783ec8c99aff19c41e (diff)
module options configuration completed
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index f260106caff9..e739a58730ed 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: mailmrge.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: os $ $Date: 2000-11-13 08:39:05 $
+ * last change: $Author: os $ $Date: 2001-01-19 15:14:21 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -225,7 +225,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
aColumnRB.SetClickHdl(aLk);
aFilenameRB.SetClickHdl(aLk);
BOOL bColumn = pModOpt->IsNameFromColumn();
- if (bColumn)
+ if(bColumn)
aColumnRB.Check();
else
aFilenameRB.Check();
@@ -255,7 +255,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
aFilenameED.SetText(sMailName);
}
else
- aColumnLB.SelectEntry(sMailName);
+ aColumnLB.SelectEntry(pModOpt->GetNameFromColumn());
if (aAddressFldLB.GetSelectEntryCount() == 0)
aAddressFldLB.SelectEntryPos(0);
@@ -429,12 +429,12 @@ void SwMailMergeDlg::ExecQryShell(BOOL bVisible)
sPath.Copy(sPath.Len()-sDelim.Len()).CompareTo(sDelim) != COMPARE_EQUAL)
sPath += sDelim;
- pModOpt->SetNameFromColumn(aColumnRB.IsChecked());
+ pModOpt->SetIsNameFromColumn(aColumnRB.IsChecked());
if (aColumnRB.IsChecked())
{
pMgr->SetEMailColumn(aColumnLB.GetSelectEntry());
- pModOpt->SetMailName(aColumnLB.GetSelectEntry());
+ pModOpt->SetNameFromColumn(aColumnLB.GetSelectEntry());
}
else
{