User: vg Date: 2008-01-29 08:51:35+0000 Modified: dba/dbaccess/source/ui/app/AppController.cxx
Log: INTEGRATION: CWS dba24e_SRC680 (1.50.4); FILE MERGED 2007/12/19 12:27:42 oj 1.50.4.2: #i84339# some code cleanups for the wizards 2007/12/04 10:01:39 oj 1.50.4.1: #i69740# notify selection when container changed File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.cxx?r1=1.50&r2=1.51 Delta lines: +16 -3 -------------------- --- AppController.cxx 2007-11-21 16:57:49+0000 1.50 +++ AppController.cxx 2008-01-29 08:51:32+0000 1.51 @@ -421,6 +421,14 @@ if ( m_xDataSource.is() ) { m_xDataSource->removePropertyChangeListener(::rtl::OUString(), this); + m_xDataSource->removePropertyChangeListener(PROPERTY_INFO, this); + m_xDataSource->removePropertyChangeListener(PROPERTY_URL, this); + m_xDataSource->removePropertyChangeListener(PROPERTY_ISPASSWORDREQUIRED, this); + m_xDataSource->removePropertyChangeListener(PROPERTY_LAYOUTINFORMATION, this); + m_xDataSource->removePropertyChangeListener(PROPERTY_SUPPRESSVERSIONCL, this); + m_xDataSource->removePropertyChangeListener(PROPERTY_TABLEFILTER, this); + m_xDataSource->removePropertyChangeListener(PROPERTY_TABLETYPEFILTER, this); + m_xDataSource->removePropertyChangeListener(PROPERTY_USER, this); // otherwise we may delete our datasource twice Reference<XPropertySet> xProp = m_xDataSource; m_xDataSource = NULL; @@ -458,7 +466,7 @@ } m_pView = NULL; - OApplicationController_CBASE::disposing(); + OApplicationController_CBASE::disposing(); // here the m_refCount must be equal 5 } //-------------------------------------------------------------------- @@ -1695,6 +1703,9 @@ } InvalidateAll(); + EventObject aEvent(*this); + m_aSelectionListeners.forEach<XSelectionChangeListener>( + ::boost::bind(&XSelectionChangeListener::selectionChanged,_1,boost::cref(aEvent))); } m_eOldType = _eType; @@ -1868,10 +1879,12 @@ ::std::auto_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess(_eType); if ( aHelper->isConnected() ) { + Reference< XComponent > xComponent,xDefinition; if ( E_QUERY == _eType ) - aHelper->newQueryWithPilot( ); + xComponent = aHelper->newQueryWithPilot( ); else - aHelper->newTableWithPilot( ); + xComponent = aHelper->newTableWithPilot( ); + addDocumentListener(xComponent,xDefinition); } } break; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
