diff options
| -rw-r--r-- | dbaccess/source/ui/inc/TableDesignView.hxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/ui/tabledesign/TableDesignView.cxx | 10 |
2 files changed, 6 insertions, 10 deletions
diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index be2a31705134..f96cdeec374e 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -2,9 +2,9 @@ * * $RCSfile: TableDesignView.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: fs $ $Date: 2002-06-05 08:10:00 $ + * last change: $Author: oj $ $Date: 2002-07-25 06:59:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -115,8 +115,6 @@ namespace dbaui ::com::sun::star::lang::Locale m_aLocale; OTableBorderWindow* m_pWin; OTableController* m_pController; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > - m_xController; // keep the target of m_pController alive ChildFocusState m_eChildFocus; protected: diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index 3fcfb62f1f3a..9fb43663b460 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.20 $ + * $Revision: 1.21 $ * - * last change: $Author: fs $ $Date: 2002-06-05 08:16:20 $ + * last change: $Author: oj $ $Date: 2002-07-25 07:03:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -265,7 +265,6 @@ OTableDesignView::OTableDesignView( Window* pParent, ) : ODataView( pParent ,_pController,_rxOrb ) ,m_pController( _pController ) - ,m_xController( _pController ) ,m_eChildFocus(NONE) { DBG_CTOR(OTableDesignView,NULL); @@ -294,7 +293,6 @@ OTableDesignView::~OTableDesignView() } m_pController = NULL; - m_xController.clear(); } // ----------------------------------------------------------------------------- @@ -336,7 +334,7 @@ IMPL_LINK( OTableDesignView, SwitchHdl, Accelerator*, pAcc ) { OTableRow* pRow = (*GetEditorCtrl()->GetRowList())[GetEditorCtrl()->GetCurRow()]; OFieldDescription* pFieldDescr = pRow ? pRow->GetActFieldDescr() : NULL; - if (pFieldDescr) + if ( pFieldDescr ) GetDescWin()->GrabFocus(); else GetEditorCtrl()->GrabFocus(); @@ -441,7 +439,7 @@ void OTableDesignView::reSync() GetEditorCtrl()->DeactivateCell(); OTableRow* pRow = (*GetEditorCtrl()->GetRowList())[GetEditorCtrl()->GetCurRow()]; OFieldDescription* pFieldDescr = pRow ? pRow->GetActFieldDescr() : NULL; - if(pFieldDescr) + if ( pFieldDescr ) GetDescWin()->DisplayData(pFieldDescr); } // ----------------------------------------------------------------------------- |