Tag: cws_src680_oj14 User: oj Date: 2007/02/20 11:41:25 Modified: dba/dbaccess/source/ui/inc/querycontroller.hxx
Log: merge conflict resolved File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: querycontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/querycontroller.hxx?r1=1.32.8.5&r2=1.32.8.6 Delta lines: +3 -14 -------------------- --- querycontroller.hxx 20 Feb 2007 15:50:26 -0000 1.32.8.5 +++ querycontroller.hxx 20 Feb 2007 19:41:22 -0000 1.32.8.6 @@ -4,9 +4,9 @@ * * $RCSfile: querycontroller.hxx,v $ * - * $Revision: 1.32.8.5 $ + * $Revision: 1.32.8.6 $ * - * last change: $Author: oj $ $Date: 2007/02/20 15:50:26 $ + * last change: $Author: oj $ $Date: 2007/02/20 19:41:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -207,10 +207,6 @@ // ::com::sun::star::lang::XComponent virtual void SAL_CALL disposing(); - DECLARE_XINTERFACE() - DECLARE_XTYPEPROVIDER() - - // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // need by registration @@ -219,10 +215,6 @@ 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 >&); - // XPropertySet - virtual com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException); - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - protected: virtual void onLoadedMenu(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager); // OPropertyArrayUsageHelper @@ -243,9 +235,6 @@ // OJoinController overridables virtual bool allowViews() const; virtual bool allowQueries() const; - - // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; private: DECL_LINK( OnExecuteAddTable, void* ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
