mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS warnings01 (1.14.46); FILE MERGED

Browse Source 
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.
This commit is contained in:
Jens-Heiner Rechtien 2006-06-19 09:33:40 +00:00
parent 6fd9117191
commit 25c1a55e3f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cppuhelper/source/implbase.cxx
View File

@ -4,9 +4,9 @@
* *
* $RCSfile: implbase.cxx,v $ * $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 Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -296,13 +296,13 @@ void WeakComponentImplHelperBase::dispose()
} }
catch (...) catch (...)
{ {
MutexGuard aGuard( rBHelper.rMutex ); MutexGuard aGuard2( rBHelper.rMutex );
// bDisposed and bInDispose must be set in this order: // bDisposed and bInDispose must be set in this order:
rBHelper.bDisposed = sal_True; rBHelper.bDisposed = sal_True;
rBHelper.bInDispose = sal_False; rBHelper.bInDispose = sal_False;
throw; throw;
} }
MutexGuard aGuard( rBHelper.rMutex ); MutexGuard aGuard2( rBHelper.rMutex );
// bDisposed and bInDispose must be set in this order: // bDisposed and bInDispose must be set in this order:
rBHelper.bDisposed = sal_True; rBHelper.bDisposed = sal_True;
rBHelper.bInDispose = sal_False; rBHelper.bInDispose = sal_False;
@ -430,13 +430,13 @@ void WeakAggComponentImplHelperBase::dispose()
} }
catch (...) catch (...)
{ {
MutexGuard aGuard( rBHelper.rMutex ); MutexGuard aGuard2( rBHelper.rMutex );
// bDisposed and bInDispose must be set in this order: // bDisposed and bInDispose must be set in this order:
rBHelper.bDisposed = sal_True; rBHelper.bDisposed = sal_True;
rBHelper.bInDispose = sal_False; rBHelper.bInDispose = sal_False;
throw; throw;
} }
MutexGuard aGuard( rBHelper.rMutex ); MutexGuard aGuard2( rBHelper.rMutex );
// bDisposed and bInDispose must be set in this order: // bDisposed and bInDispose must be set in this order:
rBHelper.bDisposed = sal_True; rBHelper.bDisposed = sal_True;
rBHelper.bInDispose = sal_False; rBHelper.bInDispose = sal_False;