User: hr Date: 2007-09-26 14:41:53+0000 Modified: dba/dbaccess/source/filter/xml/dbloader2.cxx
Log: INTEGRATION: CWS dba24a (1.27.18); FILE MERGED 2007/08/24 11:32:13 fs 1.27.18.2: RESYNC: (1.27-1.28); FILE MERGED 2007/08/10 07:56:53 oj 1.27.18.1: #i46484# fire event OnCreate and OnLoadFinished 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.28&r2=1.29 Delta lines: +23 -4 -------------------- --- dbloader2.cxx 2007-08-17 13:34:19+0000 1.28 +++ dbloader2.cxx 2007-09-26 14:41:50+0000 1.29 @@ -625,11 +625,30 @@ xModelCollection->insert(css::uno::makeAny(xModel)); Reference< css::document::XEventListener > xDocEventBroadcaster(xModel,UNO_QUERY_THROW); - const sal_Char* pEventName = bCreateNew && !bDidLoadExisting ? "OnNew" : "OnLoad"; - css::document::EventObject aEvent( xModel, ::rtl::OUString::createFromAscii( pEventName ) ); + css::document::EventObject aEvent; + aEvent.Source = xModel; + ::std::vector< ::rtl::OUString > aEvents; + if ( bCreateNew && !bDidLoadExisting ) + { + aEvents.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnCreate"))); + aEvents.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnNew"))); // UI event + } + else + { + aEvents.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnLoadFinished"))); + aEvents.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnLoad"))); // UI event + } + + std::vector< rtl::OUString >::iterator aIter = aEvents.begin(); + const std::vector< rtl::OUString >::iterator aEnd = aEvents.end(); + for (; aIter != aEnd; ++aIter) + { + aEvent.EventName = *aIter; xDocEventBroadcaster->notifyEvent(aEvent); - Reference< css::document::XEventListener > xGlobalDocEventBroadcaster(xModelCollection,UNO_QUERY_THROW); + } + aEvent.EventName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnViewCreated")); + Reference< css::document::XEventListener > xGlobalDocEventBroadcaster(xModelCollection,UNO_QUERY_THROW); xGlobalDocEventBroadcaster->notifyEvent(aEvent); } catch(Exception) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
