User: vg Date: 2007/01/15 06:35:41 Modified: dba/dbaccess/source/ui/inc/singledoccontroller.hxx
Log: INTEGRATION: CWS dba22b (1.13.96); FILE MERGED 2006/12/09 22:45:48 fs 1.13.96.1: #i72432# remove all PropertyContainer and PropertyArrayHelper stuff - it's not used anymore, and simply conflicts with derived classes with own properties File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: singledoccontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/singledoccontroller.hxx?r1=1.13&r2=1.14 Delta lines: +0 -24 -------------------- --- singledoccontroller.hxx 10 Jul 2006 15:33:27 -0000 1.13 +++ singledoccontroller.hxx 15 Jan 2007 14:35:39 -0000 1.14 @@ -42,9 +42,6 @@ #ifndef _COMPHELPER_PROPERTYCONTAINER_HXX_ #include <comphelper/propertycontainer.hxx> #endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ -#include <comphelper/proparrhlp.hxx> -#endif #ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include <comphelper/broadcasthelper.hxx> #endif @@ -85,14 +82,9 @@ //==================================================================== class OSingleDocumentController; typedef OGenericUnoController OSingleDocumentController_CBASE; - typedef ::comphelper::OPropertyContainer OSingleDocumentController_PBASE; - typedef ::comphelper::OPropertyArrayUsageHelper < OSingleDocumentController - > OSingleDocumentController_PABASE; class OSingleDocumentController :public OSingleDocumentController_CBASE - ,public OSingleDocumentController_PBASE - ,public OSingleDocumentController_PABASE ,public IEnvironment { friend class OConnectionChangeBroadcaster; @@ -214,22 +206,6 @@ virtual sal_Bool Construct(Window* pParent); protected: - // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire( ) throw (); - virtual void SAL_CALL release( ) throw (); - - // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); - - // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; - - // 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(); - // XEventListener virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
