svx: convert some horrible code to SolarMutexTryAndBuyGuard

Try to preserve the existing spin-lock insanity as-is.

Change-Id: Ic98aa33d2e56536856892fcf61de672952101ae1

1 files changed, 3 insertions, 10 deletions

diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 0673bfe998d3..d9e92c3be61f 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -3545,23 +3545,16 @@ void DbGridControl::FieldValueChanged(sal_uInt16 _nId, const PropertyChangeEvent
     DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL;
     if (pColumn)
     {
-        bool bAcquiredPaintSafety = false;
-        while (!m_bWantDestruction && !bAcquiredPaintSafety)
-            bAcquiredPaintSafety  = Application::GetSolarMutex().tryToAcquire();
+        boost::scoped_ptr<vcl::SolarMutexTryAndBuyGuard> pGuard;
+        while (!m_bWantDestruction && (!pGuard || !pGuard->isAcquired()))
+            pGuard.reset(new vcl::SolarMutexTryAndBuyGuard);
 
         if (m_bWantDestruction)
         {   // at this moment, within another thread, our destructor tries to destroy the listener which called this method
             // => don't do anything
             // 73365 - 23.02.00 - FS
-            if (bAcquiredPaintSafety)
-                // though the above while-loop suggests that (m_bWantDestruction && bAcquiredPaintSafety) is impossible,
-                // it isnt't, as m_bWantDestruction isn't protected with any mutex
-                Application::GetSolarMutex().release();
             return;
         }
-        // here we got the solar mutex, transfer it to a guard for safety reasons
-        SolarMutexGuard aPaintSafety;
-        Application::GetSolarMutex().release();
 
         // and finally do the update ...
         pColumn->UpdateFromField(m_xCurrentRow, m_xFormatter);