Tag: cws_src680_dba24 User: oj Date: 05/03/08 02:15:53 Modified: /dba/dbaccess/source/core/dataaccess/ databasedocument.cxx
Log: RESYNC: (1.11-1.13); FILE MERGED File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: databasedocument.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasedocument.cxx?r1=1.8.2.12&r2=1.8.2.13 Delta lines: +31 -12 --------------------- --- databasedocument.cxx 25 Feb 2005 11:42:20 -0000 1.8.2.12 +++ databasedocument.cxx 8 Mar 2005 10:15:51 -0000 1.8.2.13 @@ -112,8 +112,8 @@ #ifndef _COMPHELPER_MEDIADESCRIPTOR_HXX_ #include <comphelper/mediadescriptor.hxx> #endif -#ifndef _DRAFTS_COM_SUN_STAR_UI_XUICONFIGURATIONSTORAGE_HPP_ -#include <drafts/com/sun/star/ui/XUIConfigurationStorage.hpp> +#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONSTORAGE_HPP_ +#include <com/sun/star/ui/XUIConfigurationStorage.hpp> #endif #ifndef DBA_COREDATAACCESS_COMMITLISTENER_HXX #include "commitlistener.hxx" @@ -154,7 +154,7 @@ using namespace ::com::sun::star::xml::sax; using namespace ::cppu; using namespace ::osl; - +namespace css = ::com::sun::star; //........................................................................ namespace dbaccess { @@ -219,7 +219,6 @@ OSL_ENSURE(0,"Could not create GlobalEventBroadcaster!"); } } - //-------------------------------------------------------------------------- ODatabaseDocument::~ODatabaseDocument() { @@ -665,6 +664,25 @@ notifyEvent(aEvent.EventName); } // ----------------------------------------------------------------------------- +// ::com::sun::star::document::XEventBroadcaster +void SAL_CALL ODatabaseSource::addEventListener(const css::uno::Reference< css::document::XEventListener >& _xListener ) throw (css::uno::RuntimeException) +{ + m_aDocEventListeners.addInterface(_xListener); +} +// ----------------------------------------------------------------------------- +void SAL_CALL ODatabaseSource::removeEventListener( const css::uno::Reference< css::document::XEventListener >& _xListener ) throw (css::uno::RuntimeException) +{ + m_aDocEventListeners.removeInterface(_xListener); +} +// ----------------------------------------------------------------------------- +// ::com::sun::star::document::XEventListener +void SAL_CALL ODatabaseSource::notifyEvent( const css::document::EventObject& aEvent ) throw (css::uno::RuntimeException) +{ + // used only to forward external events (e.g. for doc creation) from the frame loader + // to the global event broadcaster and all other interested doc event listener. + notifyEvent(aEvent.EventName); +} +// ----------------------------------------------------------------------------- // ::com::sun::star::view::XPrintable Sequence< PropertyValue > SAL_CALL ODatabaseDocument::getPrinter( ) throw (RuntimeException) { @@ -977,7 +995,7 @@ xStatusIndicator->end(); } // ----------------------------------------------------------------------------- -Reference< ::drafts::com::sun::star::ui::XUIConfigurationManager > SAL_CALL ODatabaseDocument::getUIConfigurationManager( ) throw (RuntimeException) +Reference< ::com::sun::star::ui::XUIConfigurationManager > SAL_CALL ODatabaseSource::getUIConfigurationManager( ) throw (RuntimeException) { ::connectivity::checkDisposed(ODatabaseDocument_OfficeDocument::rBHelper.bDisposed); OSL_ENSURE(m_pImpl.is(),"Impl is NULL"); @@ -985,12 +1003,12 @@ if ( !m_xUIConfigurationManager.is() ) { - m_xUIConfigurationManager = Reference< ::drafts::com::sun::star::ui::XUIConfigurationManager >( - m_pImpl->m_xServiceFactory->createInstance( - ::rtl::OUString::createFromAscii( "drafts.com.sun.star.ui.UIConfigurationManager" )), + m_xUIConfigurationManager = Reference< ::com::sun::star::ui::XUIConfigurationManager >( + m_xServiceFactory->createInstance( + ::rtl::OUString::createFromAscii( "com.sun.star.ui.UIConfigurationManager" )), UNO_QUERY ); - Reference< ::drafts::com::sun::star::ui::XUIConfigurationStorage > xUIConfigStorage( m_xUIConfigurationManager, UNO_QUERY ); + Reference< ::com::sun::star::ui::XUIConfigurationStorage > xUIConfigStorage( m_xUIConfigurationManager, UNO_QUERY ); if ( xUIConfigStorage.is() ) { rtl::OUString aUIConfigFolderName( RTL_CONSTASCII_USTRINGPARAM( "Configurations2" )); @@ -1304,4 +1322,5 @@ //........................................................................ } // namespace dbaccess //........................................................................ + --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
