Tag: cws_src680_dba24 User: oj Date: 05/03/08 02:16:18 Modified: /dba/dbaccess/source/filter/xml/ dbloader2.cxx
Log: RESYNC: (1.7-1.8); FILE MERGED 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.5.18.5&r2=1.5.18.6 Delta lines: +15 -12 --------------------- --- dbloader2.cxx 3 Mar 2005 11:30:21 -0000 1.5.18.5 +++ dbloader2.cxx 8 Mar 2005 10:16:15 -0000 1.5.18.6 @@ -199,6 +199,7 @@ using namespace ::com::sun::star::sdb; namespace css = ::com::sun::star; using namespace ::com::sun::star::ui::dialogs; +namespace css = ::com::sun::star; // ------------------------------------------------------------------------- namespace dbaxml @@ -498,7 +499,9 @@ try { - Reference< ::com::sun::star::document::XEventListener > xDocEventBroadcaster(m_xServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.GlobalEventBroadcaster"))), + 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< ::com::sun::star::document::XEventListener > xDocEventBroadcaster(xModel,UNO_QUERY); UNO_QUERY); if ( xDocEventBroadcaster.is() ) { @@ -572,17 +575,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); @@ -654,3 +656,4 @@ xNewKey->setAsciiValue( ::rtl::OUString::createFromAscii("private:factory/sdatabase") ); } // ----------------------------------------------------------------------------- + --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
