diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 21:41:05 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 21:41:05 +0000 |
| commit | 9b80c818e968d19b5ea8a47e4094446750ae1bd6 (patch) | |
| tree | a2c0a8a93f6ab6c8907926c9033f42c9818916c0 /comphelper/inc | |
| parent | 0e63b429b8ecafada41e09bfddd54fce64155c57 (diff) | |
INTEGRATION: CWS warnings01 (1.3.8); FILE MERGED
2005/12/07 09:04:06 sb 1.3.8.1: #i53898# Made code warning-free.
Diffstat (limited to 'comphelper/inc')
| -rw-r--r-- | comphelper/inc/comphelper/ChainablePropertySetInfo.hxx | 21 | ||||
| -rw-r--r-- | comphelper/inc/comphelper/MasterPropertySetInfo.hxx | 21 |
2 files changed, 14 insertions, 28 deletions
diff --git a/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx b/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx index deb606362689..696590a80232 100644 --- a/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx +++ b/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx @@ -4,9 +4,9 @@ * * $RCSfile: ChainablePropertySetInfo.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-08 02:22:47 $ + * last change: $Author: hr $ $Date: 2006-06-19 22:40:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -42,8 +42,8 @@ #ifndef _COMPHELPER_PROPERTYINFOHASH_HXX_ #include <comphelper/PropertyInfoHash.hxx> #endif -#ifndef _CPPUHELPER_WEAK_HXX_ -#include <cppuhelper/weak.hxx> +#ifndef _CPPUHELPER_IMPLBASE1_HXX_ +#include <cppuhelper/implbase1.hxx> #endif #ifndef _COMPHELPER_TYPEGENERATION_HXX_ #include <comphelper/TypeGeneration.hxx> @@ -60,8 +60,9 @@ */ namespace comphelper { - class COMPHELPER_DLLPUBLIC ChainablePropertySetInfo : public ::com::sun::star::beans::XPropertySetInfo, - public ::cppu::OWeakObject + class COMPHELPER_DLLPUBLIC ChainablePropertySetInfo: + public ::cppu::WeakImplHelper1< + ::com::sun::star::beans::XPropertySetInfo > { friend class ChainablePropertySet; friend class MasterPropertySet; @@ -82,14 +83,6 @@ namespace comphelper void remove( const rtl::OUString& aName ) throw(); - // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) - throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire( ) - throw(); - virtual void SAL_CALL release( ) - throw(); - // XPropertySetInfo virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() throw(::com::sun::star::uno::RuntimeException); diff --git a/comphelper/inc/comphelper/MasterPropertySetInfo.hxx b/comphelper/inc/comphelper/MasterPropertySetInfo.hxx index 66eb1bade644..a53cf3b3aecd 100644 --- a/comphelper/inc/comphelper/MasterPropertySetInfo.hxx +++ b/comphelper/inc/comphelper/MasterPropertySetInfo.hxx @@ -4,9 +4,9 @@ * * $RCSfile: MasterPropertySetInfo.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-08 02:23:31 $ + * last change: $Author: hr $ $Date: 2006-06-19 22:41:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -41,8 +41,8 @@ #ifndef _COMPHELPER_PROPERTYINFOHASH_HXX_ #include <comphelper/PropertyInfoHash.hxx> #endif -#ifndef _CPPUHELPER_WEAK_HXX_ -#include <cppuhelper/weak.hxx> +#ifndef _CPPUHELPER_IMPLBASE1_HXX_ +#include <cppuhelper/implbase1.hxx> #endif #ifndef _COMPHELPER_TYPEGENERATION_HXX_ #include <comphelper/TypeGeneration.hxx> @@ -53,8 +53,9 @@ namespace comphelper { - class COMPHELPER_DLLPUBLIC MasterPropertySetInfo : public ::com::sun::star::beans::XPropertySetInfo, - public ::cppu::OWeakObject + class COMPHELPER_DLLPUBLIC MasterPropertySetInfo: + public ::cppu::WeakImplHelper1< + ::com::sun::star::beans::XPropertySetInfo > { friend class MasterPropertySet; protected: @@ -74,14 +75,6 @@ namespace comphelper void remove( const rtl::OUString& aName ) throw(); - // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) - throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire( ) - throw(); - virtual void SAL_CALL release( ) - throw(); - // XPropertySetInfo virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() throw(::com::sun::star::uno::RuntimeException); |