User: kz Date: 2008-06-25 12:55:26+0000 Modified: dba/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
Log: INTEGRATION: CWS dba30d (1.18.30); FILE MERGED 2008/05/29 11:30:22 fs 1.18.30.1: during #i80943#: refactoring: IController now passed around as reference, not as pointer File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: querycontainerwindow.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/querycontainerwindow.cxx?r1=1.18&r2=1.19 Delta lines: +7 -7 ------------------- --- querycontainerwindow.cxx 2008-04-10 16:28:24+0000 1.18 +++ querycontainerwindow.cxx 2008-06-25 12:55:23+0000 1.19 @@ -82,13 +82,13 @@ //= OQueryContainerWindow //===================================================================== DBG_NAME(OQueryContainerWindow) - OQueryContainerWindow::OQueryContainerWindow(Window* pParent, OQueryController* _pController,const Reference< XMultiServiceFactory >& _rFactory) - :ODataView(pParent,_pController, _rFactory) + OQueryContainerWindow::OQueryContainerWindow(Window* pParent, OQueryController& _rController,const Reference< XMultiServiceFactory >& _rFactory) + :ODataView( pParent, _rController, _rFactory ) ,m_pViewSwitch(NULL) ,m_pBeamer(NULL) { DBG_CTOR(OQueryContainerWindow,NULL); - m_pViewSwitch = new OQueryViewSwitch(this,_pController,_rFactory); + m_pViewSwitch = new OQueryViewSwitch( this, _rController, _rFactory ); m_pSplitter = new Splitter(this,WB_VSCROLL); m_pSplitter->Hide(); @@ -210,10 +210,10 @@ case EVENT_GETFOCUS: if ( m_pViewSwitch ) { - OJoinController* pController = m_pViewSwitch->getDesignView()->getController(); - pController->InvalidateFeature(SID_CUT); - pController->InvalidateFeature(SID_COPY); - pController->InvalidateFeature(SID_PASTE); + OJoinController& rController = m_pViewSwitch->getDesignView()->getController(); + rController.InvalidateFeature(SID_CUT); + rController.InvalidateFeature(SID_COPY); + rController.InvalidateFeature(SID_PASTE); } } return bHandled ? 1L : ODataView::PreNotify(rNEvt); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
