summaryrefslogtreecommitdiff
path: root/sw/source/ui/envelp/mailmrge.cxx
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-05-02 12:44:55 +0200
committerJan Holesovsky <kendy@collabora.com>2014-05-02 21:32:23 +0200
commitaf10cb2c9cf2ea331850a054095e94110670de96 (patch)
treefb964303f6384c0c917e8af5ec284cf423274789 /sw/source/ui/envelp/mailmrge.cxx
parentbd14194a2c3c4459aa30948b909cff47028b28f2 (diff)
Rename SwDBMgr -> SwDBManager.
We were renaming it recently from SwNewDBMgr, let's use the full name to make it more readable. Change-Id: I2ceb3f1790321b70d5936c35e13870439969e64d
Diffstat (limited to 'sw/source/ui/envelp/mailmrge.cxx')
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 00efa604f004..e06bdbd7a0de 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -352,11 +352,11 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
aFromNF.SetMax(SAL_MAX_INT32);
aToNF.SetMax(SAL_MAX_INT32);
- SwDBMgr* pDBMgr = rSh.GetDBMgr();
+ SwDBManager* pDBManager = rSh.GetDBManager();
if(_xConnection.is())
- pDBMgr->GetColumnNames(&aAddressFldLB, _xConnection, rTblName);
+ pDBManager->GetColumnNames(&aAddressFldLB, _xConnection, rTblName);
else
- pDBMgr->GetColumnNames(&aAddressFldLB, rSourceName, rTblName);
+ pDBManager->GetColumnNames(&aAddressFldLB, rSourceName, rTblName);
for(sal_Int32 nEntry = 0; nEntry < aAddressFldLB.GetEntryCount(); ++nEntry)
aColumnLB.InsertEntry(aAddressFldLB.GetEntry(nEntry));
@@ -647,7 +647,7 @@ bool SwMailMergeDlg::ExecQryShell()
{
pImpl->xSelSupp->removeSelectionChangeListener( pImpl->xChgLstnr );
}
- SwDBMgr* pMgr = rSh.GetDBMgr();
+ SwDBManager* pMgr = rSh.GetDBManager();
if (aPrinterRB.IsChecked())
nMergeType = DBMGR_MERGE_MAILMERGE;