Tag: cws_dev300_dba30d User: fs Date: 2008-05-29 11:30:26+0000 Modified: dba/dbaccess/source/ui/browser/dataview.cxx
Log: during #i80943#: refactoring: IController now passed around as reference, not as pointer File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: dataview.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/dataview.cxx?r1=1.22.30.1&r2=1.22.30.2 Delta lines: +8 -9 ------------------- --- dataview.cxx 2008-05-28 21:44:46+0000 1.22.30.1 +++ dataview.cxx 2008-05-29 11:30:23+0000 1.22.30.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dataview.cxx,v $ - * $Revision: 1.22.30.1 $ + * $Revision: 1.22.30.2 $ * * This file is part of OpenOffice.org. * @@ -98,17 +98,16 @@ DBG_NAME(ODataView) // ------------------------------------------------------------------------- ODataView::ODataView( Window* pParent, - IController* _pController, + IController& _rController, const Reference< XMultiServiceFactory >& _rFactory, WinBits nStyle) :Window(pParent,nStyle) ,m_xServiceFactory(_rFactory) - ,m_pController( _pController ) + ,m_rController( _rController ) ,m_pSeparator( NULL ) { DBG_CTOR(ODataView,NULL); - OSL_ENSURE(m_pController,"Controller must be not NULL!"); - m_pController->acquire(); + m_rController.acquire(); m_pAccel.reset(::svt::AcceleratorExecute::createAcceleratorHelper()); } @@ -123,7 +122,7 @@ DBG_DTOR(ODataView,NULL); enableSeparator( sal_False ); - m_pController->release(); + m_rController.release(); } // ------------------------------------------------------------------------- @@ -207,7 +206,7 @@ case EVENT_KEYUP: case EVENT_MOUSEBUTTONDOWN: case EVENT_MOUSEBUTTONUP: - bHandled = m_pController->interceptUserInput( _rNEvt ); + bHandled = m_rController.interceptUserInput( _rNEvt ); break; } return bHandled ? 1L : Window::PreNotify( _rNEvt ); @@ -220,7 +219,7 @@ if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) { // Check if we need to get new images for normal/high contrast mode - m_pController->notifyHiContrastChanged(); + m_rController.notifyHiContrastChanged(); } } // ----------------------------------------------------------------------------- @@ -235,7 +234,7 @@ (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) { // Check if we need to get new images for normal/high contrast mode - m_pController->notifyHiContrastChanged(); + m_rController.notifyHiContrastChanged(); } } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
