diff options
Diffstat (limited to 'sw/source/ui/envelp/mailmrge.cxx')
-rw-r--r-- | sw/source/ui/envelp/mailmrge.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 14cc5b297ead..2c04b06bfe27 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -224,6 +224,14 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, aAttachED.Show(sal_False); aAttachPB.Show(sal_False); + SwNewDBMgr* pNewDBMgr = rSh.GetNewDBMgr(); + if(_xConnection.is()) + pNewDBMgr->GetColumnNames(&aAddressFldLB, _xConnection, rTableName); + else + pNewDBMgr->GetColumnNames(&aAddressFldLB, rDBName, rTableName); + for(sal_uInt16 nEntry = 0; nEntry < aAddressFldLB.GetEntryCount(); nEntry++) + aColumnLB.InsertEntry(aAddressFldLB.GetEntry(nEntry)); + Point aMailPos = aMailingRB.GetPosPixel(); Point aFilePos = aFileRB.GetPosPixel(); aFilePos.X() -= (aFilePos.X() - aMailPos.X()) /2; @@ -375,14 +383,6 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, aFromNF.SetMax(SAL_MAX_INT32); aToNF.SetMax(SAL_MAX_INT32); - SwNewDBMgr* pNewDBMgr = rSh.GetNewDBMgr(); - if(_xConnection.is()) - pNewDBMgr->GetColumnNames(&aAddressFldLB, _xConnection, rTableName); - else - pNewDBMgr->GetColumnNames(&aAddressFldLB, rDBName, rTableName); - for(sal_uInt16 nEntry = 0; nEntry < aAddressFldLB.GetEntryCount(); nEntry++) - aColumnLB.InsertEntry(aAddressFldLB.GetEntry(nEntry)); - aAddressFldLB.SelectEntry(C2S("EMAIL")); String sPath(pModOpt->GetMailingPath()); |