summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-20 09:09:14 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-20 09:48:22 +0100
commit67f378565044355d50aab69b05799adb7c3027bc (patch)
treee74a01fdf9d8e5c283d164e4ba689cfcc8686d5d
parent94f8a0e60b7bc5c1176eafe9a36c3f3466bd1408 (diff)
Remove unused ThreadHelpBase base
Change-Id: I0e15184071fc2c1cb231ead98210d4a1654208e7
-rw-r--r--framework/inc/uiconfiguration/imagemanager.hxx4
-rw-r--r--framework/source/uiconfiguration/imagemanager.cxx4
2 files changed, 2 insertions, 6 deletions
diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx
index 67193fee02e9..baf17ee716bf 100644
--- a/framework/inc/uiconfiguration/imagemanager.hxx
+++ b/framework/inc/uiconfiguration/imagemanager.hxx
@@ -24,7 +24,6 @@
#include <boost/unordered_map.hpp>
#include <memory>
-#include <threadhelp/threadhelpbase.hxx>
#include <stdtypes.h>
#include <uiconfiguration/imagetype.hxx>
@@ -51,8 +50,7 @@
namespace framework
{
class ImageManagerImpl;
- class ImageManager : private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses.
- public ::cppu::WeakImplHelper2< ::com::sun::star::ui::XImageManager, css::lang::XServiceInfo>
+ class ImageManager : public ::cppu::WeakImplHelper2< ::com::sun::star::ui::XImageManager, css::lang::XServiceInfo>
{
public:
ImageManager( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext );
diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx
index 737dd8d5ea54..cd912d99e9b0 100644
--- a/framework/source/uiconfiguration/imagemanager.cxx
+++ b/framework/source/uiconfiguration/imagemanager.cxx
@@ -19,7 +19,6 @@
#include <uiconfiguration/imagemanager.hxx>
-#include <threadhelp/guard.hxx>
#include <xml/imagesconfiguration.hxx>
#include <uiconfiguration/graphicnameaccess.hxx>
#include "imagemanagerimpl.hxx"
@@ -60,8 +59,7 @@ namespace framework
{
ImageManager::ImageManager( const uno::Reference< uno::XComponentContext >& rxContext ) :
- ThreadHelpBase( &Application::GetSolarMutex() )
- , m_pImpl( new ImageManagerImpl(rxContext, this, false) )
+ m_pImpl( new ImageManagerImpl(rxContext, this, false) )
{
}