Rename SwDBMgr -> SwDBManager.

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

Change-Id: I2ceb3f1790321b70d5936c35e13870439969e64d

6 files changed, 16 insertions, 16 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;