3 files changed, 29 insertions, 9 deletions
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index ff2584b12ed3..948756959db2 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: genericcontroller.cxx,v $
  *
- *  $Revision: 1.32 $
+ *  $Revision: 1.33 $
  *
- *  last change: $Author: fs $ $Date: 2002-01-24 19:23:16 $
+ *  last change: $Author: oj $ $Date: 2002-02-11 12:40:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -653,9 +653,7 @@ void OGenericUnoController::setMasterDispatchProvider(const Reference< XDispatch
 // -----------------------------------------------------------------------
 void OGenericUnoController::dispatch(const URL& aURL, const Sequence< PropertyValue >& aArgs) throw(RuntimeException)
 {
-    SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.find(aURL.Complete);
-    if (aIter != m_aSupportedFeatures.end())
-        Execute((sal_uInt16)aIter->second);
+    executeUnChecked(_aURL);
 }
 
 // -----------------------------------------------------------------------
@@ -1008,5 +1006,23 @@ sal_Bool SAL_CALL OGenericUnoController::attachModel(const Reference< XModel > &
     return sal_False;
 }
 // -----------------------------------------------------------------------------
+void OGenericUnoController::executeUnChecked(const ::com::sun::star::util::URL& _rCommand)
+{
+    SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.find(_rCommand.Complete);
+    if (aIter != m_aSupportedFeatures.end())
+        Execute( static_cast<sal_uInt16>(aIter->second) );
+}
+// -----------------------------------------------------------------------------
+void OGenericUnoController::executeChecked(const ::com::sun::star::util::URL& _rCommand)
+{
+    SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.find(_rCommand.Complete);
+    if (aIter != m_aSupportedFeatures.end())
+    {
+        sal_uInt16 nSlotId = static_cast<sal_uInt16>(aIter->second);
+        if ( GetState( nSlotId ).bEnabled )
+            Execute( nSlotId );
+    }
+}
+// -----------------------------------------------------------------------------
 
 
diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx
index 5792c6a99309..f81daaa11b52 100644
--- a/dbaccess/source/ui/inc/QueryDesignView.hxx
+++ b/dbaccess/source/ui/inc/QueryDesignView.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: QueryDesignView.hxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: oj $ $Date: 2002-02-06 07:23:39 $
+ *  last change: $Author: oj $ $Date: 2002-02-11 12:43:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -115,6 +115,7 @@ namespace dbaui
 
         OSelectionBrowseBox*                m_pSelectionBox;    // presents the lower window
         ChildFocusState                     m_eChildFocus;
+        sal_Bool                            m_bInKeyEvent;
 
     public:
         OQueryDesignView(OQueryContainerWindow* pParent, OQueryController* _pController,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& );
diff --git a/dbaccess/source/ui/inc/QueryViewSwitch.hxx b/dbaccess/source/ui/inc/QueryViewSwitch.hxx
index 16c1f04530c2..c0288ac1bc3a 100644
--- a/dbaccess/source/ui/inc/QueryViewSwitch.hxx
+++ b/dbaccess/source/ui/inc/QueryViewSwitch.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: QueryViewSwitch.hxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: oj $ $Date: 2001-10-23 12:30:27 $
+ *  last change: $Author: oj $ $Date: 2002-02-11 12:43:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -111,10 +111,13 @@ namespace dbaui
         void clearDesignView();
         void GetFocus();
         void reset();
+        void GrabFocus();
 
         OQueryDesignView*       getDesignView() const { return m_pDesignView; }
         OQueryContainerWindow*  getContainer() const;
 
+        Window* getActive() const;
+
         void SetPosSizePixel( Point _rPt,Size _rSize);
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const;
     protected: