diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 09:54:50 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 09:54:50 +0000 |
| commit | de6015d2d08758bb89549ffc71995be596a0988e (patch) | |
| tree | a2dfa916ffc33a4d4bd184c3493d69f5aa663697 /framework/inc/helper | |
| parent | 0e2a1bab893cdbc9ceb10feacfa3bae609845592 (diff) | |
INTEGRATION: CWS warnings01 (1.6.32); FILE MERGED
2005/11/16 13:10:27 pl 1.6.32.2: #i55991# removed warnings
2005/10/28 14:48:10 cd 1.6.32.1: #i55991# Warning free code changes for gcc
Diffstat (limited to 'framework/inc/helper')
| -rw-r--r-- | framework/inc/helper/uiconfigelementwrapperbase.hxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx index 699be52db01c..07596e7e4ea0 100644 --- a/framework/inc/helper/uiconfigelementwrapperbase.hxx +++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx @@ -4,9 +4,9 @@ * * $RCSfile: uiconfigelementwrapperbase.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2005-09-09 00:20:08 $ + * last change: $Author: hr $ $Date: 2006-06-19 10:54:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -141,8 +141,8 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider //--------------------------------------------------------------------------------------------------------- // XInterface, XTypeProvider //--------------------------------------------------------------------------------------------------------- - DECLARE_XINTERFACE - DECLARE_XTYPEPROVIDER + FWK_DECLARE_XINTERFACE + FWK_DECLARE_XTYPEPROVIDER // XComponent virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0; @@ -169,6 +169,7 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); // XEventListener + using cppu::OPropertySetHelper::disposing; virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); //------------------------------------------------------------------------------------------------------------- @@ -183,6 +184,7 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider const com::sun::star::uno::Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException ); virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception ); + using cppu::OPropertySetHelper::getFastPropertyValue; virtual void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue , sal_Int32 nHandle ) const; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); |