diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-02-08 09:12:05 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-02-08 09:12:27 +0000 |
commit | 849a2471bd649b252648fa4e43be91dab4d9bdc5 (patch) | |
tree | df146e6687298ab0b9c4eb2c21004ae436009e7e /dbaccess/source | |
parent | 2cae4ff166ad5ad51db49d6b0fab86b2c8090fb8 (diff) |
update unused list
Diffstat (limited to 'dbaccess/source')
-rw-r--r-- | dbaccess/source/ui/app/AppView.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/control/FieldDescControl.cxx | 14 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/FieldDescControl.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/TableDesignView.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/tabledesign/TEditControl.cxx | 13 | ||||
-rw-r--r-- | dbaccess/source/ui/tabledesign/TEditControl.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/tabledesign/TableDesignView.cxx | 23 |
7 files changed, 0 insertions, 58 deletions
diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index d4fa76c35849..23c450161d22 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -307,8 +307,6 @@ namespace dbaui sal_Bool _bTable); SvLBoxEntry* getEntry( const Point& _aPosPixel ) const; - - DECL_LINK( SwitchHdl, Accelerator* ); }; } #endif // DBAUI_APPVIEW_HXX diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index c100d9df5652..30a0bad60579 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -161,7 +161,6 @@ OFieldDescControl::OFieldDescControl( Window* pParent, const ResId& rResId, OTab ,m_nOldVThumb( 0 ) ,m_nOldHThumb( 0 ) ,m_nWidth(50) - ,nDelayedGrabFocusEvent(0) ,m_bAdded(sal_False) ,m_bRightAligned(false) ,pActFieldDescr(NULL) @@ -211,7 +210,6 @@ OFieldDescControl::OFieldDescControl( Window* pParent, OTableDesignHelpBar* pHel ,m_nOldVThumb( 0 ) ,m_nOldHThumb( 0 ) ,m_nWidth(50) - ,nDelayedGrabFocusEvent(0) ,m_bAdded(sal_False) ,m_bRightAligned(false) ,pActFieldDescr(NULL) @@ -275,9 +273,6 @@ OFieldDescControl::~OFieldDescControl() DeactivateAggregate( tpColumnName ); DeactivateAggregate( tpType ); DeactivateAggregate( tpAutoIncrementValue ); - - if(nDelayedGrabFocusEvent) - Application::RemoveUserEvent(nDelayedGrabFocusEvent); } //------------------------------------------------------------------------------ @@ -1560,15 +1555,6 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) SetReadOnly( bRead ); } -//------------------------------------------------------------------------ -IMPL_LINK(OFieldDescControl, DelayedGrabFocus, Control**, ppControl) -{ - nDelayedGrabFocusEvent = 0; - if (*ppControl) - (*ppControl)->GrabFocus(); - - return 0L; -} //------------------------------------------------------------------------------ IMPL_LINK(OFieldDescControl, OnControlFocusGot, Control*, pControl ) diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index cd038229deab..811b0a73591f 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -124,7 +124,6 @@ namespace dbaui long m_nOldHThumb; sal_Int32 m_nWidth; - sal_uLong nDelayedGrabFocusEvent; sal_Bool m_bAdded; bool m_bRightAligned; @@ -135,7 +134,6 @@ namespace dbaui DECL_LINK( FormatClickHdl, Button * ); DECL_LINK( ChangeHdl, ListBox * ); - DECL_LINK( DelayedGrabFocus, Control** ); // von ActivatePropertyField benutzt DECL_LINK( OnControlFocusLost, Control* ); DECL_LINK( OnControlFocusGot, Control* ); diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index 9e9784670de1..185d4005afba 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -114,8 +114,6 @@ namespace dbaui virtual void initialize(); void reSync(); // resync window data with realdata - - DECL_LINK( SwitchHdl, Accelerator* ); }; } #endif // DBAUI_TABLEDESIGNVIEW_HXX diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 13abd860cb73..e18d0d791410 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -193,7 +193,6 @@ OTableEditorCtrl::OTableEditorCtrl(Window* pWindow) ,nDeleteEvent(0) ,nInsNewRowsEvent(0) ,nInvalidateTypeEvent(0) - ,nEntryNotFoundEvent(0) ,m_eChildFocus(NONE) ,nOldDataPos(-1) ,bSaveOnMove(sal_True) @@ -344,8 +343,6 @@ OTableEditorCtrl::~OTableEditorCtrl() Application::RemoveUserEvent( nInsNewRowsEvent ); if( nInvalidateTypeEvent ) Application::RemoveUserEvent( nInvalidateTypeEvent ); - if( nEntryNotFoundEvent ) - Application::RemoveUserEvent( nEntryNotFoundEvent ); ////////////////////////////////////////////////////////////////////// // Controltypen zerstoeren @@ -754,16 +751,6 @@ IMPL_LINK( OTableEditorCtrl, InvalidateFieldType, void*, /*EMPTYTAG*/ ) } //------------------------------------------------------------------------------ -IMPL_LINK( OTableEditorCtrl, EntryNotFound, void*, /*EMPTYTAG*/ ) -{ - DBG_CHKTHIS(OTableEditorCtrl,NULL); - nEntryNotFoundEvent = 0; - ErrorBox( this, ModuleRes(ERR_INVALID_LISTBOX_ENTRY) ).Execute(); - - return 0; -} - -//------------------------------------------------------------------------------ void OTableEditorCtrl::CellModified( long nRow, sal_uInt16 nColId ) { DBG_CHKTHIS(OTableEditorCtrl,NULL); diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index 3128d979b681..1f0bb3d04af6 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -69,7 +69,6 @@ namespace dbaui sal_uLong nDeleteEvent; sal_uLong nInsNewRowsEvent; sal_uLong nInvalidateTypeEvent; - sal_uLong nEntryNotFoundEvent; ChildFocusState m_eChildFocus; long nOldDataPos; @@ -188,7 +187,6 @@ namespace dbaui DECL_LINK( DelayedDelete, void* ); DECL_LINK( DelayedInsNewRows, void* ); DECL_LINK( InvalidateFieldType, void* ); - DECL_LINK( EntryNotFound, void* ); void InitCellController(); sal_Int32 HasFieldName( const String& rFieldName ); diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index fd1a745f573d..ee0c8d505b06 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -256,29 +256,6 @@ void OTableDesignView::resizeDocumentView(Rectangle& _rPlayground) } //------------------------------------------------------------------------------ -IMPL_LINK( OTableDesignView, SwitchHdl, Accelerator*, /*pAcc*/ ) -{ - if( getController().isReadOnly() ) - return 0; - - if( GetDescWin()->HasChildPathFocus() ) - { - GetDescWin()->LoseFocus(); - GetEditorCtrl()->GrabFocus(); - } - else - { - ::boost::shared_ptr<OTableRow> pRow = (*GetEditorCtrl()->GetRowList())[GetEditorCtrl()->GetCurRow()]; - OFieldDescription* pFieldDescr = pRow ? pRow->GetActFieldDescr() : NULL; - if ( pFieldDescr ) - GetDescWin()->GrabFocus(); - else - GetEditorCtrl()->GrabFocus(); - } - - return 0; -} -//------------------------------------------------------------------------------ long OTableDesignView::PreNotify( NotifyEvent& rNEvt ) { sal_Bool bHandled = sal_False; |