#92232# fixes for BIGINT type and new property HELPTEXT

5 files changed, 23 insertions, 15 deletions

diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx
index bbc301a552ab..92f565d8d7d7 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.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: fs $ $Date: 2001-08-23 14:39:09 $
+ *  last change: $Author: oj $ $Date: 2001-09-20 12:56:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -130,7 +130,7 @@ OQueryTextView::OQueryTextView(OQueryContainerWindow* _pParent)
 // -----------------------------------------------------------------------------
 OQueryTextView::~OQueryTextView()
 {
-    delete m_pEdit;
+    DELETEZ(m_pEdit);
     DBG_DTOR(OQueryTextView,NULL);
 }
 // -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 837652000fed..47c2e3eb3955 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableWindow.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: oj $ $Date: 2001-08-09 13:30:50 $
+ *  last change: $Author: oj $ $Date: 2001-09-20 12:56:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -177,7 +177,7 @@ OTableWindow::~OTableWindow()
     if (m_pListBox)
     {
         EmptyListBox();
-        delete m_pListBox;
+        DELETEZ(m_pListBox);
     }
     DBG_DTOR(OTableWindow,NULL);
 }
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index f9db96e132d5..223caa4ed630 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableWindowListBox.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: hr $ $Date: 2001-08-14 14:51:05 $
+ *  last change: $Author: oj $ $Date: 2001-09-20 12:56:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -128,6 +128,7 @@ OTableWindowListBox::~OTableWindowListBox()
 {
     if( m_aScrollTimer.IsActive() )
         m_aScrollTimer.Stop();
+    m_pTabWin = NULL;
     DBG_DTOR(OTableWindowListBox,NULL);
 }
 
@@ -374,7 +375,8 @@ void OTableWindowListBox::LoseFocus()
 //------------------------------------------------------------------------------
 void OTableWindowListBox::GetFocus()
 {
-    m_pTabWin->GetFocus();
+    if(m_pTabWin)
+        m_pTabWin->GetFocus();
     SvTreeListBox::GetFocus();
     if (GetCurEntry() != NULL)
         if (GetSelectionCount() == 0)
diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
index 18e2ebc36aa5..2a07082c22c8 100644
--- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableWindowTitle.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: oj $ $Date: 2001-08-27 06:57:23 $
+ *  last change: $Author: oj $ $Date: 2001-09-20 12:56:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -130,13 +130,15 @@ OTableWindowTitle::OTableWindowTitle( OTableWindow* pParent ) :
 //------------------------------------------------------------------------------
 OTableWindowTitle::~OTableWindowTitle()
 {
+    m_pTabWin = NULL;
     DBG_DTOR(OTableWindowTitle,NULL);
 }
 
 //------------------------------------------------------------------------------
 void OTableWindowTitle::GetFocus()
 {
-    m_pTabWin->GetFocus();
+    if(m_pTabWin)
+        m_pTabWin->GetFocus();
 }
 
 //------------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index ed56185e6f1e..74bf5988104c 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.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2001-09-07 10:05:58 $
+ *  last change: $Author: oj $ $Date: 2001-09-20 12:56:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -184,7 +184,8 @@ namespace dbaui
     // -----------------------------------------------------------------------------
     void OQueryContainerWindow::GetFocus()
     {
-        m_pViewSwitch->GetFocus();
+        if(m_pViewSwitch)
+            m_pViewSwitch->GetFocus();
     }
     // -----------------------------------------------------------------------------
     IMPL_LINK( OQueryContainerWindow, SplitHdl, void*, p )
@@ -280,6 +281,9 @@ namespace dbaui
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.2  2001/09/07 10:05:58  fs
+ *  #65293# syntax
+ *
  *  Revision 1.1  2001/08/23 14:39:40  fs
  *  initial checkin - outsourced from QueryTextView.hxx (the container window for the query design)
  *