diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-25 12:02:05 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-25 12:02:05 +0000 |
| commit | a3b9202b308717c9bc6bcf8c1a6828977f80b50f (patch) | |
| tree | 1a1b6829dfcc9646b91b02a6dab19b7166a18bfa /dbaccess | |
| parent | 4e863d774b95d5c22bbbfa483f7aea4135c7294e (diff) | |
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
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/tabledesign/TableDesignView.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index 9d4d6892374e..c1b6ddb9978c 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: TableDesignView.cxx,v $ - * $Revision: 1.31 $ + * $Revision: 1.32 $ * * This file is part of OpenOffice.org. * @@ -224,10 +224,10 @@ DBG_NAME(OTableDesignView); //------------------------------------------------------------------------------ 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 @@ OTableDesignView::~OTableDesignView() ::std::auto_ptr<Window> aTemp(m_pWin); m_pWin = NULL; } - - m_pController = NULL; } // ----------------------------------------------------------------------------- @@ -285,7 +283,7 @@ void OTableDesignView::resizeDocumentView(Rectangle& _rPlayground) //------------------------------------------------------------------------------ IMPL_LINK( OTableDesignView, SwitchHdl, Accelerator*, /*pAcc*/ ) { - if( getController()->isReadOnly() ) + if( getController().isReadOnly() ) return 0; if( GetDescWin()->HasChildPathFocus() ) |