diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 09:33:40 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 09:33:40 +0000 |
| commit | 25c1a55e3fe05ea80705c6749627f41494e402a2 (patch) | |
| tree | 09c04b8297103e083ca1fb0f89c6a96600bf53a4 /cppuhelper/source/implbase.cxx | |
| parent | 6fd911719104984bbc973a19cfeadcd91077d88a (diff) | |
INTEGRATION: CWS warnings01 (1.14.46); FILE MERGED
2006/04/07 15:30:35 sb 1.14.46.4: RESYNC: (1.15-1.16); FILE MERGED
2005/11/28 16:39:56 sb 1.14.46.3: #i53898# Made code warning-free.
2005/09/22 15:38:00 sb 1.14.46.2: RESYNC: (1.14-1.15); FILE MERGED
2005/09/07 11:05:29 sb 1.14.46.1: #i53898# Made code warning-free.
Diffstat (limited to 'cppuhelper/source/implbase.cxx')
| -rw-r--r-- | cppuhelper/source/implbase.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx index bc06d526cd2c..5adeb427d26f 100644 --- a/cppuhelper/source/implbase.cxx +++ b/cppuhelper/source/implbase.cxx @@ -4,9 +4,9 @@ * * $RCSfile: implbase.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: rt $ $Date: 2006-03-06 10:11:02 $ + * last change: $Author: hr $ $Date: 2006-06-19 10:33:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -296,13 +296,13 @@ void WeakComponentImplHelperBase::dispose() } catch (...) { - MutexGuard aGuard( rBHelper.rMutex ); + MutexGuard aGuard2( rBHelper.rMutex ); // bDisposed and bInDispose must be set in this order: rBHelper.bDisposed = sal_True; rBHelper.bInDispose = sal_False; throw; } - MutexGuard aGuard( rBHelper.rMutex ); + MutexGuard aGuard2( rBHelper.rMutex ); // bDisposed and bInDispose must be set in this order: rBHelper.bDisposed = sal_True; rBHelper.bInDispose = sal_False; @@ -430,13 +430,13 @@ void WeakAggComponentImplHelperBase::dispose() } catch (...) { - MutexGuard aGuard( rBHelper.rMutex ); + MutexGuard aGuard2( rBHelper.rMutex ); // bDisposed and bInDispose must be set in this order: rBHelper.bDisposed = sal_True; rBHelper.bInDispose = sal_False; throw; } - MutexGuard aGuard( rBHelper.rMutex ); + MutexGuard aGuard2( rBHelper.rMutex ); // bDisposed and bInDispose must be set in this order: rBHelper.bDisposed = sal_True; rBHelper.bInDispose = sal_False; |