loplugin:expandablemethods in forms..formula

Change-Id: Idc948ad06913def28cb642c3a4e5ea9322b9fb3b
Reviewed-on: https://gerrit.libreoffice.org/30688
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 4 insertions, 15 deletions

diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx
index 497aa6bfa2d6..2a112313b8d0 100644
--- a/forms/source/component/File.cxx
+++ b/forms/source/component/File.cxx
@@ -245,11 +245,10 @@ void SAL_CALL OFileControlModel::reset() throw ( css::uno::RuntimeException, std
 
     if (bContinue)
     {
-        {
-            // If Models are threadSafe
-            ::osl::MutexGuard aGuard(m_aMutex);
-            _reset();
-        }
+        // don't lock our mutex as setting aggregate properties
+        // may cause any uno controls belonging to us to lock the solar mutex, which is potentially dangerous with
+        // our own mutex locked
+        m_xAggregateSet->setPropertyValue(PROPERTY_TEXT, makeAny(m_sDefaultValue));
         m_aResetListeners.notifyEach( &XResetListener::resetted, aEvt );
     }
 }
@@ -267,16 +266,6 @@ void OFileControlModel::removeResetListener(const Reference<XResetListener>& _rx
 }
 
 
-void OFileControlModel::_reset()
-{
-    {   // release our mutex once (it's acquired in the calling method !), as setting aggregate properties
-        // may cause any uno controls belonging to us to lock the solar mutex, which is potentially dangerous with
-        // our own mutex locked
-        MutexRelease aRelease(m_aMutex);
-        m_xAggregateSet->setPropertyValue(PROPERTY_TEXT, makeAny(m_sDefaultValue));
-    }
-}
-
 }   // namespace frm
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL