INTEGRATION: CWS os10 (1.19.44); FILE MERGED

2003/05/14 07:33:55 os 1.19.44.1: #109593# remove SwDBToolsClient in SwDLL::Exit instead of using a static object

1 files changed, 7 insertions, 2 deletions

diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index a28adfe9abba..9e246351c52e 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbmgr.hxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: hr $ $Date: 2003-04-04 18:09:45 $
+ *  last change: $Author: vg $ $Date: 2003-05-26 08:13:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -199,6 +199,9 @@ class SwConnectionDisposedListener_Impl;
 class SwNewDBMgr
 {
 friend class SwConnectionDisposedListener_Impl;
+
+    static SwDbtoolsClient* pDbtoolsClient;
+
     String              sEMailAddrFld;  // Mailing: Spaltenname der E-Mail Adresse
     String              sSubject;       // Mailing: Subject
     String              sAttached;      // Mailing: Attachte Files
@@ -363,6 +366,8 @@ public:
     static ::com::sun::star::uno::Sequence<rtl::OUString> GetExistingDatabaseNames();
 
     static SwDbtoolsClient&    GetDbtoolsClient();
+    // has to be called from _FinitUI()
+    static void                RemoveDbtoolsClient();
 
     /** try to get the data source from the given connection through the XChild interface.
         If this is not possible, the data source will be created through its name.