diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 03:22:02 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:56:10 -0500 |
| commit | ab25f5f512cb18e0aaaef5c83b1adbcaa6cde921 (patch) | |
| tree | 8e6b346d3c681ae97fb5843b7b29c7fe157dda98 /sw/source/ui/docvw/SidebarTxtControlAcc.cxx | |
| parent | 948892cb90b3107324dae0fe2e00e50d9bad035f (diff) | |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
Diffstat (limited to 'sw/source/ui/docvw/SidebarTxtControlAcc.cxx')
| -rw-r--r-- | sw/source/ui/docvw/SidebarTxtControlAcc.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx index c1f22d3d6f73..845de5f37315 100644 --- a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx +++ b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx @@ -181,7 +181,7 @@ class SidebarTxtControlAccessibleContext : public VCLXAccessibleComponent SidebarTxtControl& mrSidebarTxtControl; ::accessibility::AccessibleTextHelper* mpAccessibleTextHelper; - ::vos::OMutex maMutex; + ::osl::Mutex maMutex; void defunc(); }; @@ -212,7 +212,7 @@ void SidebarTxtControlAccessibleContext::defunc() sal_Int32 SAL_CALL SidebarTxtControlAccessibleContext::getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException) { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); sal_Int32 nChildCount( 0 ); @@ -227,7 +227,7 @@ sal_Int32 SAL_CALL SidebarTxtControlAccessibleContext::getAccessibleChildCount() css::uno::Reference< css::accessibility::XAccessible > SAL_CALL SidebarTxtControlAccessibleContext::getAccessibleChild( sal_Int32 i ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException ) { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); css::uno::Reference< css::accessibility::XAccessible > xChild; @@ -243,7 +243,7 @@ void SAL_CALL SidebarTxtControlAccessibleContext::addEventListener ( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener) throw (css::uno::RuntimeException) { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if ( mpAccessibleTextHelper ) { @@ -255,7 +255,7 @@ void SAL_CALL SidebarTxtControlAccessibleContext::removeEventListener ( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener) throw (css::uno::RuntimeException) { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if ( mpAccessibleTextHelper ) { |