Rename SwDBMgr -> SwDBManager.

We were renaming it recently from SwNewDBMgr, let's use the full name to make
it more readable.

Change-Id: I2ceb3f1790321b70d5936c35e13870439969e64d

12 files changed, 36 insertions, 36 deletions

diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index 4cd330e7ff88..283f74e48a11 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -331,7 +331,7 @@ IMPL_LINK_NOARG(SwAddressListDialog, FilterHdl_Impl)
 
 IMPL_LINK_NOARG(SwAddressListDialog, LoadHdl_Impl)
 {
-    const OUString sNewSource = SwDBMgr::LoadAndRegisterDataSource();
+    const OUString sNewSource = SwDBManager::LoadAndRegisterDataSource();
     if(!sNewSource.isEmpty())
     {
         SvTreeListEntry* pNewSource = m_pListLB->InsertEntry(sNewSource);
@@ -594,7 +594,7 @@ void SwAddressListDialog::DetectTablesAndQueries(
             m_xDBContext->getByName(m_aDBData.sDataSource) >>= xSourceProperties;
             pUserData->sURL = lcl_getFlatURL( xSourceProperties );
 
-            pUserData->xColumnsSupplier = SwDBMgr::GetColumnSupplier(pUserData->xConnection,
+            pUserData->xColumnsSupplier = SwDBManager::GetColumnSupplier(pUserData->xConnection,
                                     m_aDBData.sCommand,
                                     m_aDBData.nCommandType == CommandType::TABLE ?
                                             SW_DB_SELECT_TABLE : SW_DB_SELECT_QUERY );
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index ee02e42dd7d4..9a7fe34d2225 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -322,7 +322,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
                     }
                     else
                     {
-                        pNew->nDBNumFmt = SwDBMgr::GetDbtoolsClient().getDefaultNumberFormat(xCol,
+                        pNew->nDBNumFmt = SwDBManager::GetDbtoolsClient().getDefaultNumberFormat(xCol,
                                 xDocNumberFormatTypes, LanguageTag( rSh.GetCurLang() ).getLocale());
                     }
 
@@ -950,7 +950,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
     // we don't have a cursor, so we have to create our own RowSet
     if ( !xResultSet.is() )
     {
-        xResultSet = SwDBMgr::createCursor(aDBData.sDataSource,aDBData.sCommand,aDBData.nCommandType,xConnection);
+        xResultSet = SwDBManager::createCursor(aDBData.sDataSource,aDBData.sCommand,aDBData.nCommandType,xConnection);
         bDisposeResultSet = xResultSet.is();
     }
 
@@ -1286,7 +1286,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
                             Reference< XPropertySet > xColumnProps;
                             xCols->getByName(pDBCol->pColInfo->sColumn) >>= xColumnProps;
 
-                            pFld->SetExpansion( SwDBMgr::GetDBField(
+                            pFld->SetExpansion( SwDBManager::GetDBField(
                                                 xColumnProps,
                                                 aDBFormatData,
                                                 &nValue ) );
@@ -1320,7 +1320,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
                             double nValue = DBL_MAX;
                             Reference< XPropertySet > xColumnProps;
                             xCols->getByName(pDBCol->pColInfo->sColumn) >>= xColumnProps;
-                            sIns = SwDBMgr::GetDBField(
+                            sIns = SwDBManager::GetDBField(
                                                 xColumnProps,
                                                 aDBFormatData,
                                                 &nValue );
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index c0bb2d074881..a0f915e6f287 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -277,7 +277,7 @@ void SwMailMergeWizard::UpdateRoadmap()
   -----------------------------------------------------------------------*/
 void SwMailMergeWizard::CreateTargetDocument()
 {
-    GetSwView()->GetWrtShell().GetDBMgr()->
+    GetSwView()->GetWrtShell().GetDBManager()->
                 MergeDocuments( m_rConfigItem, *GetSwView() );
     m_rConfigItem.SetMergeDone();
     if( m_rConfigItem.GetTargetView() )
diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx
index ddde78ea49b7..ec0407b189f0 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.cxx
+++ b/sw/source/ui/dbui/mmpreparemergepage.cxx
@@ -120,7 +120,7 @@ IMPL_LINK( SwMailMergePrepareMergePage, MoveHdl_Impl, void*, pCtrl)
     ::svx::ODataAccessDescriptor aDescriptor(aArgs);
     SwWrtShell& rSh = m_pWizard->GetSwView()->GetWrtShell();
     SwMergeDescriptor aMergeDesc( DBMGR_MERGE, rSh, aDescriptor );
-    rSh.GetDBMgr()->MergeNew(aMergeDesc);
+    rSh.GetDBManager()->MergeNew(aMergeDesc);
     return 0;
 }
 
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index de4c780ea7dc..92928e37319c 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -782,9 +782,9 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwEnvDlg ( Window* pPa
 }
 
 AbstractSwLabDlg* SwAbstractDialogFactory_Impl::CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet,
-                                                     SwDBMgr* pDBMgr, bool bLabel)
+                                                     SwDBManager* pDBManager, bool bLabel)
 {
-    SwLabDlg* pDlg = new SwLabDlg(pParent, rSet, pDBMgr, bLabel);
+    SwLabDlg* pDlg = new SwLabDlg(pParent, rSet, pDBManager, bLabel);
     return new AbstractSwLabDlg_Impl(pDlg);
 }
 
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 10c584d1462d..21db21ea2965 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -403,7 +403,7 @@ public:
         SwField* pField, bool bNextButton = false) SAL_OVERRIDE;
     virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert ) SAL_OVERRIDE;
     virtual AbstractSwLabDlg* CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet,
-                                                     SwDBMgr* pDBMgr, bool bLabel) SAL_OVERRIDE;
+                                                     SwDBManager* pDBManager, bool bLabel) SAL_OVERRIDE;
 
     virtual SwLabDlgMethod GetSwLabDlgStaticMethod () SAL_OVERRIDE;
     virtual SfxAbstractTabDialog* CreateSwParaDlg ( Window *pParent,
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index bd0eebc77e5e..b4172fe81664 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -242,14 +242,14 @@ IMPL_LINK( SwEnvPage, DatabaseHdl, ListBox *, pListBox )
     if (pListBox == m_pDatabaseLB)
     {
         sActDBName = pListBox->GetSelectEntry();
-        pSh->GetDBMgr()->GetTableNames(m_pTableLB, sActDBName);
+        pSh->GetDBManager()->GetTableNames(m_pTableLB, sActDBName);
         sActDBName += OUString(DB_DELIM);
     }
     else
     {
         sActDBName = comphelper::string::setToken(sActDBName, 1, DB_DELIM, m_pTableLB->GetSelectEntry());
     }
-    pSh->GetDBMgr()->GetColumnNames(m_pDBFieldLB, m_pDatabaseLB->GetSelectEntry(),
+    pSh->GetDBManager()->GetColumnNames(m_pDBFieldLB, m_pDatabaseLB->GetSelectEntry(),
                                        m_pTableLB->GetSelectEntry());
     return 0;
 }
@@ -284,10 +284,10 @@ IMPL_LINK_NOARG(SwEnvPage, SenderHdl)
 
 void SwEnvPage::InitDatabaseBox()
 {
-    if (pSh->GetDBMgr())
+    if (pSh->GetDBManager())
     {
         m_pDatabaseLB->Clear();
-        Sequence<OUString> aDataNames = SwDBMgr::GetExistingDatabaseNames();
+        Sequence<OUString> aDataNames = SwDBManager::GetExistingDatabaseNames();
         const OUString* pDataNames = aDataNames.getConstArray();
 
         for (sal_Int32 i = 0; i < aDataNames.getLength(); i++)
@@ -296,10 +296,10 @@ void SwEnvPage::InitDatabaseBox()
         OUString sDBName = sActDBName.getToken( 0, DB_DELIM );
         OUString sTableName = sActDBName.getToken( 1, DB_DELIM );
         m_pDatabaseLB->SelectEntry(sDBName);
-        if (pSh->GetDBMgr()->GetTableNames(m_pTableLB, sDBName))
+        if (pSh->GetDBManager()->GetTableNames(m_pTableLB, sDBName))
         {
             m_pTableLB->SelectEntry(sTableName);
-            pSh->GetDBMgr()->GetColumnNames(m_pDBFieldLB, sDBName, sTableName);
+            pSh->GetDBManager()->GetColumnNames(m_pDBFieldLB, sDBName, sTableName);
         }
         else
             m_pDBFieldLB->Clear();
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index e6980b1269bf..00ca91ef670c 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -81,7 +81,7 @@ void SwLabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
     {
         if(m_bLabel)
         {
-            ((SwLabPage*)&rPage)->SetDBMgr(pDBMgr);
+            ((SwLabPage*)&rPage)->SetDBManager(pDBManager);
             ((SwLabPage*)&rPage)->InitDatabaseBox();
         }
         else
@@ -92,10 +92,10 @@ void SwLabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
 }
 
 SwLabDlg::SwLabDlg(Window* pParent, const SfxItemSet& rSet,
-                                SwDBMgr* pDBMgr_, bool bLabel)
+                                SwDBManager* pDBManager_, bool bLabel)
     : SfxTabDialog(pParent, "LabelDialog",
         "modules/swriter/ui/labeldialog.ui", &rSet)
-    , pDBMgr(pDBMgr_)
+    , pDBManager(pDBManager_)
     , pPrtPage(0)
     , aTypeIds(50, 10)
     , pRecs(new SwLabRecs())
@@ -230,7 +230,7 @@ Printer *SwLabDlg::GetPrt()
 SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "CardMediumPage",
         "modules/swriter/ui/cardmediumpage.ui", rSet)
-    , pDBMgr(NULL)
+    , pDBManager(NULL)
     , aItem((const SwLabItem&)rSet.Get(FN_LABEL))
     , m_bLabel(false)
 {
@@ -318,9 +318,9 @@ IMPL_LINK( SwLabPage, DatabaseHdl, ListBox *, pListBox )
     WaitObject aObj( GetParentSwLabDlg() );
 
     if (pListBox == m_pDatabaseLB)
-        GetDBMgr()->GetTableNames(m_pTableLB, sActDBName);
+        GetDBManager()->GetTableNames(m_pTableLB, sActDBName);
 
-    GetDBMgr()->GetColumnNames(m_pDBFieldLB, sActDBName, m_pTableLB->GetSelectEntry());
+    GetDBManager()->GetColumnNames(m_pDBFieldLB, sActDBName, m_pTableLB->GetSelectEntry());
     return 0;
 }
 
@@ -440,20 +440,20 @@ SwLabRec* SwLabPage::GetSelectedEntryPos()
 
 void SwLabPage::InitDatabaseBox()
 {
-    if( GetDBMgr() )
+    if( GetDBManager() )
     {
         m_pDatabaseLB->Clear();
-        ::com::sun::star::uno::Sequence<OUString> aDataNames = SwDBMgr::GetExistingDatabaseNames();
+        ::com::sun::star::uno::Sequence<OUString> aDataNames = SwDBManager::GetExistingDatabaseNames();
         const OUString* pDataNames = aDataNames.getConstArray();
         for (long i = 0; i < aDataNames.getLength(); i++)
             m_pDatabaseLB->InsertEntry(pDataNames[i]);
         OUString sDBName = sActDBName.getToken( 0, DB_DELIM );
         OUString sTableName = sActDBName.getToken( 1, DB_DELIM );
         m_pDatabaseLB->SelectEntry(sDBName);
-        if( !sDBName.isEmpty() && GetDBMgr()->GetTableNames(m_pTableLB, sDBName))
+        if( !sDBName.isEmpty() && GetDBManager()->GetTableNames(m_pTableLB, sDBName))
         {
             m_pTableLB->SelectEntry(sTableName);
-            GetDBMgr()->GetColumnNames(m_pDBFieldLB, sActDBName, sTableName);
+            GetDBManager()->GetColumnNames(m_pDBFieldLB, sActDBName, sTableName);
         }
         else
             m_pDBFieldLB->Clear();
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;
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index 97e6a171256f..9929768a1844 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -24,7 +24,7 @@
 
 class SwLabPage : public SfxTabPage
 {
-    SwDBMgr*   pDBMgr;
+    SwDBManager*   pDBManager;
     OUString      sActDBName;
     SwLabItem     aItem;
 
@@ -76,8 +76,8 @@ public:
     void    SetToBusinessCard();
 
     void InitDatabaseBox();
-    inline void SetDBMgr(SwDBMgr* pDBMgr_) { pDBMgr = pDBMgr_; }
-    inline SwDBMgr* GetDBMgr() const { return pDBMgr; }
+    inline void SetDBManager(SwDBManager* pDBManager_) { pDBManager = pDBManager_; }
+    inline SwDBManager* GetDBManager() const { return pDBManager; }
 };
 
 class SwOneExampleFrame;
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 580e42867583..8ef135a83572 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -261,7 +261,7 @@ void SwChangeDBDlg::ShowDBName(const SwDBData& rDBData)
 
 IMPL_LINK_NOARG(SwChangeDBDlg, AddDBHdl)
 {
-    const OUString sNewDB = SwDBMgr::LoadAndRegisterDataSource();
+    const OUString sNewDB = SwDBManager::LoadAndRegisterDataSource();
     if (!sNewDB.isEmpty())
         m_pAvailDBTLB->AddDataSource(sNewDB);
     return 0;
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 526743adfb06..2fe526173002 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -461,7 +461,7 @@ IMPL_LINK( SwFldDBPage, TreeSelectHdl, SvTreeListBox *, pBox )
 
 IMPL_LINK_NOARG(SwFldDBPage, AddDBHdl)
 {
-    OUString sNewDB = SwDBMgr::LoadAndRegisterDataSource();
+    OUString sNewDB = SwDBManager::LoadAndRegisterDataSource();
     if(!sNewDB.isEmpty())
     {
         m_pDatabaseTLB->AddDataSource(sNewDB);