Tag: mws_oof680 User: rt Date: 2007/01/15 08:47:58 Modified: dba/dbaccess/source/ui/inc/querycontroller.hxx
Log: INTEGRATION: CWS dba22b_OOF680 (1.33.96); FILE MERGED 2006/12/09 22:46:43 fs 1.33.96.1: #i72432# PropertyContainer and PropertyArrayUsageHelper not inherited from SingleDocController anymore, own implementations now 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.33&r2=1.33.106.1 Delta lines: +22 -1 -------------------- --- querycontroller.hxx 10 Jul 2006 15:33:14 -0000 1.33 +++ querycontroller.hxx 15 Jan 2007 16:47:56 -0000 1.33.106.1 @@ -53,6 +53,12 @@ #ifndef _UNDO_HXX #include <svtools/undo.hxx> #endif +#ifndef _COMPHELPER_PROPERTYCONTAINER_HXX_ +#include <comphelper/propertycontainer.hxx> +#endif +#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ +#include <comphelper/proparrhlp.hxx> +#endif #ifndef _CONNECTIVITY_PARSE_SQLITERATOR_HXX_ #include <connectivity/sqliterator.hxx> #endif @@ -92,7 +98,12 @@ class OTableFieldDesc; class OQueryTableWindow; - class OQueryController : public OJoinController + class OQueryController; + typedef ::comphelper::OPropertyContainer OQueryController_PBase; + typedef ::comphelper::OPropertyArrayUsageHelper< OQueryController > OQueryController_PABase; + class OQueryController :public OJoinController + ,public OQueryController_PBase + ,public OQueryController_PABase { OTableFields m_vTableFieldDesc; OTableFields m_vUnUsedFieldsDesc; // contains fields which aren't visible and don't have any criteria @@ -189,6 +200,9 @@ // ::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); @@ -198,6 +212,10 @@ 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); @@ -216,6 +234,9 @@ // 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]
