rename osl::SolarMutexGuard -> SolarGuard to avoid namespace ambiguity

2 files changed, 27 insertions, 27 deletions

diff --git a/comphelper/source/property/ChainablePropertySet.cxx b/comphelper/source/property/ChainablePropertySet.cxx
index f77f6fe2e664..a8329919502d 100644
--- a/comphelper/source/property/ChainablePropertySet.cxx
+++ b/comphelper/source/property/ChainablePropertySet.cxx
@@ -78,9 +78,9 @@ void SAL_CALL ChainablePropertySet::setPropertyValue( const ::rtl::OUString& rPr
     throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
-    std::auto_ptr< osl::SolarMutexGuard > pMutexGuard;
+    std::auto_ptr< osl::SolarGuard > pMutexGuard;
     if (mpMutex)
-        pMutexGuard.reset( new osl::SolarMutexGuard(mpMutex) );
+        pMutexGuard.reset( new osl::SolarGuard(mpMutex) );
 
     PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
 
@@ -96,9 +96,9 @@ Any SAL_CALL ChainablePropertySet::getPropertyValue( const ::rtl::OUString& rPro
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
-    std::auto_ptr< osl::SolarMutexGuard > pMutexGuard;
+    std::auto_ptr< osl::SolarGuard > pMutexGuard;
     if (mpMutex)
-        pMutexGuard.reset( new osl::SolarMutexGuard(mpMutex) );
+        pMutexGuard.reset( new osl::SolarGuard(mpMutex) );
 
     PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
 
@@ -142,9 +142,9 @@ void SAL_CALL ChainablePropertySet::setPropertyValues( const Sequence< ::rtl::OU
     throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
-    std::auto_ptr< osl::SolarMutexGuard > pMutexGuard;
+    std::auto_ptr< osl::SolarGuard > pMutexGuard;
     if (mpMutex)
-        pMutexGuard.reset( new osl::SolarMutexGuard(mpMutex) );
+        pMutexGuard.reset( new osl::SolarGuard(mpMutex) );
 
     const sal_Int32 nCount = aPropertyNames.getLength();
 
@@ -176,9 +176,9 @@ Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues( const Sequence
     throw(RuntimeException)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
-    std::auto_ptr< osl::SolarMutexGuard > pMutexGuard;
+    std::auto_ptr< osl::SolarGuard > pMutexGuard;
     if (mpMutex)
-        pMutexGuard.reset( new osl::SolarMutexGuard(mpMutex) );
+        pMutexGuard.reset( new osl::SolarGuard(mpMutex) );
 
     const sal_Int32 nCount = aPropertyNames.getLength();
 
diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx
index be423448e354..253c46ada1cf 100644
--- a/comphelper/source/property/MasterPropertySet.cxx
+++ b/comphelper/source/property/MasterPropertySet.cxx
@@ -42,19 +42,19 @@
 class AutoOGuardArray
 {
     sal_Int32                       nSize;
-    std::auto_ptr< osl::SolarMutexGuard > *  pGuardArray;
+    std::auto_ptr< osl::SolarGuard > *  pGuardArray;
 
 public:
     AutoOGuardArray( sal_Int32 nNumElements );
     ~AutoOGuardArray();
 
-    std::auto_ptr< osl::SolarMutexGuard > &  operator[] ( sal_Int32 i ) { return pGuardArray[i]; }
+    std::auto_ptr< osl::SolarGuard > &  operator[] ( sal_Int32 i ) { return pGuardArray[i]; }
 };
 
 AutoOGuardArray::AutoOGuardArray( sal_Int32 nNumElements )
 {
     nSize       = nNumElements;
-    pGuardArray = new std::auto_ptr< osl::SolarMutexGuard >[ nSize ];
+    pGuardArray = new std::auto_ptr< osl::SolarGuard >[ nSize ];
 }
 
 AutoOGuardArray::~AutoOGuardArray()
@@ -130,9 +130,9 @@ void SAL_CALL MasterPropertySet::setPropertyValue( const ::rtl::OUString& rPrope
     throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
-    std::auto_ptr< osl::SolarMutexGuard > pMutexGuard;
+    std::auto_ptr< osl::SolarGuard > pMutexGuard;
     if (mpMutex)
-        pMutexGuard.reset( new osl::SolarMutexGuard(mpMutex) );
+        pMutexGuard.reset( new osl::SolarGuard(mpMutex) );
 
     PropertyDataHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
 
@@ -150,9 +150,9 @@ void SAL_CALL MasterPropertySet::setPropertyValue( const ::rtl::OUString& rPrope
         ChainablePropertySet * pSlave = maSlaveMap [ (*aIter).second->mnMapId ]->mpSlave;
 
         // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
-        std::auto_ptr< osl::SolarMutexGuard > pMutexGuard2;
+        std::auto_ptr< osl::SolarGuard > pMutexGuard2;
         if (pSlave->mpMutex)
-            pMutexGuard2.reset( new osl::SolarMutexGuard(pSlave->mpMutex) );
+            pMutexGuard2.reset( new osl::SolarGuard(pSlave->mpMutex) );
 
         pSlave->_preSetValues();
         pSlave->_setSingleValue( *((*aIter).second->mpInfo), rValue );
@@ -164,9 +164,9 @@ Any SAL_CALL MasterPropertySet::getPropertyValue( const ::rtl::OUString& rProper
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
-    std::auto_ptr< osl::SolarMutexGuard > pMutexGuard;
+    std::auto_ptr< osl::SolarGuard > pMutexGuard;
     if (mpMutex)
-        pMutexGuard.reset( new osl::SolarMutexGuard(mpMutex) );
+        pMutexGuard.reset( new osl::SolarGuard(mpMutex) );
 
     PropertyDataHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
 
@@ -185,9 +185,9 @@ Any SAL_CALL MasterPropertySet::getPropertyValue( const ::rtl::OUString& rProper
         ChainablePropertySet * pSlave = maSlaveMap [ (*aIter).second->mnMapId ]->mpSlave;
 
         // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
-        std::auto_ptr< osl::SolarMutexGuard > pMutexGuard2;
+        std::auto_ptr< osl::SolarGuard > pMutexGuard2;
         if (pSlave->mpMutex)
-            pMutexGuard2.reset( new osl::SolarMutexGuard(pSlave->mpMutex) );
+            pMutexGuard2.reset( new osl::SolarGuard(pSlave->mpMutex) );
 
         pSlave->_preGetValues();
         pSlave->_getSingleValue( *((*aIter).second->mpInfo), aAny );
@@ -225,9 +225,9 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< ::rtl::OUStr
     throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
-    std::auto_ptr< osl::SolarMutexGuard > pMutexGuard;
+    std::auto_ptr< osl::SolarGuard > pMutexGuard;
     if (mpMutex)
-        pMutexGuard.reset( new osl::SolarMutexGuard(mpMutex) );
+        pMutexGuard.reset( new osl::SolarGuard(mpMutex) );
 
     const sal_Int32 nCount = aPropertyNames.getLength();
 
@@ -264,7 +264,7 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< ::rtl::OUStr
                 {
                     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
                     if (pSlave->mpSlave->mpMutex)
-                        aOGuardArray[i].reset( new osl::SolarMutexGuard(pSlave->mpSlave->mpMutex) );
+                        aOGuardArray[i].reset( new osl::SolarGuard(pSlave->mpSlave->mpMutex) );
 
                     pSlave->mpSlave->_preSetValues();
                     pSlave->SetInit ( sal_True );
@@ -291,9 +291,9 @@ Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< :
     throw(RuntimeException)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
-    std::auto_ptr< osl::SolarMutexGuard > pMutexGuard;
+    std::auto_ptr< osl::SolarGuard > pMutexGuard;
     if (mpMutex)
-        pMutexGuard.reset( new osl::SolarMutexGuard(mpMutex) );
+        pMutexGuard.reset( new osl::SolarGuard(mpMutex) );
 
     const sal_Int32 nCount = aPropertyNames.getLength();
 
@@ -329,7 +329,7 @@ Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< :
                 {
                     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
                     if (pSlave->mpSlave->mpMutex)
-                        aOGuardArray[i].reset( new osl::SolarMutexGuard(pSlave->mpSlave->mpMutex) );
+                        aOGuardArray[i].reset( new osl::SolarGuard(pSlave->mpSlave->mpMutex) );
 
                     pSlave->mpSlave->_preGetValues();
                     pSlave->SetInit ( sal_True );
@@ -392,9 +392,9 @@ PropertyState SAL_CALL MasterPropertySet::getPropertyState( const ::rtl::OUStrin
         ChainablePropertySet * pSlave = maSlaveMap [ (*aIter).second->mnMapId ]->mpSlave;
 
         // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
-        std::auto_ptr< osl::SolarMutexGuard > pMutexGuard;
+        std::auto_ptr< osl::SolarGuard > pMutexGuard;
         if (pSlave->mpMutex)
-            pMutexGuard.reset( new osl::SolarMutexGuard(pSlave->mpMutex) );
+            pMutexGuard.reset( new osl::SolarGuard(pSlave->mpMutex) );
 
         pSlave->_preGetPropertyState();
         pSlave->_getPropertyState( *((*aIter).second->mpInfo), aState );