sw: use ImplInheritanceHelper for SwXTextGraphicObject

... and SwXTextEmbeddedObjectBaseClass, and get rid of pointless manual
overriding of XInterface and XTypeProvider.

Change-Id: I6695d825b5caba08aca9764eb3052eab77ee6fdb

1 files changed, 7 insertions, 25 deletions

diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index b5822dd92c8b..9c5b7a96830c 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -237,14 +237,13 @@ public:
     void SAL_CALL operator delete( void * ) throw();
 };
 
-typedef cppu::WeakImplHelper
-<
+typedef cppu::ImplInheritanceHelper
+<   SwXFrame,
     css::text::XTextContent,
     css::document::XEventsSupplier
 >
 SwXTextGraphicObjectBaseClass;
-class SwXTextGraphicObject : public SwXTextGraphicObjectBaseClass,
-                            public SwXFrame
+class SwXTextGraphicObject : public SwXTextGraphicObjectBaseClass
 {
 protected:
     friend class SwXFrame; // just for CreateXFrame
@@ -259,14 +258,6 @@ public:
     static css::uno::Reference<css::text::XTextContent>
         CreateXTextGraphicObject(SwDoc & rDoc, SwFrameFormat * pFrameFormat);
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL acquire(  ) throw() override;
-    virtual void SAL_CALL release(  ) throw() override;
-
-    //XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
-
     //XTextContent
     virtual void SAL_CALL attach(const css::uno::Reference< css::text::XTextRange > & xTextRange) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
     virtual css::uno::Reference< css::text::XTextRange >  SAL_CALL getAnchor() throw( css::uno::RuntimeException, std::exception ) override;
@@ -288,15 +279,14 @@ public:
 };
 
 class SwOLENode;
-typedef cppu::WeakImplHelper
-<
+typedef cppu::ImplInheritanceHelper
+<   SwXFrame,
     css::text::XTextContent,
     css::document::XEmbeddedObjectSupplier2,
     css::document::XEventsSupplier
->SwXTextEmbeddedObjectBaseClass;
+> SwXTextEmbeddedObjectBaseClass;
 
-class SwXTextEmbeddedObject : public SwXTextEmbeddedObjectBaseClass,
-                                public SwXFrame
+class SwXTextEmbeddedObject : public SwXTextEmbeddedObjectBaseClass
 {
     css::uno::Reference<css::util::XModifyListener> m_xOLEListener;
 protected:
@@ -312,14 +302,6 @@ public:
     static css::uno::Reference<css::text::XTextContent>
         CreateXTextEmbeddedObject(SwDoc & rDoc, SwFrameFormat * pFrameFormat);
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL acquire(  ) throw() override;
-    virtual void SAL_CALL release(  ) throw() override;
-
-    //XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
-
     //XTextContent
     virtual void SAL_CALL attach(const css::uno::Reference< css::text::XTextRange > & xTextRange) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
     virtual css::uno::Reference< css::text::XTextRange >  SAL_CALL getAnchor() throw( css::uno::RuntimeException, std::exception ) override;