summaryrefslogtreecommitdiff
path: root/framework/source/helper/ocomponentaccess.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'framework/source/helper/ocomponentaccess.cxx')
-rw-r--r--framework/source/helper/ocomponentaccess.cxx13
1 files changed, 3 insertions, 10 deletions
diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx
index 65a150f9648d..f8679988eff1 100644
--- a/framework/source/helper/ocomponentaccess.cxx
+++ b/framework/source/helper/ocomponentaccess.cxx
@@ -20,8 +20,6 @@
#include <helper/ocomponentaccess.hxx>
#include <helper/ocomponentenumeration.hxx>
-#include <threadhelp/guard.hxx>
-
#include <com/sun/star/frame/FrameSearchFlag.hpp>
#include <vcl/svapp.hxx>
@@ -40,10 +38,7 @@ using namespace ::rtl ;
// constructor
OComponentAccess::OComponentAccess( const css::uno::Reference< XDesktop >& xOwner )
- // Init baseclasses first
- : ThreadHelpBase ( &Application::GetSolarMutex() )
- // Init member
- , m_xOwner ( xOwner )
+ : m_xOwner ( xOwner )
{
// Safe impossible cases
SAL_WARN_IF( !impldbg_checkParameter_OComponentAccessCtor( xOwner ), "fwk", "OComponentAccess::OComponentAccess(): Invalid parameter detected!" );
@@ -60,8 +55,7 @@ OComponentAccess::~OComponentAccess()
// XEnumerationAccess
css::uno::Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration() throw( RuntimeException, std::exception )
{
- // Ready for multithreading
- Guard aGuard( m_aLock );
+ SolarMutexGuard g;
// Set default return value, if method failed.
// If no desktop exist and there is no task container - return an empty enumeration!
@@ -98,8 +92,7 @@ Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException, std::e
// XElementAccess
sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException, std::exception )
{
- // Ready for multithreading
- Guard aGuard( m_aLock );
+ SolarMutexGuard g;
// Set default return value, if method failed.
sal_Bool bReturn = sal_False;