User: kz Date: 2008-06-25 13:02:08+0000 Modified: dba/dbaccess/source/ui/tabledesign/TableDesignView.cxx
Log: INTEGRATION: CWS dba30d (1.31.30); FILE MERGED 2008/05/29 11:27:01 fs 1.31.30.1: during #i80943#: refactoring: IController now passed around as reference, not as pointer File Changes: Directory: /dba/dbaccess/source/ui/tabledesign/ =============================================== File [changed]: TableDesignView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/TableDesignView.cxx?r1=1.31&r2=1.32 Delta lines: +4 -6 ------------------- --- TableDesignView.cxx 2008-04-10 16:41:37+0000 1.31 +++ TableDesignView.cxx 2008-06-25 13:02:05+0000 1.32 @@ -224,10 +224,10 @@ //------------------------------------------------------------------------------ OTableDesignView::OTableDesignView( Window* pParent, const Reference< XMultiServiceFactory >& _rxOrb, - OTableController* _pController + OTableController& _rController ) : - ODataView( pParent ,_pController,_rxOrb ) - ,m_pController( _pController ) + ODataView( pParent, _rController,_rxOrb ) + ,m_rController( _rController ) ,m_eChildFocus(NONE) { DBG_CTOR(OTableDesignView,NULL); @@ -254,8 +254,6 @@ ::std::auto_ptr<Window> aTemp(m_pWin); m_pWin = NULL; } - - m_pController = NULL; } // ----------------------------------------------------------------------------- @@ -285,7 +283,7 @@ //------------------------------------------------------------------------------ IMPL_LINK( OTableDesignView, SwitchHdl, Accelerator*, /*pAcc*/ ) { - if( getController()->isReadOnly() ) + if( getController().isReadOnly() ) return 0; if( GetDescWin()->HasChildPathFocus() ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
