summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-18 14:24:50 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-18 15:27:06 +0100
commit36a5ea2a9c66f3cd6045e9f11b6e1b5f58858155 (patch)
tree48588fc40c4764d4d0472c2014c80a8aa7c6f57b
parent8b28069c8f31ead729dac462e477e19b738690a4 (diff)
Use SolarMutexGuard directly
Change-Id: Ia80e709bea172722aa07ee75ebeeef4ac8f5281a
-rw-r--r--framework/inc/helper/propertysetcontainer.hxx2
-rw-r--r--framework/source/fwe/classes/rootactiontriggercontainer.cxx10
-rw-r--r--framework/source/fwe/helper/propertysetcontainer.cxx14
3 files changed, 11 insertions, 15 deletions
diff --git a/framework/inc/helper/propertysetcontainer.hxx b/framework/inc/helper/propertysetcontainer.hxx
index 9675be82b5df..5f3051ca18c0 100644
--- a/framework/inc/helper/propertysetcontainer.hxx
+++ b/framework/inc/helper/propertysetcontainer.hxx
@@ -27,14 +27,12 @@
#include <cppuhelper/weak.hxx>
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <threadhelp/threadhelpbase.hxx>
#include <framework/fwedllapi.h>
namespace framework
{
class FWE_DLLPUBLIC PropertySetContainer : public com::sun::star::container::XIndexContainer ,
- public ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses.
public ::cppu::OWeakObject
{
public:
diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
index 6670e76ce49a..1cbc63182a65 100644
--- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
@@ -126,7 +126,7 @@ throw ( RuntimeException, std::exception )
void SAL_CALL RootActionTriggerContainer::insertByIndex( sal_Int32 Index, const Any& Element )
throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
- Guard aGuard( m_aLock );
+ SolarMutexGuard g;
if ( !m_bContainerCreated )
FillContainer();
@@ -139,7 +139,7 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept
void SAL_CALL RootActionTriggerContainer::removeByIndex( sal_Int32 Index )
throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
- Guard aGuard( m_aLock );
+ SolarMutexGuard g;
if ( !m_bContainerCreated )
FillContainer();
@@ -153,7 +153,7 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std
void SAL_CALL RootActionTriggerContainer::replaceByIndex( sal_Int32 Index, const Any& Element )
throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
- Guard aGuard( m_aLock );
+ SolarMutexGuard g;
if ( !m_bContainerCreated )
FillContainer();
@@ -167,7 +167,7 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept
sal_Int32 SAL_CALL RootActionTriggerContainer::getCount()
throw ( RuntimeException, std::exception )
{
- Guard aGuard( m_aLock );
+ SolarMutexGuard g;
if ( !m_bContainerCreated )
{
@@ -188,7 +188,7 @@ throw ( RuntimeException, std::exception )
Any SAL_CALL RootActionTriggerContainer::getByIndex( sal_Int32 Index )
throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
- Guard aGuard( m_aLock );
+ SolarMutexGuard g;
if ( !m_bContainerCreated )
FillContainer();
diff --git a/framework/source/fwe/helper/propertysetcontainer.cxx b/framework/source/fwe/helper/propertysetcontainer.cxx
index 347f83cba808..2eea34c93421 100644
--- a/framework/source/fwe/helper/propertysetcontainer.cxx
+++ b/framework/source/fwe/helper/propertysetcontainer.cxx
@@ -18,7 +18,6 @@
*/
#include <helper/propertysetcontainer.hxx>
-#include <threadhelp/guard.hxx>
#include <vcl/svapp.hxx>
@@ -34,8 +33,7 @@ namespace framework
{
PropertySetContainer::PropertySetContainer()
- : ThreadHelpBase( &Application::GetSolarMutex() )
- , OWeakObject()
+ : OWeakObject()
{
}
@@ -79,7 +77,7 @@ throw ( RuntimeException, std::exception )
void SAL_CALL PropertySetContainer::insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element )
throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
- Guard aGuard( m_aLock );
+ SolarMutexGuard g;
sal_Int32 nSize = m_aPropertySetVector.size();
@@ -112,7 +110,7 @@ void SAL_CALL PropertySetContainer::insertByIndex( sal_Int32 Index, const ::com:
void SAL_CALL PropertySetContainer::removeByIndex( sal_Int32 nIndex )
throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
- Guard aGuard( m_aLock );
+ SolarMutexGuard g;
if ( (sal_Int32)m_aPropertySetVector.size() > nIndex )
{
@@ -149,7 +147,7 @@ void SAL_CALL PropertySetContainer::replaceByIndex( sal_Int32 Index, const ::com
sal_Int32 SAL_CALL PropertySetContainer::getCount()
throw ( RuntimeException, std::exception )
{
- Guard aGuard( m_aLock );
+ SolarMutexGuard g;
return m_aPropertySetVector.size();
}
@@ -157,7 +155,7 @@ sal_Int32 SAL_CALL PropertySetContainer::getCount()
Any SAL_CALL PropertySetContainer::getByIndex( sal_Int32 Index )
throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
- Guard aGuard( m_aLock );
+ SolarMutexGuard g;
if ( (sal_Int32)m_aPropertySetVector.size() > Index )
{
@@ -174,7 +172,7 @@ Any SAL_CALL PropertySetContainer::getByIndex( sal_Int32 Index )
sal_Bool SAL_CALL PropertySetContainer::hasElements()
throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- Guard aGuard( m_aLock );
+ SolarMutexGuard g;
return !( m_aPropertySetVector.empty() );
}