diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-19 17:45:43 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-19 18:17:05 +0100 |
| commit | 112e9c641bb6e30b704c6c3c574c3f8b2e996d99 (patch) | |
| tree | b622e47fc3192cef89cdfbfa0fd681d483e07edc /framework/source/uifactory | |
| parent | be370b4f70d79e17d728ac6289c0558171fe401a (diff) | |
Use SolarMutexGuard directly
Change-Id: Ib414409d7f7a3bdfba6dbeeab0d8c1e8e2084ceb
Diffstat (limited to 'framework/source/uifactory')
| -rw-r--r-- | framework/source/uifactory/addonstoolbarfactory.cxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx index 6a2668e8ad73..3dac557ac042 100644 --- a/framework/source/uifactory/addonstoolbarfactory.cxx +++ b/framework/source/uifactory/addonstoolbarfactory.cxx @@ -18,8 +18,6 @@ */ #include <uielement/addonstoolbarwrapper.hxx> -#include <threadhelp/guard.hxx> -#include <threadhelp/threadhelpbase.hxx> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/ModuleManager.hpp> @@ -53,8 +51,7 @@ using namespace framework; namespace { -class AddonsToolBarFactory : protected ThreadHelpBase, // Struct for right initalization of mutex member! Must be first of baseclasses. - public ::cppu::WeakImplHelper2< css::lang::XServiceInfo , +class AddonsToolBarFactory : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo , css::ui::XUIElementFactory > { public: @@ -94,8 +91,7 @@ private: AddonsToolBarFactory::AddonsToolBarFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) : - ThreadHelpBase( &Application::GetSolarMutex() ) - , m_xContext( xContext ) + m_xContext( xContext ) , m_xModuleManager( ModuleManager::create( xContext ) ) { } @@ -180,8 +176,7 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) { - // SAFE - Guard aLock( m_aLock ); + SolarMutexGuard g; Sequence< Sequence< PropertyValue > > aConfigData; Reference< XFrame > xFrame; |