summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOcke Janssen <oj@openoffice.org>2001-10-22 07:09:11 +0000
committerOcke Janssen <oj@openoffice.org>2001-10-22 07:09:11 +0000
commitb2dbd2375f63678b280aef2e15432b3e54825ee1 (patch)
tree6a4289accd00e8114bda26767211ec6cad592cc9
parent1eb6fe09e2aa7c28bf4803355d133e4b256f67fb (diff)
#93513# getFocus when adding a table
-rw-r--r--dbaccess/source/ui/inc/JoinDesignView.hxx5
-rw-r--r--dbaccess/source/ui/inc/JoinTableView.hxx5
-rw-r--r--dbaccess/source/ui/querydesign/JoinDesignView.cxx10
-rw-r--r--dbaccess/source/ui/querydesign/JoinTableView.cxx10
4 files changed, 22 insertions, 8 deletions
diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx
index 1198ff99e9649..e23030c8c2f8f 100644
--- a/dbaccess/source/ui/inc/JoinDesignView.hxx
+++ b/dbaccess/source/ui/inc/JoinDesignView.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: JoinDesignView.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: fs $ $Date: 2001-08-23 14:23:57 $
+ * last change: $Author: oj $ $Date: 2001-10-22 08:09:11 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -108,6 +108,7 @@ namespace dbaui
/// late construction
virtual void Construct();
virtual void initialize();
+ virtual void GetFocus();
virtual void SaveTabWinUIConfig(OTableWindow* pWin);
OJoinController* getController() const { return m_pController; }
diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx
index 13818abd3a971..19d515918670d 100644
--- a/dbaccess/source/ui/inc/JoinTableView.hxx
+++ b/dbaccess/source/ui/inc/JoinTableView.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: JoinTableView.hxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: oj $ $Date: 2001-08-27 14:24:58 $
+ * last change: $Author: oj $ $Date: 2001-10-22 08:09:11 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -169,6 +169,7 @@ namespace dbaui
// window override
virtual void StateChanged( StateChangedType nStateChange );
+ virtual void GetFocus();
// own methods
ScrollBar* GetHScrollBar() { return static_cast<OScrollWindowHelper*>(GetParent())->GetHScrollBar(); }
diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index bf7bf99f6e9bb..182655599efa7 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: JoinDesignView.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: oj $ $Date: 2001-08-24 06:38:23 $
+ * last change: $Author: oj $ $Date: 2001-10-22 08:09:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -200,6 +200,12 @@ void OJoinDesignView::SaveTabWinUIConfig(OTableWindow* pWin)
getController()->SaveTabWinPosSize(pWin, m_pScrollWindow->GetHScrollBar()->GetThumbPos(), m_pScrollWindow->GetVScrollBar()->GetThumbPos());
}
// -----------------------------------------------------------------------------
+void OJoinDesignView::GetFocus()
+{
+ if ( m_pTableView && m_pTableView->IsVisible() )
+ m_pTableView->GetFocus();
+}
+// -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 7789dec0ca113..2561d90431102 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.20 $
+ * $Revision: 1.21 $
*
- * last change: $Author: oj $ $Date: 2001-10-11 08:38:13 $
+ * last change: $Author: oj $ $Date: 2001-10-22 08:09:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1559,5 +1559,11 @@ void OJoinTableView::lookForUiActivities()
{
}
// -----------------------------------------------------------------------------
+void OJoinTableView::GetFocus()
+{
+ GrabTabWinFocus();
+}
+// -----------------------------------------------------------------------------
+