diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 03:20:00 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:38 -0500 |
| commit | d88b292704957818eff9a348a524b5c90b40031b (patch) | |
| tree | eabf039491304b2c13f3bd77ca0b6d58c3dba1b8 /toolkit/source/layout/core | |
| parent | 98b2c08dff4d00b3e7a2e001c326ebe27dae4549 (diff) | |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
Diffstat (limited to 'toolkit/source/layout/core')
| -rw-r--r-- | toolkit/source/layout/core/localized-string.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toolkit/source/layout/core/localized-string.cxx b/toolkit/source/layout/core/localized-string.cxx index 4ea6e3959a00..50451b0b85fb 100644 --- a/toolkit/source/layout/core/localized-string.cxx +++ b/toolkit/source/layout/core/localized-string.cxx @@ -61,7 +61,7 @@ uno::Any LocalizedString::queryInterface( uno::Type const& rType ) void LocalizedString::setText( OUString const& s ) throw(uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( Window *w = GetWindow() ) return w->SetText( s ); @@ -70,7 +70,7 @@ void LocalizedString::setText( OUString const& s ) OUString LocalizedString::getText() throw(uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( Window *w = GetWindow() ) return w->GetText(); |