Rename SwDBMgr -> SwDBManager.

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

Change-Id: I2ceb3f1790321b70d5936c35e13870439969e64d

37 files changed, 204 insertions, 204 deletions

diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index ce86081f7205..53548f4cc704 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -90,7 +90,7 @@ public:
     /// For calculations in expressions.
     void                ChgValue( double d, bool bVal );
 
-    /// Get the evaluation via DBMgr string.
+    /// Get the evaluation via DBManager string.
     void                Evaluate();
 
     /// Evaluation for header and footer.
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index aed9f6f863c5..d2b2eb783c1f 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -72,7 +72,7 @@ class SwDbtoolsClient;
 class SwXMailMerge;
 class SwMailMergeConfigItem;
 
-enum DBMgrOptions
+enum DBManagerOptions
 {
     DBMGR_MERGE,             ///< Data records in fields.
     DBMGR_INSERT,            ///< Data records in text.
@@ -173,11 +173,11 @@ struct SwMergeDescriptor
 
 };
 
-struct SwDBMgr_Impl;
+struct SwDBManager_Impl;
 class SwConnectionDisposedListener_Impl;
 class AbstractMailMergeDlg;
 
-class SW_DLLPUBLIC SwDBMgr
+class SW_DLLPUBLIC SwDBManager
 {
 friend class SwConnectionDisposedListener_Impl;
 
@@ -194,7 +194,7 @@ friend class SwConnectionDisposedListener_Impl;
     bool            bMergeLock : 1;     /**< prevent update of database fields while document is
                                              actually printed at the SwViewShell */
     SwDSParamArr        aDataSourceParams;
-    SwDBMgr_Impl*    pImpl;
+    SwDBManager_Impl*    pImpl;
     const SwXMailMerge* pMergeEvtSrc;   ///< != 0 if mail merge events are to be send
 
     SAL_DLLPRIVATE SwDSParam*          FindDSData(const SwDBData& rData, bool bCreate);
@@ -214,8 +214,8 @@ friend class SwConnectionDisposedListener_Impl;
     SAL_DLLPRIVATE bool          ToNextRecord(SwDSParam* pParam);
 
 public:
-    SwDBMgr();
-    ~SwDBMgr();
+    SwDBManager();
+    ~SwDBManager();
 
     /// MailMergeEvent source
     const SwXMailMerge *    GetMailMergeEvtSrc() const  { return pMergeEvtSrc; }
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 6be9875414a9..4e833d8f66fe 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -133,7 +133,7 @@ class GraphicObject;
 class SwGrfFmtColl;
 class SwGrfFmtColls;
 class SwLineNumberInfo;
-class SwDBMgr;
+class SwDBManager;
 class SwNoTxtNode;
 class SwNodeIndex;
 class SwNodeRange;
@@ -319,7 +319,7 @@ class SW_DLLPUBLIC SwDoc :
 
     SwDocUpdtFld    *mpUpdtFlds;         //< Struct for updating fields
     SwFldTypes      *mpFldTypes;
-    SwDBMgr         *mpDBMgr;            /**< Pointer to the DBMgr for
+    SwDBManager         *mpDBManager;            /**< Pointer to the DBManager for
                                          evaluation of DB-fields. */
 
     SwDoc           *mpGlossaryDoc;      //< Pointer to glossary-document.
@@ -1086,8 +1086,8 @@ public:
                                const Point* pPt = 0 ) const;
 
     // Database  and DB-Manager
-    void SetDBMgr( SwDBMgr* pNewMgr )     { mpDBMgr = pNewMgr; }
-    SwDBMgr* GetDBMgr() const             { return mpDBMgr; }
+    void SetDBManager( SwDBManager* pNewMgr )     { mpDBManager = pNewMgr; }
+    SwDBManager* GetDBManager() const             { return mpDBManager; }
     void ChangeDBFields( const std::vector<OUString>& rOldNames,
                         const OUString& rNewName );
     void SetInitDBFields(bool b);
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 24a1f6f30150..79451aca8ca8 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -52,7 +52,7 @@ class SvxAutoCorrect;
 class SwField;
 class SwFieldType;
 class SwDDEFieldType;
-class SwDBMgr;
+class SwDBManager;
 
 struct SwDocStat;
 class SwAutoCompleteWord;
@@ -393,7 +393,7 @@ public:
     void SetFldUpdateFlags( SwFldUpdateFlags eFlags );
 
     /// For evaluation of DB fields (new DB-manager).
-    SwDBMgr* GetDBMgr() const;
+    SwDBManager* GetDBManager() const;
 
     SwFieldType* InsertFldType(const SwFieldType &);
 
diff --git a/sw/inc/rcid.hrc b/sw/inc/rcid.hrc
index dc51e8124209..904fe5937afe 100644
--- a/sw/inc/rcid.hrc
+++ b/sw/inc/rcid.hrc
@@ -170,7 +170,7 @@
 #define RC_MISC_BEGIN               RC_MISC
 #define RC_MISC_END                 (RC_MISC + 99)
 
-// DBMgr
+// DBManager
 #define RC_DBUI_BEGIN               RC_DBUI
 //      RC_DBUI_END                 (RC_DBUI + 99)
 
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 1c7878dd680d..fc1d475c7530 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -65,7 +65,7 @@ struct SwDBData;
 class SwField;
 class Printer;
 class SwLabItem;
-class SwDBMgr;
+class SwDBManager;
 class SwTableFUNC;
 class SwChildWinWrapper;
 struct SfxChildWinInfo;
@@ -353,7 +353,7 @@ public:
     virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert ) = 0;
 
     virtual AbstractSwLabDlg* CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet,
-                                                     SwDBMgr* pDBMgr, bool bLabel) = 0;
+                                                     SwDBManager* pDBManager, bool bLabel) = 0;
 
     virtual SwLabDlgMethod GetSwLabDlgStaticMethod () =0;
 
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index acecbdeefa09..5e637d0fd29c 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -516,7 +516,7 @@ SwCalcExp* SwCalc::VarLook( const OUString& rStr, sal_uInt16 ins )
     if( !ins )
     {
 #if HAVE_FEATURE_DBCONNECTIVITY
-        SwDBMgr *pMgr = rDoc.GetDBMgr();
+        SwDBManager *pMgr = rDoc.GetDBManager();
 
         OUString sDBName(GetDBName( sTmpName ));
         OUString sSourceName(sDBName.getToken(0, DB_DELIM));
@@ -580,7 +580,7 @@ SwCalcExp* SwCalc::VarLook( const OUString& rStr, sal_uInt16 ins )
                             SwFieldType::GetTypeStr( TYP_DBSETNUMBERFLD ) ))
     {
 #if HAVE_FEATURE_DBCONNECTIVITY
-        SwDBMgr *pMgr = rDoc.GetDBMgr();
+        SwDBManager *pMgr = rDoc.GetDBManager();
         OUString sDBName(GetDBName( sTmpName ));
         OUString sSourceName(sDBName.getToken(0, DB_DELIM));
         OUString sTableName(sDBName.getToken(0, ';').getToken(1, DB_DELIM));
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 2f1eec5cdfc0..b34556801691 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -352,7 +352,7 @@ void SwDoc::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB )
     if( bCloseDB )
     {
 #if HAVE_FEATURE_DBCONNECTIVITY
-        GetDBMgr()->CloseAll();
+        GetDBManager()->CloseAll();
 #endif
     }
     // Only evaluate on full update
@@ -1024,7 +1024,7 @@ static OUString lcl_GetDBVarName( SwDoc& rDoc, SwDBNameInfField& rDBFld )
 #endif
 
 static void lcl_CalcFld( SwDoc& rDoc, SwCalc& rCalc, const _SetGetExpFld& rSGEFld,
-                        SwDBMgr* pMgr )
+                        SwDBManager* pMgr )
 {
     const SwTxtFld* pTxtFld = rSGEFld.GetTxtFld();
     if( !pTxtFld )
@@ -1091,9 +1091,9 @@ void SwDoc::FldsToCalc( SwCalc& rCalc, const _SetGetExpFld& rToThisFld )
     mbNewFldLst = false;
 
 #if !HAVE_FEATURE_DBCONNECTIVITY
-    SwDBMgr* pMgr = NULL;
+    SwDBManager* pMgr = NULL;
 #else
-    SwDBMgr* pMgr = GetDBMgr();
+    SwDBManager* pMgr = GetDBManager();
     pMgr->CloseAll(false);
 #endif
 
@@ -1117,9 +1117,9 @@ void SwDoc::FldsToCalc( SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt )
     mbNewFldLst = false;
 
 #if !HAVE_FEATURE_DBCONNECTIVITY
-    SwDBMgr* pMgr = NULL;
+    SwDBManager* pMgr = NULL;
 #else
-    SwDBMgr* pMgr = GetDBMgr();
+    SwDBManager* pMgr = GetDBManager();
     pMgr->CloseAll(false);
 #endif
 
@@ -1283,7 +1283,7 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
     OUString sDBNumNm( SwFieldType::GetTypeStr( TYP_DBSETNUMBERFLD ) );
 
     // already set the current record number
-    SwDBMgr* pMgr = GetDBMgr();
+    SwDBManager* pMgr = GetDBManager();
     pMgr->CloseAll(false);
 #endif
 
@@ -1556,7 +1556,7 @@ void SwDoc::UpdateDBNumFlds( SwDBNameInfField& rDBFld, SwCalc& rCalc )
     (void) rDBFld;
     (void) rCalc;
 #else
-    SwDBMgr* pMgr = GetDBMgr();
+    SwDBManager* pMgr = GetDBManager();
 
     sal_uInt16 nFldType = rDBFld.Which();
 
@@ -1685,7 +1685,7 @@ const SwDBData& SwDoc::GetDBDesc()
         }
     }
     if(maDBData.sDataSource.isEmpty())
-        maDBData = GetDBMgr()->GetAddressDBName();
+        maDBData = GetDBManager()->GetAddressDBName();
 #endif
     return maDBData;
 }
@@ -1695,7 +1695,7 @@ void SwDoc::SetInitDBFields( bool b )
 #if !HAVE_FEATURE_DBCONNECTIVITY
     (void) b;
 #else
-    GetDBMgr()->SetInitDBFields( b );
+    GetDBManager()->SetInitDBFields( b );
 #endif
 }
 
@@ -1800,7 +1800,7 @@ void SwDoc::GetAllDBNames( std::vector<OUString>& rAllDBNames )
 #if !HAVE_FEATURE_DBCONNECTIVITY
     (void) rAllDBNames;
 #else
-    SwDBMgr* pMgr = GetDBMgr();
+    SwDBManager* pMgr = GetDBManager();
 
     const SwDSParamArr& rArr = pMgr->GetDSParamArray();
     for(sal_uInt16 i = 0; i < rArr.size(); i++)
@@ -1875,7 +1875,7 @@ void SwDoc::AddUsedDBToList( std::vector<OUString>& rDBNameList, const OUString&
     aData.sDataSource = rDBName.getToken(0, DB_DELIM);
     aData.sCommand = rDBName.getToken(1, DB_DELIM);
     aData.nCommandType = -1;
-    GetDBMgr()->CreateDSData(aData);
+    GetDBManager()->CreateDSData(aData);
     rDBNameList.push_back(rDBName);
 #endif
 }
@@ -2331,7 +2331,7 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
     const OUString sFalse("FALSE");
 
 #if HAVE_FEATURE_DBCONNECTIVITY
-    bool bIsDBMgr = 0 != rDoc.GetDBMgr();
+    bool bIsDBManager = 0 != rDoc.GetDBManager();
 #endif
     sal_uInt16 nWhich, n;
     const SfxPoolItem* pItem;
@@ -2412,7 +2412,7 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
                 SwDBData aDBData(((SwDBNumSetField*)pFld)->GetDBData(&rDoc));
 
                 if (
-                     (bIsDBMgr && rDoc.GetDBMgr()->OpenDataSource(aDBData.sDataSource, aDBData.sCommand)) &&
+                     (bIsDBManager && rDoc.GetDBManager()->OpenDataSource(aDBData.sDataSource, aDBData.sCommand)) &&
                      (GETFLD_ALL == eGetMode || (GETFLD_CALC & eGetMode && ((SwDBNumSetField*)pFld)->IsCondValid()))
                    )
                 {
@@ -2425,7 +2425,7 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
                 SwDBData aDBData(((SwDBNextSetField*)pFld)->GetDBData(&rDoc));
 
                 if (
-                     (bIsDBMgr && rDoc.GetDBMgr()->OpenDataSource(aDBData.sDataSource, aDBData.sCommand)) &&
+                     (bIsDBManager && rDoc.GetDBManager()->OpenDataSource(aDBData.sDataSource, aDBData.sCommand)) &&
                      (GETFLD_ALL == eGetMode || (GETFLD_CALC & eGetMode && ((SwDBNextSetField*)pFld)->IsCondValid()))
                    )
                 {
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 712ffa38b2a2..d42dd9f39ee3 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -341,8 +341,8 @@ SwDoc::SwDoc()
     maStatsUpdateTimer.SetTimeoutHdl( LINK( this, SwDoc, DoIdleStatsUpdate ) );
 
 #if HAVE_FEATURE_DBCONNECTIVITY
-    // Create DBMgr
-    mpDBMgr = new SwDBMgr;
+    // Create DBManager
+    mpDBManager = new SwDBManager;
 #endif
 
     // create TOXTypes
@@ -590,7 +590,7 @@ SwDoc::~SwDoc()
     mpCharFmtTbl->erase( mpCharFmtTbl->begin() );
 
 #if HAVE_FEATURE_DBCONNECTIVITY
-    DELETEZ( mpDBMgr );
+    DELETEZ( mpDBManager );
 #endif
 
     // All Flys need to be destroyed before the Drawing Model,
diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx
index c9fe702c56c8..ef432da45247 100644
--- a/sw/source/core/edit/edfld.cxx
+++ b/sw/source/core/edit/edfld.cxx
@@ -369,16 +369,16 @@ void SwEditShell::UpdateExpFlds(bool bCloseDB)
     if (bCloseDB)
     {
 #if HAVE_FEATURE_DBCONNECTIVITY
-        GetDoc()->GetDBMgr()->CloseAll(); // close all database connections
+        GetDoc()->GetDBManager()->CloseAll(); // close all database connections
 #endif
     }
     EndAllAction();
 }
 
-SwDBMgr* SwEditShell::GetDBMgr() const
+SwDBManager* SwEditShell::GetDBManager() const
 {
 #if HAVE_FEATURE_DBCONNECTIVITY
-    return GetDoc()->GetDBMgr();
+    return GetDoc()->GetDBManager();
 #else
     return NULL;
 #endif
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index aab43b29f565..76d514e2800a 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -265,7 +265,7 @@ SwFieldType* SwDBField::ChgTyp( SwFieldType* pNewType )
 /// get current field value and cache it
 void SwDBField::Evaluate()
 {
-    SwDBMgr* pMgr = GetDoc()->GetDBMgr();
+    SwDBManager* pMgr = GetDoc()->GetDBManager();
 
     // first delete
     bValidValue = false;
@@ -571,7 +571,7 @@ SwField* SwDBNextSetField::Copy() const
 
 void SwDBNextSetField::Evaluate(SwDoc* pDoc)
 {
-    SwDBMgr* pMgr = pDoc->GetDBMgr();
+    SwDBManager* pMgr = pDoc->GetDBManager();
     const SwDBData& rData = GetDBData();
     if( !bCondValid ||
             !pMgr || !pMgr->IsDataSourceOpen(rData.sDataSource, rData.sCommand, false))
@@ -660,7 +660,7 @@ SwField* SwDBNumSetField::Copy() const
 
 void SwDBNumSetField::Evaluate(SwDoc* pDoc)
 {
-    SwDBMgr* pMgr = pDoc->GetDBMgr();
+    SwDBManager* pMgr = pDoc->GetDBManager();
     const SwDBData& aTmpData = GetDBData();
 
     if( bCondValid && pMgr && pMgr->IsInMerge() &&
@@ -814,7 +814,7 @@ OUString SwDBSetNumberField::Expand() const
 
 void SwDBSetNumberField::Evaluate(SwDoc* pDoc)
 {
-    SwDBMgr* pMgr = pDoc->GetDBMgr();
+    SwDBManager* pMgr = pDoc->GetDBManager();
 
     const SwDBData& aTmpData = GetDBData();
     if (!pMgr || !pMgr->IsInMerge() ||
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index e955a0633881..4bbd021c18f3 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -1371,7 +1371,7 @@ void SwHiddenTxtField::Evaluate(SwDoc* pDoc)
 #if !HAVE_FEATURE_DBCONNECTIVITY
         (void) pDoc;
 #else
-        SwDBMgr* pMgr = pDoc->GetDBMgr();
+        SwDBManager* pMgr = pDoc->GetDBManager();
 #endif
         bValid = false;
         OUString sTmpName = (bCanToggle && !bIsHidden) ? aTRUETxt : aFALSETxt;
diff --git a/sw/source/core/uibase/app/applab.cxx b/sw/source/core/uibase/app/applab.cxx
index 20078757761a..9d9436daa94e 100644
--- a/sw/source/core/uibase/app/applab.cxx
+++ b/sw/source/core/uibase/app/applab.cxx
@@ -161,7 +161,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
 
 #if HAVE_FEATURE_DBCONNECTIVITY
     // Create DB-Manager
-    boost::scoped_ptr<SwDBMgr> pDBMgr(new SwDBMgr);
+    boost::scoped_ptr<SwDBManager> pDBManager(new SwDBManager);
 #endif
 
     // Read SwLabItem from Config
@@ -176,7 +176,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
 
     boost::scoped_ptr<AbstractSwLabDlg> pDlg(pDialogFactory->CreateSwLabDlg(0, aSet,
 #if HAVE_FEATURE_DBCONNECTIVITY
-                                                                            pDBMgr.get(),
+                                                                            pDBManager.get(),
 #else
                                                                             NULL,
 #endif
diff --git a/sw/source/core/uibase/dbui/dbmgr.cxx b/sw/source/core/uibase/dbui/dbmgr.cxx
index 0d65d5c66319..5b0566f81eac 100644
--- a/sw/source/core/uibase/dbui/dbmgr.cxx
+++ b/sw/source/core/uibase/dbui/dbmgr.cxx
@@ -206,25 +206,25 @@ void lcl_CopyCompatibilityOptions( SwWrtShell& rSourceShell, SwWrtShell& rTarget
 class SwConnectionDisposedListener_Impl : public cppu::WeakImplHelper1
 < lang::XEventListener >
 {
-    SwDBMgr&     rDBMgr;
+    SwDBManager&     rDBManager;
 
     virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
 public:
-    SwConnectionDisposedListener_Impl(SwDBMgr& rMgr);
+    SwConnectionDisposedListener_Impl(SwDBManager& rMgr);
     virtual ~SwConnectionDisposedListener_Impl();
 
 };
 
-struct SwDBMgr_Impl
+struct SwDBManager_Impl
 {
     SwDSParam*          pMergeData;
     AbstractMailMergeDlg*     pMergeDialog;
     uno::Reference<lang::XEventListener> xDisposeListener;
 
-    SwDBMgr_Impl(SwDBMgr& rDBMgr)
+    SwDBManager_Impl(SwDBManager& rDBManager)
        :pMergeData(0)
        ,pMergeDialog(0)
-       ,xDisposeListener(new SwConnectionDisposedListener_Impl(rDBMgr))
+       ,xDisposeListener(new SwConnectionDisposedListener_Impl(rDBManager))
         {}
 };
 
@@ -233,7 +233,7 @@ static void lcl_InitNumberFormatter(SwDSParam& rParam, uno::Reference<XDataSourc
     uno::Reference<XComponentContext> xContext = ::comphelper::getProcessComponentContext();
     rParam.xFormatter = uno::Reference<util::XNumberFormatter>(util::NumberFormatter::create(xContext), UNO_QUERY);
     if(!xSource.is())
-        xSource = SwDBMgr::getDataSourceAsParent(rParam.xConnection, rParam.sDataSource);
+        xSource = SwDBManager::getDataSourceAsParent(rParam.xConnection, rParam.sDataSource);
 
     uno::Reference<XPropertySet> xSourceProps(xSource, UNO_QUERY);
     if(xSourceProps.is())
@@ -296,7 +296,7 @@ static bool lcl_GetColumnCnt(SwDSParam* pParam,
     SwDBFormatData aFormatData;
     if(!pParam->xFormatter.is())
     {
-        uno::Reference<XDataSource> xSource = SwDBMgr::getDataSourceAsParent(
+        uno::Reference<XDataSource> xSource = SwDBManager::getDataSourceAsParent(
                                     pParam->xConnection,pParam->sDataSource);
         lcl_InitNumberFormatter(*pParam, xSource );
     }
@@ -305,14 +305,14 @@ static bool lcl_GetColumnCnt(SwDSParam* pParam,
 
     aFormatData.aLocale = LanguageTag( (LanguageType)nLanguage ).getLocale();
 
-    rResult = SwDBMgr::GetDBField( xColumnProps, aFormatData, pNumber);
+    rResult = SwDBManager::GetDBField( xColumnProps, aFormatData, pNumber);
     return true;
 };
 
 /*--------------------------------------------------------------------
     Description: import data
  --------------------------------------------------------------------*/
-bool SwDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc )
+bool SwDBManager::MergeNew(const SwMergeDescriptor& rMergeDesc )
 {
     OSL_ENSURE(!bInMerge && !pImpl->pMergeData, "merge already activated!");
 
@@ -395,7 +395,7 @@ bool SwDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc )
         OSL_FAIL("exception in MergeNew()");
     }
 
-    uno::Reference<XDataSource> xSource = SwDBMgr::getDataSourceAsParent(xConnection,aData.sDataSource);
+    uno::Reference<XDataSource> xSource = SwDBManager::getDataSourceAsParent(xConnection,aData.sDataSource);
 
     lcl_InitNumberFormatter(*pImpl->pMergeData, xSource);
 
@@ -447,7 +447,7 @@ bool SwDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc )
 /*--------------------------------------------------------------------
     Description: import data
  --------------------------------------------------------------------*/
-bool SwDBMgr::Merge(SwWrtShell* pSh)
+bool SwDBManager::Merge(SwWrtShell* pSh)
 {
     pSh->StartAllAction();
 
@@ -459,7 +459,7 @@ bool SwDBMgr::Merge(SwWrtShell* pSh)
     return true;
 }
 
-void SwDBMgr::ImportFromConnection(  SwWrtShell* pSh )
+void SwDBManager::ImportFromConnection(  SwWrtShell* pSh )
 {
     if(pImpl->pMergeData && !pImpl->pMergeData->bEndOfDB)
     {
@@ -523,7 +523,7 @@ static OUString  lcl_FindColumn(const OUString& sFormatStr,sal_uInt16  &nUsedPos
     return sReturn;
 }
 
-void SwDBMgr::ImportDBEntry(SwWrtShell* pSh)
+void SwDBManager::ImportDBEntry(SwWrtShell* pSh)
 {
     if(pImpl->pMergeData && !pImpl->pMergeData->bEndOfDB)
     {
@@ -595,7 +595,7 @@ void SwDBMgr::ImportDBEntry(SwWrtShell* pSh)
 /*--------------------------------------------------------------------
     Description: fill Listbox with tablelist
  --------------------------------------------------------------------*/
-bool SwDBMgr::GetTableNames(ListBox* pListBox, const OUString& rDBName)
+bool SwDBManager::GetTableNames(ListBox* pListBox, const OUString& rDBName)
 {
     bool bRet = false;
     OUString sOldTableName(pListBox->GetSelectEntry());
@@ -646,7 +646,7 @@ bool SwDBMgr::GetTableNames(ListBox* pListBox, const OUString& rDBName)
 /*--------------------------------------------------------------------
     Description: fill Listbox with column names of a database
  --------------------------------------------------------------------*/
-void SwDBMgr::GetColumnNames(ListBox* pListBox,
+void SwDBManager::GetColumnNames(ListBox* pListBox,
                              const OUString& rDBName, const OUString& rTableName, bool bAppend)
 {
     if (!bAppend)
@@ -664,7 +664,7 @@ void SwDBMgr::GetColumnNames(ListBox* pListBox,
         OUString sDBName(rDBName);
         xConnection = RegisterConnection( sDBName );
     }
-    uno::Reference< XColumnsSupplier> xColsSupp = SwDBMgr::GetColumnSupplier(xConnection, rTableName);
+    uno::Reference< XColumnsSupplier> xColsSupp = SwDBManager::GetColumnSupplier(xConnection, rTableName);
     if(xColsSupp.is())
     {
         uno::Reference<XNameAccess> xCols = xColsSupp->getColumns();
@@ -678,13 +678,13 @@ void SwDBMgr::GetColumnNames(ListBox* pListBox,
     }
 }
 
-void SwDBMgr::GetColumnNames(ListBox* pListBox,
+void SwDBManager::GetColumnNames(ListBox* pListBox,
         uno::Reference< XConnection> xConnection,
         const OUString& rTableName, bool bAppend)
 {
     if (!bAppend)
         pListBox->Clear();
-    uno::Reference< XColumnsSupplier> xColsSupp = SwDBMgr::GetColumnSupplier(xConnection, rTableName);
+    uno::Reference< XColumnsSupplier> xColsSupp = SwDBManager::GetColumnSupplier(xConnection, rTableName);
     if(xColsSupp.is())
     {
         uno::Reference<XNameAccess> xCols = xColsSupp->getColumns();
@@ -701,19 +701,19 @@ void SwDBMgr::GetColumnNames(ListBox* pListBox,
 /*--------------------------------------------------------------------
     Description: CTOR
  --------------------------------------------------------------------*/
-SwDBMgr::SwDBMgr()
+SwDBManager::SwDBManager()
     : bCancel(false)
     , bInitDBFields(false)
     , bSingleJobs(false)
     , bInMerge(false)
     , bMergeSilent(false)
     , bMergeLock(false)
-    , pImpl(new SwDBMgr_Impl(*this))
+    , pImpl(new SwDBManager_Impl(*this))
     , pMergeEvtSrc(NULL)
 {
 }
 
-SwDBMgr::~SwDBMgr()
+SwDBManager::~SwDBManager()
 {
     for(sal_uInt16 nPos = 0; nPos < aDataSourceParams.size(); nPos++)
     {
@@ -819,7 +819,7 @@ static void lcl_RemoveSectionLinks( SwWrtShell& rWorkShell )
     rWorkShell.SetLabelDoc( false );
 }
 
-bool SwDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
+bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
         const SwMergeDescriptor& rMergeDescriptor)
 {
     //check if the doc is synchronized and contains at least one linked section
@@ -939,7 +939,7 @@ bool SwDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
             PrintMonitor aPrtMonDlg(&pSourceShell->GetView().GetEditWin(), PrintMonitor::MONITOR_TYPE_PRINT);
             aPrtMonDlg.m_pDocName->SetText(pSourceShell->GetView().GetDocShell()->GetTitle(22));
 
-            aPrtMonDlg.m_pCancel->SetClickHdl(LINK(this, SwDBMgr, PrtCancelHdl));
+            aPrtMonDlg.m_pCancel->SetClickHdl(LINK(this, SwDBManager, PrtCancelHdl));
             if (!IsMergeSilent())
                 aPrtMonDlg.Show();
 
@@ -1036,8 +1036,8 @@ bool SwDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
                                     static_cast< SwView* >(pWorkFrame->GetViewShell())->GetWrtShell();
                             rWorkShell.CalcLayout();
                             SwDoc* pWorkDoc = ((SwDocShell*)(&xWorkDocSh))->GetDoc();
-                            SwDBMgr* pOldDBMgr = pWorkDoc->GetDBMgr();
-                            pWorkDoc->SetDBMgr( this );
+                            SwDBManager* pOldDBManager = pWorkDoc->GetDBManager();
+                            pWorkDoc->SetDBManager( this );
                             SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE, SwDocShell::GetEventName(STR_SW_EVENT_FIELD_MERGE), xWorkDocSh));
                             pWorkDoc->UpdateFlds(NULL, false);
                             SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE_FINISHED, SwDocShell::GetEventName(STR_SW_EVENT_FIELD_MERGE_FINISHED), xWorkDocSh));
@@ -1223,7 +1223,7 @@ bool SwDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
                                     }
                                 }
                             }
-                            pWorkDoc->SetDBMgr( pOldDBMgr );
+                            pWorkDoc->SetDBManager( pOldDBManager );
                         }
                         xWorkDocSh->DoClose();
                     }
@@ -1354,24 +1354,24 @@ bool SwDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
     return bNoError;
 }
 
-void SwDBMgr::MergeCancel()
+void SwDBManager::MergeCancel()
 {
     bCancel = true;
 }
 
-IMPL_LINK_INLINE_START( SwDBMgr, PrtCancelHdl, Button *, pButton )
+IMPL_LINK_INLINE_START( SwDBManager, PrtCancelHdl, Button *, pButton )
 {
     pButton->GetParent()->Hide();
     MergeCancel();
     return 0;
 }
-IMPL_LINK_INLINE_END( SwDBMgr, PrtCancelHdl, Button *, pButton )
+IMPL_LINK_INLINE_END( SwDBManager, PrtCancelHdl, Button *, pButton )
 
 /*--------------------------------------------------------------------
     Description: determine the column's Numberformat and transfer
                     to the forwarded Formatter, if applicable.
   --------------------------------------------------------------------*/
-sal_uLong SwDBMgr::GetColumnFmt( const OUString& rDBName,
+sal_uLong SwDBManager::GetColumnFmt( const OUString& rDBName,
                                 const OUString& rTableName,
                                 const OUString& rColNm,
                                 SvNumberFormatter* pNFmtr,
@@ -1389,7 +1389,7 @@ sal_uLong SwDBMgr::GetColumnFmt( const OUString& rDBName,
             pImpl->pMergeData->sDataSource.equals(rDBName) && pImpl->pMergeData->sCommand.equals(rTableName))
         {
             xConnection = pImpl->pMergeData->xConnection;
-            xSource = SwDBMgr::getDataSourceAsParent(xConnection,rDBName);
+            xSource = SwDBManager::getDataSourceAsParent(xConnection,rDBName);
             bUseMergeData = true;
             xColsSupp = xColsSupp.query( pImpl->pMergeData->xResultSet );
         }
@@ -1417,7 +1417,7 @@ sal_uLong SwDBMgr::GetColumnFmt( const OUString& rDBName,
         bool bDispose = !xColsSupp.is();
         if(bDispose)
         {
-            xColsSupp = SwDBMgr::GetColumnSupplier(xConnection, rTableName);
+            xColsSupp = SwDBManager::GetColumnSupplier(xConnection, rTableName);
         }
         if(xColsSupp.is())
         {
@@ -1451,7 +1451,7 @@ sal_uLong SwDBMgr::GetColumnFmt( const OUString& rDBName,
     return nRet;
 }
 
-sal_uLong SwDBMgr::GetColumnFmt( uno::Reference< XDataSource> xSource,
+sal_uLong SwDBManager::GetColumnFmt( uno::Reference< XDataSource> xSource,
                         uno::Reference< XConnection> xConnection,
                         uno::Reference< XPropertySet> xColumn,
                         SvNumberFormatter* pNFmtr,
@@ -1528,12 +1528,12 @@ sal_uLong SwDBMgr::GetColumnFmt( uno::Reference< XDataSource> xSource,
             OSL_FAIL("no FormatKey property found");
         }
         if(bUseDefault)
-            nRet = SwDBMgr::GetDbtoolsClient().getDefaultNumberFormat(xColumn, xDocNumberFormatTypes,  aLocale);
+            nRet = SwDBManager::GetDbtoolsClient().getDefaultNumberFormat(xColumn, xDocNumberFormatTypes,  aLocale);
     }
     return nRet;
 }
 
-sal_Int32 SwDBMgr::GetColumnType( const OUString& rDBName,
+sal_Int32 SwDBManager::GetColumnType( const OUString& rDBName,
                           const OUString& rTableName,
                           const OUString& rColNm )
 {
@@ -1558,7 +1558,7 @@ sal_Int32 SwDBMgr::GetColumnType( const OUString& rDBName,
     }
     if( !xColsSupp.is() )
     {
-        xColsSupp = SwDBMgr::GetColumnSupplier(xConnection, rTableName);
+        xColsSupp = SwDBManager::GetColumnSupplier(xConnection, rTableName);
         bDispose = true;
     }
     if(xColsSupp.is())
@@ -1578,14 +1578,14 @@ sal_Int32 SwDBMgr::GetColumnType( const OUString& rDBName,
     return nRet;
 }
 
-uno::Reference< sdbc::XConnection> SwDBMgr::GetConnection(const OUString& rDataSource,
+uno::Reference< sdbc::XConnection> SwDBManager::GetConnection(const OUString& rDataSource,
                                                     uno::Reference<XDataSource>& rxSource)
 {
     Reference< sdbc::XConnection> xConnection;
     Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
     try
     {
-        Reference<XCompletedConnection> xComplConnection(SwDBMgr::GetDbtoolsClient().getDataSource(rDataSource, xContext),UNO_QUERY);
+        Reference<XCompletedConnection> xComplConnection(SwDBManager::GetDbtoolsClient().getDataSource(rDataSource, xContext),UNO_QUERY);
         if ( xComplConnection.is() )
         {
             rxSource.set(xComplConnection,UNO_QUERY);
@@ -1600,7 +1600,7 @@ uno::Reference< sdbc::XConnection> SwDBMgr::GetConnection(const OUString& rDataS
     return xConnection;
 }
 
-uno::Reference< sdbcx::XColumnsSupplier> SwDBMgr::GetColumnSupplier(uno::Reference<sdbc::XConnection> xConnection,
+uno::Reference< sdbcx::XColumnsSupplier> SwDBManager::GetColumnSupplier(uno::Reference<sdbc::XConnection> xConnection,
                                     const OUString& rTableOrQuery,
                                     sal_uInt8   eTableOrQuery)
 {
@@ -1624,7 +1624,7 @@ uno::Reference< sdbcx::XColumnsSupplier> SwDBMgr::GetColumnSupplier(uno::Referen
         Reference<XRowSet> xRowSet(xMgr->createInstance("com.sun.star.sdb.RowSet"), UNO_QUERY);
 
         OUString sDataSource;
-        Reference<XDataSource> xSource = SwDBMgr::getDataSourceAsParent(xConnection, sDataSource);
+        Reference<XDataSource> xSource = SwDBManager::getDataSourceAsParent(xConnection, sDataSource);
         Reference<XPropertySet> xSourceProperties(xSource, UNO_QUERY);
         if(xSourceProperties.is())
         {
@@ -1642,19 +1642,19 @@ uno::Reference< sdbcx::XColumnsSupplier> SwDBMgr::GetColumnSupplier(uno::Referen
     }
     catch(const uno::Exception&)
     {
-        OSL_FAIL("Exception in SwDBMgr::GetColumnSupplier");
+        OSL_FAIL("Exception in SwDBManager::GetColumnSupplier");
     }
 
     return xRet;
 }
 
-OUString SwDBMgr::GetDBField(uno::Reference<XPropertySet> xColumnProps,
+OUString SwDBManager::GetDBField(uno::Reference<XPropertySet> xColumnProps,
                         const SwDBFormatData& rDBFormatData,
                         double* pNumber)
 {
     uno::Reference< XColumn > xColumn(xColumnProps, UNO_QUERY);
     OUString sRet;
-    OSL_ENSURE(xColumn.is(), "SwDBMgr::::ImportDBField: illegal arguments");
+    OSL_ENSURE(xColumn.is(), "SwDBManager::::ImportDBField: illegal arguments");
     if(!xColumn.is())
         return sRet;
 
@@ -1692,7 +1692,7 @@ OUString SwDBMgr::GetDBField(uno::Reference<XPropertySet> xColumnProps,
 
             try
             {
-                SwDbtoolsClient& aClient = SwDBMgr::GetDbtoolsClient();
+                SwDbtoolsClient& aClient = SwDBManager::GetDbtoolsClient();
                 sRet = aClient.getFormattedValue(
                     xColumnProps,
                     rDBFormatData.xFormatter,
@@ -1720,7 +1720,7 @@ OUString SwDBMgr::GetDBField(uno::Reference<XPropertySet> xColumnProps,
 }
 
 // releases the merge data source table or query after merge is completed
-void    SwDBMgr::EndMerge()
+void    SwDBManager::EndMerge()
 {
     OSL_ENSURE(bInMerge, "merge is not active");
     bInMerge = false;
@@ -1729,7 +1729,7 @@ void    SwDBMgr::EndMerge()
 }
 
 // checks if a desired data source table or query is open
-bool    SwDBMgr::IsDataSourceOpen(const OUString& rDataSource,
+bool    SwDBManager::IsDataSourceOpen(const OUString& rDataSource,
                                   const OUString& rTableOrQuery, bool bMergeOnly)
 {
     if(pImpl->pMergeData)
@@ -1754,7 +1754,7 @@ bool    SwDBMgr::IsDataSourceOpen(const OUString& rDataSource,
 }
 
 // read column data at a specified position
-bool SwDBMgr::GetColumnCnt(const OUString& rSourceName, const OUString& rTableName,
+bool SwDBManager::GetColumnCnt(const OUString& rSourceName, const OUString& rTableName,
                            const OUString& rColumnName, sal_uInt32 nAbsRecordId,
                            long nLanguage,
                            OUString& rResult, double* pNumber)
@@ -1820,7 +1820,7 @@ bool SwDBMgr::GetColumnCnt(const OUString& rSourceName, const OUString& rTableNa
 }
 
 // reads the column data at the current position
-bool    SwDBMgr::GetMergeColumnCnt(const OUString& rColumnName, sal_uInt16 nLanguage,
+bool    SwDBManager::GetMergeColumnCnt(const OUString& rColumnName, sal_uInt16 nLanguage,
                                    OUString &rResult, double *pNumber, sal_uInt32 * /*pFormat*/)
 {
     if(!pImpl->pMergeData || !pImpl->pMergeData->xResultSet.is() || pImpl->pMergeData->bAfterSelection )
@@ -1833,13 +1833,13 @@ bool    SwDBMgr::GetMergeColumnCnt(const OUString& rColumnName, sal_uInt16 nLang
     return bRet;
 }
 
-bool SwDBMgr::ToNextMergeRecord()
+bool SwDBManager::ToNextMergeRecord()
 {
     OSL_ENSURE(pImpl->pMergeData && pImpl->pMergeData->xResultSet.is(), "no data source in merge");
     return ToNextRecord(pImpl->pMergeData);
 }
 
-bool SwDBMgr::ToNextRecord(
+bool SwDBManager::ToNextRecord(
     const OUString& rDataSource, const OUString& rCommand, sal_Int32 /*nCommandType*/)
 {
     SwDSParam* pFound = 0;
@@ -1858,7 +1858,7 @@ bool SwDBMgr::ToNextRecord(
     return ToNextRecord(pFound);
 }
 
-bool SwDBMgr::ToNextRecord(SwDSParam* pParam)
+bool SwDBManager::ToNextRecord(SwDSParam* pParam)
 {
     bool bRet = true;
     if(!pParam || !pParam->xResultSet.is() || pParam->bEndOfDB ||
@@ -1906,12 +1906,12 @@ bool SwDBMgr::ToNextRecord(SwDSParam* pParam)
     to assure that the next page can be created in mail merge
     the cursor position must be validated
  ---------------------------------------------------------------------------*/
-bool SwDBMgr::ExistsNextRecord() const
+bool SwDBManager::ExistsNextRecord() const
 {
     return pImpl->pMergeData && !pImpl->pMergeData->bEndOfDB;
 }
 
-sal_uInt32  SwDBMgr::GetSelectedRecordId()
+sal_uInt32  SwDBManager::GetSelectedRecordId()
 {
     sal_uInt32  nRet = 0;
     OSL_ENSURE(pImpl->pMergeData && pImpl->pMergeData->xResultSet.is(), "no data source in merge");
@@ -1927,7 +1927,7 @@ sal_uInt32  SwDBMgr::GetSelectedRecordId()
     return nRet;
 }
 
-bool SwDBMgr::ToRecordId(sal_Int32 nSet)
+bool SwDBManager::ToRecordId(sal_Int32 nSet)
 {
     OSL_ENSURE(pImpl->pMergeData && pImpl->pMergeData->xResultSet.is(), "no data source in merge");
     if(!pImpl->pMergeData || !pImpl->pMergeData->xResultSet.is()|| nSet < 0)
@@ -1944,7 +1944,7 @@ bool SwDBMgr::ToRecordId(sal_Int32 nSet)
     return bRet;
 }
 
-bool SwDBMgr::OpenDataSource(const OUString& rDataSource, const OUString& rTableOrQuery,
+bool SwDBManager::OpenDataSource(const OUString& rDataSource, const OUString& rTableOrQuery,
             sal_Int32 nCommandType, bool bCreate)
 {
     SwDBData aData;
@@ -2005,13 +2005,13 @@ bool SwDBMgr::OpenDataSource(const OUString& rDataSource, const OUString& rTable
     return pFound->xResultSet.is();
 }
 
-uno::Reference< XConnection> SwDBMgr::RegisterConnection(OUString& rDataSource)
+uno::Reference< XConnection> SwDBManager::RegisterConnection(OUString& rDataSource)
 {
-    SwDSParam* pFound = SwDBMgr::FindDSConnection(rDataSource, true);
+    SwDSParam* pFound = SwDBManager::FindDSConnection(rDataSource, true);
     uno::Reference< XDataSource> xSource;
     if(!pFound->xConnection.is())
     {
-        pFound->xConnection = SwDBMgr::GetConnection(rDataSource, xSource );
+        pFound->xConnection = SwDBManager::GetConnection(rDataSource, xSource );
         try
         {
             uno::Reference<XComponent> xComponent(pFound->xConnection, UNO_QUERY);
@@ -2025,7 +2025,7 @@ uno::Reference< XConnection> SwDBMgr::RegisterConnection(OUString& rDataSource)
     return pFound->xConnection;
 }
 
-sal_uInt32      SwDBMgr::GetSelectedRecordId(
+sal_uInt32      SwDBManager::GetSelectedRecordId(
     const OUString& rDataSource, const OUString& rTableOrQuery, sal_Int32 nCommandType)
 {
     sal_uInt32 nRet = 0xffffffff;
@@ -2066,7 +2066,7 @@ sal_uInt32      SwDBMgr::GetSelectedRecordId(
 }
 
 // close all data sources - after fields were updated
-void    SwDBMgr::CloseAll(bool bIncludingMerge)
+void    SwDBManager::CloseAll(bool bIncludingMerge)
 {
     //the only thing done here is to reset the selection index
     //all connections stay open
@@ -2089,7 +2089,7 @@ void    SwDBMgr::CloseAll(bool bIncludingMerge)
     }
 }
 
-SwDSParam* SwDBMgr::FindDSData(const SwDBData& rData, bool bCreate)
+SwDSParam* SwDBManager::FindDSData(const SwDBData& rData, bool bCreate)
 {
     //prefer merge data if available
     if(pImpl->pMergeData && rData.sDataSource == pImpl->pMergeData->sDataSource &&
@@ -2138,7 +2138,7 @@ SwDSParam* SwDBMgr::FindDSData(const SwDBData& rData, bool bCreate)
     return pFound;
 }
 
-SwDSParam*  SwDBMgr::FindDSConnection(const OUString& rDataSource, bool bCreate)
+SwDSParam*  SwDBManager::FindDSConnection(const OUString& rDataSource, bool bCreate)
 {
     //prefer merge data if available
     if(pImpl->pMergeData && rDataSource == pImpl->pMergeData->sDataSource )
@@ -2174,19 +2174,19 @@ SwDSParam*  SwDBMgr::FindDSConnection(const OUString& rDataSource, bool bCreate)
     return pFound;
 }
 
-const SwDBData& SwDBMgr::GetAddressDBName()
+const SwDBData& SwDBManager::GetAddressDBName()
 {
     return SW_MOD()->GetDBConfig()->GetAddressSource();
 }
 
-Sequence<OUString> SwDBMgr::GetExistingDatabaseNames()
+Sequence<OUString> SwDBManager::GetExistingDatabaseNames()
 {
     Reference<XComponentContext> xContext( ::comphelper::getProcessComponentContext() );
     Reference<XDatabaseContext> xDBContext = DatabaseContext::create(xContext);
     return xDBContext->getElementNames();
 }
 
-OUString SwDBMgr::LoadAndRegisterDataSource()
+OUString SwDBManager::LoadAndRegisterDataSource()
 {
     sfx2::FileDialogHelper aDlgHelper( TemplateDescription::FILEOPEN_SIMPLE, 0 );
     Reference < XFilePicker > xFP = aDlgHelper.GetFilePicker();
@@ -2371,7 +2371,7 @@ OUString SwDBMgr::LoadAndRegisterDataSource()
 
 }
 
-void SwDBMgr::ExecuteFormLetter( SwWrtShell& rSh,
+void SwDBManager::ExecuteFormLetter( SwWrtShell& rSh,
                         const Sequence<PropertyValue>& rProperties,
                         bool bWithDataSourceBrowser)
 {
@@ -2404,7 +2404,7 @@ void SwDBMgr::ExecuteFormLetter( SwWrtShell& rSh,
     SwDSParam* pFound = 0;
     if(!xConnection.is())
     {
-        xConnection = SwDBMgr::RegisterConnection(sDataSource);
+        xConnection = SwDBManager::RegisterConnection(sDataSource);
         pFound = FindDSConnection(sDataSource, true);
     }
     SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
@@ -2465,10 +2465,10 @@ void SwDBMgr::ExecuteFormLetter( SwWrtShell& rSh,
                     SfxViewFrame *pFrame = SfxViewFrame::LoadHiddenDocument( *xWorkDocSh, 0 );
                     SwView *pView = (SwView*) pFrame->GetViewShell();
                     pView->AttrChangedNotify( &pView->GetWrtShell() );// in order for SelectShell to be called
-                    //set the current DBMgr
+                    //set the current DBManager
                     SwDoc* pWorkDoc = pView->GetWrtShell().GetDoc();
-                    SwDBMgr* pWorkDBMgr = pWorkDoc->GetDBMgr();
-                    pWorkDoc->SetDBMgr( this );
+                    SwDBManager* pWorkDBManager = pWorkDoc->GetDBManager();
+                    pWorkDoc->SetDBManager( this );
 
                     SwMergeDescriptor aMergeDesc( pImpl->pMergeDialog->GetMergeType(), pView->GetWrtShell(), aDescriptor );
                     aMergeDesc.sSaveToFilter = pImpl->pMergeDialog->GetSaveFilter();
@@ -2481,7 +2481,7 @@ void SwDBMgr::ExecuteFormLetter( SwWrtShell& rSh,
 
                     MergeNew(aMergeDesc);
 
-                    pWorkDoc->SetDBMgr( pWorkDBMgr );
+                    pWorkDoc->SetDBManager( pWorkDBManager );
                     //close the temporary file
                     uno::Reference< util::XCloseable > xClose( xWorkDocSh->GetModel(), uno::UNO_QUERY );
                     if (xClose.is())
@@ -2533,7 +2533,7 @@ void SwDBMgr::ExecuteFormLetter( SwWrtShell& rSh,
     DELETEZ(pImpl->pMergeDialog);
 }
 
-void SwDBMgr::InsertText(SwWrtShell& rSh,
+void SwDBManager::InsertText(SwWrtShell& rSh,
                         const Sequence< PropertyValue>& rProperties)
 {
     OUString sDataSource, sDataTableOrQuery;
@@ -2568,7 +2568,7 @@ void SwDBMgr::InsertText(SwWrtShell& rSh,
     if(xChild.is())
         xSource = uno::Reference<XDataSource>(xChild->getParent(), UNO_QUERY);
     if(!xSource.is())
-        xSource = SwDBMgr::GetDbtoolsClient().getDataSource(sDataSource, xContext);
+        xSource = SwDBManager::GetDbtoolsClient().getDataSource(sDataSource, xContext);
     uno::Reference< XColumnsSupplier > xColSupp( xResSet, UNO_QUERY );
     SwDBData aDBData;
     aDBData.sDataSource = sDataSource;
@@ -2599,22 +2599,22 @@ void SwDBMgr::InsertText(SwWrtShell& rSh,
     }
 }
 
-SwDbtoolsClient* SwDBMgr::pDbtoolsClient = NULL;
+SwDbtoolsClient* SwDBManager::pDbtoolsClient = NULL;
 
-SwDbtoolsClient& SwDBMgr::GetDbtoolsClient()
+SwDbtoolsClient& SwDBManager::GetDbtoolsClient()
 {
     if ( !pDbtoolsClient )
         pDbtoolsClient = new SwDbtoolsClient;
     return *pDbtoolsClient;
 }
 
-void SwDBMgr::RemoveDbtoolsClient()
+void SwDBManager::RemoveDbtoolsClient()
 {
     delete pDbtoolsClient;
     pDbtoolsClient = 0;
 }
 
-uno::Reference<XDataSource> SwDBMgr::getDataSourceAsParent(const uno::Reference< XConnection>& _xConnection,const OUString& _sDataSourceName)
+uno::Reference<XDataSource> SwDBManager::getDataSourceAsParent(const uno::Reference< XConnection>& _xConnection,const OUString& _sDataSourceName)
 {
     uno::Reference<XDataSource> xSource;
     try
@@ -2623,7 +2623,7 @@ uno::Reference<XDataSource> SwDBMgr::getDataSourceAsParent(const uno::Reference<
         if ( xChild.is() )
             xSource = uno::Reference<XDataSource>(xChild->getParent(), UNO_QUERY);
         if ( !xSource.is() )
-            xSource = SwDBMgr::GetDbtoolsClient().getDataSource(_sDataSourceName, ::comphelper::getProcessComponentContext());
+            xSource = SwDBManager::GetDbtoolsClient().getDataSource(_sDataSourceName, ::comphelper::getProcessComponentContext());
     }
     catch(const Exception&)
     {
@@ -2632,7 +2632,7 @@ uno::Reference<XDataSource> SwDBMgr::getDataSourceAsParent(const uno::Reference<
     return xSource;
 }
 
-uno::Reference<XResultSet> SwDBMgr::createCursor(const OUString& _sDataSourceName,
+uno::Reference<XResultSet> SwDBManager::createCursor(const OUString& _sDataSourceName,
                                        const OUString& _sCommand,
                                        sal_Int32 _nCommandType,
                                        const uno::Reference<XConnection>& _xConnection
@@ -2672,7 +2672,7 @@ uno::Reference<XResultSet> SwDBMgr::createCursor(const OUString& _sDataSourceNam
 }
 
 // merge all data into one resulting document and return the number of merged documents
-sal_Int32 SwDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
+sal_Int32 SwDBManager::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
                             SwView& rSourceView )
 {
     // check the availability of all data in the config item
@@ -2712,7 +2712,7 @@ sal_Int32 SwDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
     bCancel = false;
 
     CreateMonitor aMonitorDlg(&rSourceView.GetEditWin());
-    aMonitorDlg.SetCancelHdl(LINK(this, SwDBMgr, PrtCancelHdl));
+    aMonitorDlg.SetCancelHdl(LINK(this, SwDBManager, PrtCancelHdl));
     if (!IsMergeSilent())
     {
         aMonitorDlg.Show();
@@ -2800,8 +2800,8 @@ sal_Int32 SwDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
 
                 // merge the data
                 SwDoc* pWorkDoc = rWorkShell.GetDoc();
-                SwDBMgr* pWorkDBMgr = pWorkDoc->GetDBMgr();
-                pWorkDoc->SetDBMgr( this );
+                SwDBManager* pWorkDBManager = pWorkDoc->GetDBManager();
+                pWorkDoc->SetDBManager( this );
                 pWorkDoc->EmbedAllLinks();
                 SwUndoId nLastUndoId(UNDO_EMPTY);
                 if (rWorkShell.GetLastUndoInfo(0, & nLastUndoId))
@@ -2901,8 +2901,8 @@ sal_Int32 SwDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
             for( sal_uInt16 i = 0; i < 25; i++)
                 Application::Reschedule();
 
-            //restore the ole DBMgr
-            pWorkDoc->SetDBMgr( pWorkDBMgr );
+            //restore the ole DBManager
+            pWorkDoc->SetDBManager( pWorkDBManager );
             //now the temporary document should be closed
             SfxObjectShellRef xDocSh(pWorkView->GetDocShell());
             xDocSh->DoClose();
@@ -2925,15 +2925,15 @@ sal_Int32 SwDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
     }
     catch(const Exception&)
     {
-        OSL_FAIL("exception caught in SwDBMgr::MergeDocuments");
+        OSL_FAIL("exception caught in SwDBManager::MergeDocuments");
     }
     DELETEZ(pImpl->pMergeData);
     bInMerge = false;
     return nRet;
 }
 
-SwConnectionDisposedListener_Impl::SwConnectionDisposedListener_Impl(SwDBMgr& rMgr) :
-    rDBMgr(rMgr)
+SwConnectionDisposedListener_Impl::SwConnectionDisposedListener_Impl(SwDBManager& rMgr) :
+    rDBManager(rMgr)
 {
 };
 
@@ -2946,13 +2946,13 @@ void SwConnectionDisposedListener_Impl::disposing( const EventObject& rSource )
 {
     ::SolarMutexGuard aGuard;
     uno::Reference<XConnection> xSource(rSource.Source, UNO_QUERY);
-    for(sal_uInt16 nPos = rDBMgr.aDataSourceParams.size(); nPos; nPos--)
+    for(sal_uInt16 nPos = rDBManager.aDataSourceParams.size(); nPos; nPos--)
     {
-        SwDSParam* pParam = &rDBMgr.aDataSourceParams[nPos - 1];
+        SwDSParam* pParam = &rDBManager.aDataSourceParams[nPos - 1];
         if(pParam->xConnection.is() &&
                 (xSource == pParam->xConnection))
         {
-            rDBMgr.aDataSourceParams.erase(rDBMgr.aDataSourceParams.begin() + nPos - 1);
+            rDBManager.aDataSourceParams.erase(rDBManager.aDataSourceParams.begin() + nPos - 1);
         }
     }
 }
diff --git a/sw/source/core/uibase/dbui/dbtree.cxx b/sw/source/core/uibase/dbui/dbtree.cxx
index 71cd80da13ee..8cfef1d32d59 100644
--- a/sw/source/core/uibase/dbui/dbtree.cxx
+++ b/sw/source/core/uibase/dbui/dbtree.cxx
@@ -163,7 +163,7 @@ Reference<XConnection>  SwDBTreeList_Impl::GetConnection(const OUString& rSource
     {
         SwConnectionData* pPtr = new SwConnectionData();
         pPtr->sSourceName = rSourceName;
-        xRet = pWrtSh->GetDBMgr()->RegisterConnection(pPtr->sSourceName);
+        xRet = pWrtSh->GetDBManager()->RegisterConnection(pPtr->sSourceName);
         aConnections.push_back(pPtr);
     }
     return xRet;
diff --git a/sw/source/core/uibase/dbui/mmconfigitem.cxx b/sw/source/core/uibase/dbui/mmconfigitem.cxx
index 3168c2be4b78..ba4db37d6baa 100644
--- a/sw/source/core/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/core/uibase/dbui/mmconfigitem.cxx
@@ -856,7 +856,7 @@ Reference< XColumnsSupplier> SwMailMergeConfigItem::GetColumnsSupplier()
 {
     if(!m_pImpl->xColumnsSupplier.is() && m_pImpl->xConnection.is())
     {
-        m_pImpl->xColumnsSupplier = SwDBMgr::GetColumnSupplier(m_pImpl->xConnection,
+        m_pImpl->xColumnsSupplier = SwDBManager::GetColumnSupplier(m_pImpl->xConnection,
                                 m_pImpl->aDBData.sCommand,
                                 m_pImpl->aDBData.nCommandType == CommandType::TABLE ?
                                         SW_DB_SELECT_TABLE : SW_DB_SELECT_QUERY );
@@ -886,7 +886,7 @@ Reference< XResultSet>   SwMailMergeConfigItem::GetResultSet() const
     if(!m_pImpl->xConnection.is() && !m_pImpl->aDBData.sDataSource.isEmpty())
     {
         m_pImpl->xConnection.reset(
-            SwDBMgr::GetConnection( m_pImpl->aDBData.sDataSource, m_pImpl->xSource ),
+            SwDBManager::GetConnection( m_pImpl->aDBData.sDataSource, m_pImpl->xSource ),
             SharedConnection::TakeOwnership
         );
     }
diff --git a/sw/source/core/uibase/fldui/fldmgr.cxx b/sw/source/core/uibase/fldui/fldmgr.cxx
index a7b855c8dd2d..eda301efb268 100644
--- a/sw/source/core/uibase/fldui/fldmgr.cxx
+++ b/sw/source/core/uibase/fldui/fldmgr.cxx
@@ -1105,11 +1105,11 @@ bool SwFldMgr::InsertFld(
                 rData.aDBColumn >>= xColumn;
                 if(xColumn.is())
                 {
-                    nFormatId = pCurShell->GetDBMgr()->GetColumnFmt(xSource, xConnection, xColumn,
+                    nFormatId = pCurShell->GetDBManager()->GetColumnFmt(xSource, xConnection, xColumn,
                         pCurShell->GetNumberFormatter(), GetCurrLanguage() );
                 }
                 else
-                    nFormatId = pCurShell->GetDBMgr()->GetColumnFmt(
+                    nFormatId = pCurShell->GetDBManager()->GetColumnFmt(
                     aDBData.sDataSource, aDBData.sCommand, sPar1,
                     pCurShell->GetNumberFormatter(), GetCurrLanguage() );
             }
diff --git a/sw/source/core/uibase/fldui/xfldui.cxx b/sw/source/core/uibase/fldui/xfldui.cxx
index 28b5cf3a7465..da107a4e240c 100644
--- a/sw/source/core/uibase/fldui/xfldui.cxx
+++ b/sw/source/core/uibase/fldui/xfldui.cxx
@@ -55,12 +55,12 @@ bool SwFldMgr::IsDBNumeric( const OUString& rDBName, const OUString& rTblQryName
 {
     bool bNumeric = true;
 
-    SwDBMgr* pDBMgr = pWrtShell ? pWrtShell->GetDBMgr() :
-                            ::GetActiveView()->GetWrtShell().GetDBMgr();
+    SwDBManager* pDBManager = pWrtShell ? pWrtShell->GetDBManager() :
+                            ::GetActiveView()->GetWrtShell().GetDBManager();
 
     OUString sSource(rDBName);
     Reference< XConnection> xConnection =
-                    pDBMgr->RegisterConnection(sSource);
+                    pDBManager->RegisterConnection(sSource);
 
     if( !xConnection.is() )
         return bNumeric;
diff --git a/sw/source/core/uibase/inc/label.hxx b/sw/source/core/uibase/inc/label.hxx
index 8a1f8bee4c13..cb7dae2163df 100644
--- a/sw/source/core/uibase/inc/label.hxx
+++ b/sw/source/core/uibase/inc/label.hxx
@@ -28,13 +28,13 @@ class SwLabRec;
 class SwLabRecs;
 class SwLabItem;
 class SwLabPrtPage;
-class SwDBMgr;
+class SwDBManager;
 class Printer;
 
 class SwLabDlg : public SfxTabDialog
 {
     SwLabelConfig   aLabelsCfg;
-    SwDBMgr*     pDBMgr;
+    SwDBManager*     pDBManager;
     SwLabPrtPage*   pPrtPage;
 
     std::vector<sal_uInt16> aTypeIds;
@@ -56,7 +56,7 @@ class SwLabDlg : public SfxTabDialog
 public:
 
      SwLabDlg( Window* pParent, const SfxItemSet& rSet,
-                 SwDBMgr* pDBMgr, bool bLabel);
+                 SwDBManager* pDBManager, bool bLabel);
     virtual ~SwLabDlg();
 
     SwLabRec*   GetRecord(const OUString &rRecName, bool bCont);
diff --git a/sw/source/core/uibase/inc/unomailmerge.hxx b/sw/source/core/uibase/inc/unomailmerge.hxx
index f5e86b973134..e403a0f6d2cd 100644
--- a/sw/source/core/uibase/inc/unomailmerge.hxx
+++ b/sw/source/core/uibase/inc/unomailmerge.hxx
@@ -59,7 +59,7 @@ namespace com { namespace sun { namespace star {
 typedef cppu::OMultiTypeInterfaceContainerHelperVar<sal_Int32>
     OPropertyListenerContainerHelper;
 
-class SwDBMgr;
+class SwDBManager;
 class MailMergeExecuteFinalizer;
 
 class SwXMailMerge :
@@ -122,7 +122,7 @@ class SwXMailMerge :
     com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSaveFilterData;
 
     bool        bDisposing;
-    SwDBMgr     *m_pMgr;
+    SwDBManager     *m_pMgr;
 
     void    launchEvent( const com::sun::star::beans::PropertyChangeEvent &rEvt ) const;
 
diff --git a/sw/source/core/uibase/shells/textsh2.cxx b/sw/source/core/uibase/shells/textsh2.cxx
index e1ad8be83e57..0f4c3662a3a2 100644
--- a/sw/source/core/uibase/shells/textsh2.cxx
+++ b/sw/source/core/uibase/shells/textsh2.cxx
@@ -86,7 +86,7 @@ struct DBTextStruct_Impl
 void SwTextShell::ExecDB(SfxRequest &rReq)
 {
     const SfxItemSet *pArgs = rReq.GetArgs();
-    SwDBMgr* pDBMgr = GetShell().GetDBMgr();
+    SwDBManager* pDBManager = GetShell().GetDBManager();
     sal_uInt16 nSlot = rReq.GetSlot();
     OUString sSourceArg, sCommandArg;
     sal_Int32 nCommandTypeArg = 0;
@@ -128,7 +128,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq)
     if ( !xConnection.is() )
     {
         Reference<XDataSource> xSource;
-        xConnection = pDBMgr->GetConnection(sSourceArg, xSource);
+        xConnection = pDBManager->GetConnection(sSourceArg, xSource);
     }
     if(!xConnection.is())
         return ;
@@ -168,7 +168,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq)
                 bool bDisposeResultSet = false;
                 if ( !xCursor.is() )
                 {
-                    xCursor = SwDBMgr::createCursor(sSourceArg,sCommandArg,nCommandTypeArg,xConnection);
+                    xCursor = SwDBManager::createCursor(sSourceArg,sCommandArg,nCommandTypeArg,xConnection);
                     bDisposeResultSet = xCursor.is();
                 }
 
@@ -180,7 +180,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq)
                 aDescriptor[daCommandType]  <<= nCommandTypeArg;
 
                 SwMergeDescriptor aMergeDesc( DBMGR_MERGE, *GetShellPtr(), aDescriptor );
-                pDBMgr->MergeNew(aMergeDesc);
+                pDBManager->MergeNew(aMergeDesc);
 
                 if ( bDisposeResultSet )
                     ::comphelper::disposeComponent(xCursor);
@@ -241,20 +241,20 @@ IMPL_STATIC_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl*, pDBStruct )
     {
         bool bDispose = false;
         Reference< sdbc::XConnection> xConnection = pDBStruct->xConnection;
-        Reference<XDataSource> xSource = SwDBMgr::getDataSourceAsParent(xConnection,pDBStruct->aDBData.sDataSource);
+        Reference<XDataSource> xSource = SwDBManager::getDataSourceAsParent(xConnection,pDBStruct->aDBData.sDataSource);
         // #111987# the connection is disposed an so no parent has been found
         if(xConnection.is() && !xSource.is())
             return 0;
 
         if ( !xConnection.is()  )
         {
-            xConnection = SwDBMgr::GetConnection(pDBStruct->aDBData.sDataSource, xSource);
+            xConnection = SwDBManager::GetConnection(pDBStruct->aDBData.sDataSource, xSource);
             bDispose = true;
         }
 
         Reference< XColumnsSupplier> xColSupp;
         if(xConnection.is())
-            xColSupp = SwDBMgr::GetColumnSupplier(xConnection,
+            xColSupp = SwDBManager::GetColumnSupplier(xConnection,
                                     pDBStruct->aDBData.sCommand,
                                     pDBStruct->aDBData.nCommandType == CommandType::QUERY ?
                                         SW_DB_SELECT_QUERY : SW_DB_SELECT_TABLE);
diff --git a/sw/source/core/uibase/uiview/view2.cxx b/sw/source/core/uibase/uiview/view2.cxx
index 77dc34c34ba1..eac7a19d73e1 100644
--- a/sw/source/core/uibase/uiview/view2.cxx
+++ b/sw/source/core/uibase/uiview/view2.cxx
@@ -1103,8 +1103,8 @@ void SwView::Execute(SfxRequest &rReq)
             SwWrtShell &rSh = GetWrtShell();
             if(m_bInMailMerge && rSh.IsAnyDatabaseFieldInDoc())
             {
-                SwDBMgr* pDBMgr = rSh.GetDBMgr();
-                if (pDBMgr)
+                SwDBManager* pDBManager = rSh.GetDBManager();
+                if (pDBManager)
                 {
                     SwDBData aData;
                     aData = rSh.GetDBData();
@@ -1119,7 +1119,7 @@ void SwView::Execute(SfxRequest &rReq)
                     pValues[0].Value <<= aData.sDataSource;
                     pValues[1].Value <<= aData.sCommand;
                     pValues[2].Value <<= aData.nCommandType;
-                    pDBMgr->ExecuteFormLetter(rSh, aProperties, true);
+                    pDBManager->ExecuteFormLetter(rSh, aProperties, true);
                 }
             }
 #endif
@@ -2382,7 +2382,7 @@ void SwView::GenerateFormLetter(bool bUseCurrentDocument)
                 return ;
             }
         }
-        SwDBMgr* pDBMgr = GetWrtShell().GetDBMgr();
+        SwDBManager* pDBManager = GetWrtShell().GetDBManager();
 
         SwDBData aData;
         SwWrtShell &rSh = GetWrtShell();
@@ -2400,7 +2400,7 @@ void SwView::GenerateFormLetter(bool bUseCurrentDocument)
         rSh.EnterStdMode(); // force change in text shell; necessary for mixing DB fields
         AttrChangedNotify( &rSh );
 
-        if (pDBMgr)
+        if (pDBManager)
         {
             Sequence<PropertyValue> aProperties(3);
             PropertyValue* pValues = aProperties.getArray();
@@ -2410,7 +2410,7 @@ void SwView::GenerateFormLetter(bool bUseCurrentDocument)
             pValues[0].Value <<= aData.sDataSource;
             pValues[1].Value <<= aData.sCommand;
             pValues[2].Value <<= aData.nCommandType;
-            pDBMgr->ExecuteFormLetter(GetWrtShell(), aProperties, true);
+            pDBManager->ExecuteFormLetter(GetWrtShell(), aProperties, true);
         }
     }
     else
diff --git a/sw/source/core/uibase/uno/unodispatch.cxx b/sw/source/core/uibase/uno/unodispatch.cxx
index 36589b1124f8..e02b0a9805b8 100644
--- a/sw/source/core/uibase/uno/unodispatch.cxx
+++ b/sw/source/core/uibase/uno/unodispatch.cxx
@@ -214,16 +214,16 @@ void SwXDispatch::dispatch(const util::URL& aURL,
     }
 #else
     SwWrtShell& rSh = m_pView->GetWrtShell();
-    SwDBMgr* pDBMgr = rSh.GetDBMgr();
+    SwDBManager* pDBManager = rSh.GetDBManager();
     if(aURL.Complete.equalsAscii(cURLInsertContent))
     {
         ::svx::ODataAccessDescriptor aDescriptor(aArgs);
         SwMergeDescriptor aMergeDesc( DBMGR_MERGE, rSh, aDescriptor );
-        pDBMgr->MergeNew(aMergeDesc);
+        pDBManager->MergeNew(aMergeDesc);
     }
     else if(aURL.Complete.equalsAscii(cURLInsertColumns))
     {
-        pDBMgr->InsertText(rSh, aArgs);
+        pDBManager->InsertText(rSh, aArgs);
     }
     else if(aURL.Complete.equalsAscii(cURLFormLetter))
     {
diff --git a/sw/source/core/uibase/uno/unomailmerge.cxx b/sw/source/core/uibase/uno/unomailmerge.cxx
index 3ddac23d7b1d..11fb62aef174 100644
--- a/sw/source/core/uibase/uno/unomailmerge.cxx
+++ b/sw/source/core/uibase/uno/unomailmerge.cxx
@@ -669,7 +669,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
             throw IllegalArgumentException("Invalid value of property: OutputType", static_cast < cppu::OWeakObject * > ( this ), 0 );
     }
 
-    SwDBMgr* pMgr = rSh.GetDBMgr();
+    SwDBManager* pMgr = rSh.GetDBManager();
     //force layout creation
     rSh.CalcLayout();
     OSL_ENSURE( pMgr, "database manager missing" );
diff --git a/sw/source/core/uibase/utlui/initui.cxx b/sw/source/core/uibase/utlui/initui.cxx
index e9989459085c..44dc6762b69a 100644
--- a/sw/source/core/uibase/utlui/initui.cxx
+++ b/sw/source/core/uibase/utlui/initui.cxx
@@ -149,7 +149,7 @@ std::vector<OUString>* pAuthFieldTypeList = 0;
 void _FinitUI()
 {
 #if HAVE_FEATURE_DBCONNECTIVITY
-    SwDBMgr::RemoveDbtoolsClient();
+    SwDBManager::RemoveDbtoolsClient();
 #endif
     delete SwViewShell::GetShellRes();
     SwViewShell::SetShellRes( 0 );
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);