diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-08-02 12:54:17 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-08-02 12:54:17 +0000 |
commit | 92c3b47927bf4c246030811e4583f26cd98005e7 (patch) | |
tree | b7f71fb020a9bf01023443a7f532352059ed494d /starmath | |
parent | 90537e5b742b45c1aff01fa26f4fdbb3b00babb0 (diff) |
INTEGRATION: CWS tl40 (1.42.14); FILE MERGED
2007/07/23 13:51:50 tl 1.42.14.2: RESYNC: (1.42-1.43); FILE MERGED
2007/07/04 11:52:17 tl 1.42.14.1: #i79159# don't lock solar mutex in SmModel::acquire/release
Diffstat (limited to 'starmath')
-rw-r--r-- | starmath/source/unomodel.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 6f5e7835c73d..3a83bfb4d8d0 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unomodel.cxx,v $ * - * $Revision: 1.43 $ + * $Revision: 1.44 $ * - * last change: $Author: obo $ $Date: 2007-07-17 13:23:25 $ + * last change: $Author: hr $ $Date: 2007-08-02 13:54:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -316,7 +316,6 @@ uno::Any SAL_CALL SmModel::queryInterface( const uno::Type& rType ) throw(uno::R -----------------------------------------------------------------------*/ void SAL_CALL SmModel::acquire() throw() { - ::vos::OGuard aGuard(Application::GetSolarMutex()); OWeakObject::acquire(); } /*-- 28.03.00 14:18:18--------------------------------------------------- @@ -324,7 +323,6 @@ void SAL_CALL SmModel::acquire() throw() -----------------------------------------------------------------------*/ void SAL_CALL SmModel::release() throw() { - ::vos::OGuard aGuard(Application::GetSolarMutex()); OWeakObject::release(); } /*-- 28.03.00 14:18:19--------------------------------------------------- |