User: kz Date: 05/03/04 01:38:47 Modified: /dba/dbaccess/source/filter/xml/ dbloader2.cxx
Log: INTEGRATION: CWS fwkpostbeta03 (1.6.12); FILE MERGED 2005/02/15 09:10:04 as 1.6.12.1: #i40349# add db models to global model collection; provide document events for all db models File Changes: Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: dbloader2.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/dbloader2.cxx?r1=1.7&r2=1.8 Delta lines: +9 -8 ------------------- --- dbloader2.cxx 17 Feb 2005 11:05:28 -0000 1.7 +++ dbloader2.cxx 4 Mar 2005 09:38:43 -0000 1.8 @@ -190,6 +190,7 @@ using namespace ::com::sun::star::document; using namespace ::com::sun::star::registry; using namespace ::com::sun::star::ui::dialogs; +namespace css = ::com::sun::star; // ------------------------------------------------------------------------- namespace dbaxml @@ -529,17 +530,16 @@ xController->attachFrame(rFrame); try { - Reference< ::com::sun::star::document::XEventListener > xDocEventBroadcaster(m_xServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.GlobalEventBroadcaster"))), - UNO_QUERY); - if ( xDocEventBroadcaster.is() ) - { - ::com::sun::star::document::EventObject aEvent(xModel, bCreateNew ? ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnNew")) : ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnLoad"))); + Reference< css::container::XSet > xModelCollection(m_xServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.GlobalEventBroadcaster"))),UNO_QUERY_THROW); + xModelCollection->insert(css::uno::makeAny(xModel)); + + Reference< css::document::XEventListener > xDocEventBroadcaster(xModel,UNO_QUERY_THROW); + css::document::EventObject aEvent(xModel, bCreateNew ? ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnNew")) : ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnLoad"))); xDocEventBroadcaster->notifyEvent(aEvent); } - } catch(Exception) { - OSL_ENSURE(0,"Could not create GlobalEventBroadcaster!"); + OSL_ENSURE(0,"Could not add database model to global model collection and broadcast the events OnNew/OnLoad!"); } rListener->loadFinished(this); @@ -611,3 +611,4 @@ xNewKey->setAsciiValue( ::rtl::OUString::createFromAscii("private:factory/sdatabase") ); } // ----------------------------------------------------------------------------- + --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
