diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index c2b9eeb12434..5dd48dde6dcc 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: JoinController.cxx,v $
  *
- *  $Revision: 1.24 $
+ *  $Revision: 1.25 $
  *
- *  last change: $Author: oj $ $Date: 2002-05-24 13:19:53 $
+ *  last change: $Author: oj $ $Date: 2002-05-29 08:30:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -214,6 +214,7 @@ OJoinDesignView* OJoinController::getJoinView()
 void OJoinController::disposing()
 {
     OJoinController_BASE::disposing();
+    m_aUndoManager.Clear();
     m_pView         = NULL;
     m_pAddTabDlg    = NULL;
 
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 2f3ee8e71d81..02c3e9625a04 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: JoinTableView.cxx,v $
  *
- *  $Revision: 1.35 $
+ *  $Revision: 1.36 $
  *
- *  last change: $Author: fs $ $Date: 2002-05-24 13:00:41 $
+ *  last change: $Author: oj $ $Date: 2002-05-29 08:28:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -274,9 +274,6 @@ OJoinTableView::~OJoinTableView()
     m_pLastFocusTabWin  = NULL;
     m_pSelectedConn     = NULL;
     m_aTableMap.clear();
-    // den Undo-Manager des Dokuments leeren (da die UndoActions sich eventuell TabWins von mir halten, das gibt sonst eine
-    // Assertion in Window::~Window)
-    m_pView->getController()->getUndoMgr()->Clear();
     m_pAccessible = NULL;
 }
 //------------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx
index 3fe4b02bdaa9..58ca167bbabe 100644
--- a/dbaccess/source/ui/querydesign/QueryTextView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: QueryTextView.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: oj $ $Date: 2002-02-06 08:15:30 $
+ *  last change: $Author: oj $ $Date: 2002-05-29 08:28:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -130,7 +130,8 @@ OQueryTextView::OQueryTextView(OQueryContainerWindow* _pParent)
 // -----------------------------------------------------------------------------
 OQueryTextView::~OQueryTextView()
 {
-    DELETEZ(m_pEdit);
+    ::std::auto_ptr<Window> aTemp(m_pEdit);
+    m_pEdit = NULL;
     DBG_DTOR(OQueryTextView,NULL);
 }
 // -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index 8f5ee9b4e9ac..08b0510dd91b 100644
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: QueryViewSwitch.cxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: oj $ $Date: 2002-05-06 09:48:50 $
+ *  last change: $Author: oj $ $Date: 2002-05-29 08:31:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -127,9 +127,14 @@ OQueryViewSwitch::OQueryViewSwitch(OQueryContainerWindow* _pParent, OQueryContro
 // -----------------------------------------------------------------------------
 OQueryViewSwitch::~OQueryViewSwitch()
 {
-    DELETEZ( m_pTextView );
-    DELETEZ( m_pDesignView );
-
+    {
+        ::std::auto_ptr<Window> aTemp(m_pTextView);
+        m_pTextView = NULL;
+    }
+    {
+        ::std::auto_ptr<Window> aTemp(m_pDesignView);
+        m_pDesignView = NULL;
+    }
     DBG_DTOR(OQueryViewSwitch,NULL);
 }
 // -------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index b56f34b0bb7b..1ebd5ce31018 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: querycontainerwindow.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: oj $ $Date: 2002-05-06 09:52:47 $
+ *  last change: $Author: oj $ $Date: 2002-05-29 08:28:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -125,10 +125,22 @@ namespace dbaui
         if(m_xBeamer.is())
             m_xBeamer->setComponent(NULL,NULL);
         m_xBeamer   = NULL;
-        DELETEZ( m_pBeamer );
-        DELETEZ( m_pBeamerSeparator );
-        DELETEZ( m_pSplitter );
-        DELETEZ( m_pViewSwitch );
+        {
+            ::std::auto_ptr<Window> aTemp(m_pBeamer);
+            m_pBeamer = NULL;
+        }
+        {
+            ::std::auto_ptr<Window> aTemp(m_pBeamerSeparator);
+            m_pBeamerSeparator = NULL;
+        }
+        {
+            ::std::auto_ptr<Window> aTemp(m_pSplitter);
+            m_pSplitter = NULL;
+        }
+        {
+            ::std::auto_ptr<OQueryViewSwitch> aTemp(m_pViewSwitch);
+            m_pViewSwitch = NULL;
+        }
         DBG_DTOR(OQueryContainerWindow,NULL);
     }
     // -----------------------------------------------------------------------------
@@ -299,6 +311,9 @@ namespace dbaui
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.7  2002/05/06 09:52:47  oj
+ *  #96363# change return type of switchView
+ *
  *  Revision 1.6  2002/05/02 07:54:11  oj
  *  #98916# enable F6 key
  *
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index 310e761e41c5..348d2a35a2c0 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableDesignView.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: oj $ $Date: 2002-05-02 07:33:04 $
+ *  last change: $Author: oj $ $Date: 2002-05-29 08:28:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -146,8 +146,14 @@ OTableBorderWindow::~OTableBorderWindow()
     m_pEditorCtrl->Hide();
     m_pFieldDescWin->Hide();
 
-    DELETEZ(m_pEditorCtrl);
-    DELETEZ(m_pFieldDescWin);
+    {
+        ::std::auto_ptr<Window> aTemp(m_pEditorCtrl);
+        m_pEditorCtrl = NULL;
+    }
+    {
+        ::std::auto_ptr<Window> aTemp(m_pFieldDescWin);
+        m_pFieldDescWin = NULL;
+    }
 }
 // -----------------------------------------------------------------------------
 void OTableBorderWindow::Resize()