From 213c3f88258fc803bb38dfbfe7c390eba245ca84 Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Thu, 14 Oct 2010 14:00:57 -0500
Subject: remove the class TLBSolarMutex and use SolarMutexGuard instead

The class TBLSolarMutex is a wrapper guard arounf the SolarMutex.
the class SolarMutexGuard already provide this function.
---
 .../source/extended/accessibletablistbox.cxx       | 11 +----------
 .../source/extended/accessibletablistboxtable.cxx  | 23 +++++++---------------
 2 files changed, 8 insertions(+), 26 deletions(-)

(limited to 'accessibility/source/extended')

diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx
index 8d873544f7e1..1b22c0b87565 100644
--- a/accessibility/source/extended/accessibletablistbox.cxx
+++ b/accessibility/source/extended/accessibletablistbox.cxx
@@ -39,15 +39,6 @@ namespace accessibility
 {
 //........................................................................
 
-    // class TLBSolarGuard ---------------------------------------------------------
-
-    /** Aquire the solar mutex. */
-    class TLBSolarGuard : public ::vos::OGuard
-    {
-    public:
-        inline TLBSolarGuard() : ::vos::OGuard( Application::GetSolarMutex() ) {}
-    };
-
     // class AccessibleTabListBox -----------------------------------------------------
 
     using namespace ::com::sun::star::accessibility;
@@ -117,7 +108,7 @@ namespace accessibility
     AccessibleTabListBox::getAccessibleChild( sal_Int32 nChildIndex )
         throw ( IndexOutOfBoundsException, RuntimeException )
     {
-        TLBSolarGuard aSolarGuard;
+        SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( getOslMutex() );
         ensureIsAlive();
 
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx
index f93d20edd2bc..3cd3c333148a 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -40,15 +40,6 @@ namespace accessibility
 {
 //........................................................................
 
-    // class TLBSolarGuard ---------------------------------------------------------
-
-    /** Aquire the solar mutex. */
-    class TLBSolarGuard : public ::vos::OGuard
-    {
-    public:
-        inline TLBSolarGuard() : ::vos::OGuard( Application::GetSolarMutex() ) {}
-    };
-
     // class AccessibleTabListBoxTable ---------------------------------------------
 
     using namespace ::com::sun::star::accessibility;
@@ -299,7 +290,7 @@ namespace accessibility
     // -----------------------------------------------------------------------------
     void SAL_CALL AccessibleTabListBoxTable::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
-        TLBSolarGuard aSolarGuard;
+        SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( getOslMutex() );
 
         ensureIsAlive();
@@ -310,7 +301,7 @@ namespace accessibility
     // -----------------------------------------------------------------------------
     sal_Bool SAL_CALL AccessibleTabListBoxTable::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
-        TLBSolarGuard aSolarGuard;
+        SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( getOslMutex() );
 
         ensureIsAlive();
@@ -321,7 +312,7 @@ namespace accessibility
     // -----------------------------------------------------------------------------
     void SAL_CALL AccessibleTabListBoxTable::clearAccessibleSelection(  ) throw (RuntimeException)
     {
-        TLBSolarGuard aSolarGuard;
+        SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( getOslMutex() );
 
         ensureIsAlive();
@@ -331,7 +322,7 @@ namespace accessibility
     // -----------------------------------------------------------------------------
     void SAL_CALL AccessibleTabListBoxTable::selectAllAccessibleChildren(  ) throw (RuntimeException)
     {
-        TLBSolarGuard aSolarGuard;
+        SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( getOslMutex() );
 
         ensureIsAlive();
@@ -341,7 +332,7 @@ namespace accessibility
     // -----------------------------------------------------------------------------
     sal_Int32 SAL_CALL AccessibleTabListBoxTable::getSelectedAccessibleChildCount(  ) throw (RuntimeException)
     {
-        TLBSolarGuard aSolarGuard;
+        SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( getOslMutex() );
 
         ensureIsAlive();
@@ -351,7 +342,7 @@ namespace accessibility
     // -----------------------------------------------------------------------------
     Reference< XAccessible > SAL_CALL AccessibleTabListBoxTable::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
-        TLBSolarGuard aSolarGuard;
+        SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( getOslMutex() );
 
         ensureIsAlive();
@@ -367,7 +358,7 @@ namespace accessibility
     // -----------------------------------------------------------------------------
     void SAL_CALL AccessibleTabListBoxTable::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
-        TLBSolarGuard aSolarGuard;
+        SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( getOslMutex() );
 
         ensureIsAlive();
-- 
cgit