use SolarMutexGuard to guard the SolarMutex

11 files changed, 19 insertions, 19 deletions

diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 163144815a16..1dd34d151fe1 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -518,7 +518,7 @@ void OButtonControl::actionPerformed_Impl( sal_Bool _bNotifyListener, const ::co
             if ( !approveAction() )
                 return;
 
-            ::vos::OGuard aGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aGuard;
             dispatch( nFeatureId );
             return;
         }
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 71151f7753bc..fccd544d99f6 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -2227,7 +2227,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
     ::rtl::OUString aTargetName;
     Reference< XModel >  xModel;
     {
-        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         // starform->Forms
 
         Reference<XChild>  xParent(m_xParent, UNO_QUERY);
@@ -2262,7 +2262,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
     {
         ::rtl::OUString aData;
         {
-            ::vos::OGuard aGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aGuard;
             aData = GetDataURLEncoded( Control, MouseEvt );
         }
 
@@ -2309,7 +2309,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
             ::rtl::OUString aContentType;
             Sequence<sal_Int8> aData;
             {
-                ::vos::OGuard aGuard( Application::GetSolarMutex() );
+                SolarMutexGuard aGuard;
                 aData = GetDataMultiPartEncoded(Control, MouseEvt, aContentType);
             }
             if (!aData.getLength())
@@ -2334,7 +2334,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
     {
         ::rtl::OUString aData;
         {
-            ::vos::OGuard aGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aGuard;
             aData = GetDataTextEncoded( Reference<XControl> (), MouseEvt );
         }
 
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 5c40675335b8..d7e075826209 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -693,7 +693,7 @@ void OFormattedModel::loaded(const EventObject& rEvent) throw ( ::com::sun::star
     // the only "clean" solution for me.
     // FS - 69603 - 02.11.99
 
-    ::vos::OGuard aGuard(Application::GetSolarMutex());
+    SolarMutexGuard aGuard;
     OEditBaseModel::loaded(rEvent);
 }
 
diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx
index 7db87b58b877..c0f2c87b2a64 100644
--- a/forms/source/component/ImageButton.cxx
+++ b/forms/source/component/ImageButton.cxx
@@ -231,7 +231,7 @@ Any SAL_CALL OImageButtonControl::queryAggregation(const Type& _rType) throw (Ru
 //------------------------------------------------------------------------------
 void OImageButtonControl::mousePressed(const awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException)
 {
-    ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarGuard;
 
     if (e.Buttons != awt::MouseButton::LEFT)
         return;
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 921d31cbc2c6..6caf6f4b530a 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -906,7 +906,7 @@ bool OImageControlControl::impl_isEmptyGraphics_nothrow() const
 //------------------------------------------------------------------------------
 void OImageControlControl::mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
 
     if (e.Buttons != MouseButton::LEFT)
         return;
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index a295d13c5485..2619c4e094b8 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -213,7 +213,7 @@ namespace frm
         Reference< XInterface > xModelsParent;
         FormButtonType eButtonType = FormButtonType_PUSH;
         {
-            ::vos::OGuard aGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aGuard;
 
             // Parent holen
             Reference<XFormComponent>  xComp(getModel(), UNO_QUERY);
@@ -261,7 +261,7 @@ namespace frm
 
             case FormButtonType_URL:
             {
-                ::vos::OGuard aGuard( Application::GetSolarMutex() );
+                SolarMutexGuard aGuard;
 
                 Reference< XModel >  xModel = getXModel(xModelsParent);
                 if (!xModel.is())
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index 09d9b5285923..266225310ee8 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -224,7 +224,7 @@ namespace frm
             return;
         }
 
-        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
 
         if (!getPeer().is())
         {
@@ -400,7 +400,7 @@ namespace frm
     //--------------------------------------------------------------------
     void SAL_CALL ORichTextPeer::draw( sal_Int32 _nX, sal_Int32 _nY ) throw(::com::sun::star::uno::RuntimeException)
     {
-        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
 
         RichTextControl* pControl = static_cast< RichTextControl* >( GetWindow() );
         if ( !pControl )
diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx
index 5d615e00b942..4e251ec53115 100644
--- a/forms/source/richtext/richtextengine.cxx
+++ b/forms/source/richtext/richtextengine.cxx
@@ -95,7 +95,7 @@ namespace frm
     {
         RichTextEngine* pClone( NULL );
         {
-            ::vos::OGuard aGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aGuard;
             EditTextObject* pMyText = CreateTextObject();
             OSL_ENSURE( pMyText, "RichTextEngine::Clone: CreateTextObject returned nonsense!" );
 
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index 4bef0deb2d99..42accca83e79 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -507,7 +507,7 @@ namespace frm
     {
         if ( m_pEngine.get() )
         {
-            ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aSolarGuard;
             m_bSettingEngineText = true;
             m_pEngine->SetText( _rText );
             m_bSettingEngineText = false;
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index b1d7e01f837b..78190b19ae7a 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -471,7 +471,7 @@ namespace frm
     //--------------------------------------------------------------------
     void SAL_CALL FormOperations::execute( ::sal_Int16 _nFeature ) throw (RuntimeException, IllegalArgumentException, SQLException, WrappedTargetException)
     {
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarGuard;
         MethodGuard aGuard( *this );
 
         if ( ( _nFeature != FormFeature::DeleteRecord ) && ( _nFeature != FormFeature::UndoRecordChanges ) )
@@ -744,7 +744,7 @@ namespace frm
             return;
         }
 
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarGuard;
         MethodGuard aGuard( *this );
 
         // at the moment we have only one feature which supports execution parameters
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index c4fb971700f8..673501803f29 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -165,7 +165,7 @@ namespace frm
     //------------------------------------------------------------------
     void SAL_CALL ONavigationBarControl::createPeer( const Reference< XToolkit >& /*_rToolkit*/, const Reference< XWindowPeer >& _rParentPeer ) throw( RuntimeException )
     {
-        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
 
         if (!getPeer().is())
         {
@@ -336,7 +336,7 @@ namespace frm
     //------------------------------------------------------------------
     void SAL_CALL ONavigationBarPeer::setProperty( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw( RuntimeException )
     {
-        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
 
         NavigationToolBar* pNavBar = static_cast< NavigationToolBar* >( GetWindow() );
         if ( !pNavBar )
@@ -417,7 +417,7 @@ namespace frm
     //------------------------------------------------------------------
     Any SAL_CALL ONavigationBarPeer::getProperty( const ::rtl::OUString& _rPropertyName ) throw( RuntimeException )
     {
-        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
 
         Any aReturn;
         NavigationToolBar* pNavBar = static_cast< NavigationToolBar* >( GetWindow() );