User: rt Date: 2008-01-30 08:34:15+0000 Modified: dba/dbaccess/source/core/dataaccess/datasource.hxx
Log: INTEGRATION: CWS dba24d (1.37.180); FILE MERGED 2007/11/22 13:10:40 fs 1.37.180.1: #i81658# moved the DBA services to use the helpers in unotools/componentresmodule resp. comphelper/componentmodule. Those helpers allow for old- and new-style singletons to co-exist, which wasn't the case for the old helpers previously found in dba_reghelper.hxx File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: datasource.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/datasource.hxx?r1=1.37&r2=1.38 Delta lines: +4 -15 -------------------- --- datasource.hxx 2006-08-15 10:45:03+0000 1.37 +++ datasource.hxx 2008-01-30 08:34:12+0000 1.38 @@ -45,9 +45,6 @@ #ifndef _COM_SUN_STAR_SDBC_XDATASOURCE_HPP_ #include <com/sun/star/sdbc/XDataSource.hpp> #endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif #ifndef _COM_SUN_STAR_CONTAINER_XCONTAINERLISTENER_HPP_ #include <com/sun/star/container/XContainerListener.hpp> #endif @@ -93,9 +90,6 @@ #ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" #endif -#ifndef _DBA_REGHELPER_HXX_ -#include "dba_reghelper.hxx" -#endif #ifndef _DBA_CORE_BOOKMARKCONTAINER_HXX_ #include "bookmarkcontainer.hxx" #endif @@ -156,9 +150,6 @@ //============================================================ //= ODatabaseSource //============================================================ -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - ODatabaseSource_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); - typedef ::cppu::ImplHelper11 < ::com::sun::star::lang::XServiceInfo , ::com::sun::star::sdbc::XDataSource , ::com::sun::star::sdb::XBookmarksSupplier @@ -182,8 +173,6 @@ friend class ODatabaseContext; friend class OConnection; friend class OSharedConnectionManager; - friend ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - ODatabaseSource_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); private: @@ -196,7 +185,7 @@ virtual ~ODatabaseSource(); public: - ODatabaseSource(const ::rtl::Reference<ODatabaseModelImpl>& _pImpl); + ODatabaseSource( const ::rtl::Reference< ODatabaseModelImpl >& _pImpl ); // XContainerListener virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException); @@ -220,10 +209,10 @@ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::rtl::OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); + SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); // OComponentHelper virtual void SAL_CALL disposing(void); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
