[Libreoffice-commits] core.git: include/svx svx/source

[Noel Grandin (via logerrit)]

 include/svx/unoshape.hxx        |    7 +------
 svx/source/unodraw/unoshap2.cxx |    5 -----
 2 files changed, 1 insertion(+), 11 deletions(-)

New commits:
commit e8f9830f48ba08b3b949d8b0fd1d33aad0f5b0e9
Author:     Noel Grandin <noel at peralex.com>
AuthorDate: Fri Mar 19 15:37:24 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Mar 20 07:47:23 2021 +0100

    SvxShape: no need to inherit from WeakAggImplHelper1 twice
    
    once here, and once in one of the superclasses
    
    Change-Id: I0396012b613f195783ef8c7eae38f29120007381
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112744
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index dc0d94a80f9c..844c2aac23bb 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -794,11 +794,7 @@ public:
 /***********************************************************************
 *                                                                      *
 ***********************************************************************/
-typedef ::cppu::WeakAggImplHelper1<
-    css::drawing::XEnhancedCustomShapeDefaulter
-    > SvxShape_UnoImplHelper1;
-
-class SVXCORE_DLLPUBLIC SvxCustomShape final : public SvxShapeText, public SvxShape_UnoImplHelper1
+class SVXCORE_DLLPUBLIC SvxCustomShape final : public SvxShapeText, public css::drawing::XEnhancedCustomShapeDefaulter
 {
 protected:
     using SvxUnoTextRangeBase::setPropertyValue;
@@ -827,7 +823,6 @@ public:
     void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     //XEnhancedCustomShapeDefaulter
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 2c4487b4cec6..56d1c1569479 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1582,11 +1582,6 @@ uno::Any SAL_CALL SvxCustomShape::queryAggregation( const uno::Type & rType )
     return aReturn;
 }
 
-uno::Sequence< uno::Type > SAL_CALL SvxCustomShape::getTypes()
-{
-    return SvxShapeText::getTypes();
-}
-
 uno::Sequence< sal_Int8 > SAL_CALL SvxCustomShape::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();