User: kz Date: 2008-06-25 11:37:06+0000 Modified: dba/reportdesign/source/ui/report/ReportController.cxx
Log: INTEGRATION: CWS dba30d (1.14.20); FILE MERGED 2008/06/11 20:05:45 fs 1.14.20.2: XSelectionSupplier not implemented by the base class anymore 2008/06/02 08:50:13 fs 1.14.20.1: ReportController help as reference now, not as pointer (cause by change in ODataView which does this, too) File Changes: Directory: /dba/reportdesign/source/ui/report/ ============================================== File [changed]: ReportController.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ReportController.cxx?r1=1.16&r2=1.17 Delta lines: +23 -5 -------------------- --- ReportController.cxx 2008-06-18 06:59:32+0000 1.16 +++ ReportController.cxx 2008-06-25 11:37:04+0000 1.17 @@ -266,6 +266,7 @@ // ----------------------------------------------------------------------------- OReportController::OReportController(Reference< XComponentContext > const & xContext) : OReportController_BASE(Reference< XMultiServiceFactory >(xContext->getServiceManager(),UNO_QUERY)) +,m_aSelectionListeners( m_aMutex ) ,m_pMyOwnView(NULL) ,m_pClipbordNotifier(NULL) ,m_pGroupsFloater(NULL) @@ -295,7 +296,6 @@ // ----------------------------------------------------------------------------- void OReportController::disposing() { - if ( getView() && m_pClipbordNotifier ) { m_pClipbordNotifier->ClearCallbackLink(); @@ -335,7 +335,15 @@ { } } + + { + EventObject aDisposingEvent( *this ); + m_aSelectionListeners.disposeAndClear( aDisposingEvent ); + } + OReportController_BASE::disposing(); + + // disconnect(); try { @@ -1655,7 +1663,7 @@ // ----------------------------------------------------------------------------- sal_Bool OReportController::Construct(Window* pParent) { - m_pMyOwnView = new ODesignView(pParent,getORB(),this); + m_pMyOwnView = new ODesignView(pParent,getORB(),*this); StartListening(*(m_pMyOwnView)); m_pView = m_pMyOwnView; @@ -2794,6 +2802,16 @@ return aRet; } // ----------------------------------------------------------------------------- +void SAL_CALL OReportController::addSelectionChangeListener( const Reference< view::XSelectionChangeListener >& _Listener ) throw (RuntimeException) +{ + m_aSelectionListeners.addInterface( _Listener ); +} +// ----------------------------------------------------------------------------- +void SAL_CALL OReportController::removeSelectionChangeListener( const Reference< view::XSelectionChangeListener >& _Listener ) throw (RuntimeException) +{ + m_aSelectionListeners.removeInterface( _Listener ); +} +// ----------------------------------------------------------------------------- void OReportController::createNewFunction(const uno::Any& _aValue) { uno::Reference< container::XIndexContainer> xFunctions(_aValue,uno::UNO_QUERY_THROW); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
