diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-12-04 13:25:08 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-04 15:57:43 +0000 |
| commit | 1bc6bd89adfdfe77e0355319c9b25ee6999f74fc (patch) | |
| tree | 45967d7302ec6971d234231c31e48ede01e1f686 /svx | |
| parent | fe471fec199f5a16bd49caa45561abc518ac75bb (diff) | |
tdf#88206 replace cppu::WeakImplHelper* in svtools and svx
and remove unused implbase*.hxx and compbase*.hxx includes
Change-Id: Iedf6b6dce09b5baf714a1b3394bb7fb3526cca82
Reviewed-on: https://gerrit.libreoffice.org/31594
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/inc/gridcell.hxx | 1 | ||||
| -rw-r--r-- | svx/source/xml/xmleohlp.cxx | 4 | ||||
| -rw-r--r-- | svx/source/xml/xmlgrhlp.cxx | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 41559473c792..a6150aad4148 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -42,7 +42,6 @@ #include <comphelper/propmultiplex.hxx> #include <comphelper/interfacecontainer2.hxx> #include <cppuhelper/component.hxx> -#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase2.hxx> #include <tools/diagnose_ex.h> diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index 3bf4c0dfd4b2..5db22ceb64a9 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -122,7 +122,7 @@ void SAL_CALL OutputStorageWrapper_Impl::closeOutput() } SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper() : - WeakComponentImplHelper2< XEmbeddedObjectResolver, XNameAccess >( maMutex ), + WeakComponentImplHelper< XEmbeddedObjectResolver, XNameAccess >( maMutex ), maReplacementGraphicsContainerStorageName( XML_CONTAINERSTORAGE_NAME ), maReplacementGraphicsContainerStorageName60( XML_CONTAINERSTORAGE_NAME_60 ), mpDocPersist( nullptr ), @@ -132,7 +132,7 @@ SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper() : } SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper( ::comphelper::IEmbeddedHelper& rDocPersist, SvXMLEmbeddedObjectHelperMode eCreateMode ) : - WeakComponentImplHelper2< XEmbeddedObjectResolver, XNameAccess >( maMutex ), + WeakComponentImplHelper< XEmbeddedObjectResolver, XNameAccess >( maMutex ), maReplacementGraphicsContainerStorageName( XML_CONTAINERSTORAGE_NAME ), maReplacementGraphicsContainerStorageName60( XML_CONTAINERSTORAGE_NAME_60 ), mpDocPersist( nullptr ), diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 597f3bcf0724..e9271fb5ceb3 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -345,14 +345,14 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject() } SvXMLGraphicHelper::SvXMLGraphicHelper( SvXMLGraphicHelperMode eCreateMode ) : - ::cppu::WeakComponentImplHelper2< css::document::XGraphicObjectResolver, + cppu::WeakComponentImplHelper< css::document::XGraphicObjectResolver, css::document::XBinaryStreamResolver >( maMutex ) { Init( nullptr, eCreateMode, false ); } SvXMLGraphicHelper::SvXMLGraphicHelper() - : ::cppu::WeakComponentImplHelper2< css::document::XGraphicObjectResolver, + : cppu::WeakComponentImplHelper< css::document::XGraphicObjectResolver, css::document::XBinaryStreamResolver >( maMutex ) , meCreateMode(SvXMLGraphicHelperMode::Read) , mbDirect(false) |