User: obo Date: 2006/07/10 08:09:10 Modified: dba/dbaccess/source/core/dataaccess/commandcontainer.hxx
Log: INTEGRATION: CWS qiq (1.7.124); FILE MERGED 2006/05/24 14:57:33 fs 1.7.124.2: #i51143# 2006/05/24 09:12:35 fs 1.7.124.1: #i51143# File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: commandcontainer.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/commandcontainer.hxx?r1=1.7&r2=1.8 Delta lines: +11 -8 -------------------- --- commandcontainer.hxx 8 Sep 2005 10:46:38 -0000 1.7 +++ commandcontainer.hxx 10 Jul 2006 15:09:08 -0000 1.8 @@ -39,9 +39,11 @@ #ifndef _DBA_CORE_DEFINITIONCONTAINER_HXX_ #include "definitioncontainer.hxx" #endif + #ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #endif + #ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> #endif @@ -50,15 +52,18 @@ namespace dbaccess { //........................................................................ -typedef ::cppu::ImplHelper1< ::com::sun::star::lang::XSingleServiceFactory > OCommandContainer_BASE; //========================================================================== -//= OCommandContainer - collection of command descriptions +//= OCommandContainer //========================================================================== +typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XSingleServiceFactory + > OCommandContainer_BASE; + class OCommandContainer : public ODefinitionContainer ,public OCommandContainer_BASE { sal_Bool m_bTables; + public: /** constructs the container.<BR> */ @@ -66,22 +71,20 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer ,const TContentPtr& _pImpl - ,sal_Bool _bTables = sal_True + ,sal_Bool _bTables ); - // ::com::sun::star::uno::XInterface DECLARE_XINTERFACE( ) -// com::sun::star::lang::XTypeProvider DECLARE_TYPEPROVIDER( ); - // ::com::sun::star::lang::XSingleServiceFactory + // XSingleServiceFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + protected: virtual ~OCommandContainer(); - -// ODefinitionContainer + // ODefinitionContainer virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject(const ::rtl::OUString& _rName); }; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
