diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 09:35:43 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 09:35:43 +0000 |
| commit | d8d6a7fb723d6a19f89d01fcd3e341137a5a9ffc (patch) | |
| tree | 74f84b2e820cfe8084a3b1e3f5ce785a717a34b1 /cppuhelper | |
| parent | dfd2ca982ccde1d8571eaacb7da554fb1b83ab38 (diff) | |
INTEGRATION: CWS warnings01 (1.8.146); FILE MERGED
2006/04/07 15:30:55 sb 1.8.146.4: RESYNC: (1.9-1.10); FILE MERGED
2005/11/08 17:43:47 pl 1.8.146.3: #i53898# removed warnings
2005/09/22 15:41:22 sb 1.8.146.2: RESYNC: (1.8-1.9); FILE MERGED
2005/08/31 16:24:57 sb 1.8.146.1: #i53898# Made code warning-free.
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/weak.cxx | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx index 7d8436c80..ab1f2564d 100644 --- a/cppuhelper/source/weak.cxx +++ b/cppuhelper/source/weak.cxx @@ -4,9 +4,9 @@ * * $RCSfile: weak.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: rt $ $Date: 2006-03-06 10:11:16 $ + * last change: $Author: hr $ $Date: 2006-06-19 10:35:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -85,7 +85,13 @@ public: /// Called from the weak object if the reference count goes to zero. void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); -protected: + +private: + OWeakConnectionPoint(OWeakConnectionPoint &); // not defined + void operator =(OWeakConnectionPoint &); // not defined + + virtual ~OWeakConnectionPoint() {} + /// The reference counter. oslInterlockedCount m_aRefCount; /// The weak object @@ -325,7 +331,7 @@ public: OWeakRefListener() SAL_THROW( () ); OWeakRefListener(const OWeakRefListener& rRef) SAL_THROW( () ); OWeakRefListener(const Reference< XInterface >& xInt) SAL_THROW( () ); - ~OWeakRefListener() SAL_THROW( () ); + virtual ~OWeakRefListener() SAL_THROW( () ); // XInterface Any SAL_CALL queryInterface( const Type & rType ) throw(RuntimeException); @@ -350,7 +356,8 @@ OWeakRefListener::OWeakRefListener() SAL_THROW( () ) } OWeakRefListener::OWeakRefListener(const OWeakRefListener& rRef) SAL_THROW( () ) - : m_aRefCount( 1 ) + : com::sun::star::uno::XReference() + , m_aRefCount( 1 ) { try { |