diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 11:11:55 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:38 -0500 |
| commit | 505309ad2d33068449e2eabc62e90e81b4049cf0 (patch) | |
| tree | db7ade2bcb3daa75ce6547e27214e3f30784c6de /toolkit | |
| parent | e25dcb6462ddb5afd20775a79812248e5878ba58 (diff) | |
fix missing vos::Guard creeping back-up after rebase
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxwindows.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index adf8d970fac9..64d83505fede 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -2430,10 +2430,10 @@ throw(::com::sun::star::uno::RuntimeException) { if (rtl::OUString::createFromAscii( "Cancel" ) == PropertyName) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( GetWindow() ) { - sal_Int8 nCancel(0); + sal_Int8 nCancel = 0; Value >>= nCancel; Dialog* pDlg = (Dialog*) GetWindow(); @@ -2446,7 +2446,7 @@ throw(::com::sun::star::uno::RuntimeException) const ::rtl::OUString& /*PropertyName*/ ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aRet; return aRet; |