sw: replace pointless XComponent and XTextContent overrides
... from SwXTextGraphicObject and SwXTextEmbeddedObject.
Change-Id: I22c2937617b84262c124d2504a8f9d889895005b
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index 9c5b7a9..5135a9a 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -46,11 +46,12 @@ class BaseFrameProperties_Impl;
class SwXFrame : public cppu::WeakImplHelper
<
css::lang::XServiceInfo,
css::lang::XUnoTunnel,
css::beans::XPropertySet,
css::beans::XPropertyState,
css::drawing::XShape,
css::container::XNamed,
css::lang::XUnoTunnel
css::text::XTextContent
>,
public SwClient
{
@@ -124,11 +125,13 @@ public:
//Base implementation
//XComponent
virtual void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception);
virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception);
virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception);
virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addEventListener(const css::uno::Reference<css::lang::XEventListener>& xListener) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeEventListener(const css::uno::Reference<css::lang::XEventListener>& xListener) throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() throw( css::uno::RuntimeException, std::exception );
// 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;
//XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
@@ -136,7 +139,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
void attachToRange(const css::uno::Reference< css::text::XTextRange > & xTextRange)throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception);
void attach( const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception);
const SwFrameFormat* GetFrameFormat() const
{
@@ -239,7 +241,6 @@ public:
typedef cppu::ImplInheritanceHelper
< SwXFrame,
css::text::XTextContent,
css::document::XEventsSupplier
>
SwXTextGraphicObjectBaseClass;
@@ -258,15 +259,6 @@ public:
static css::uno::Reference<css::text::XTextContent>
CreateXTextGraphicObject(SwDoc & rDoc, SwFrameFormat * pFrameFormat);
//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;
//XComponent
virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw( css::uno::RuntimeException, std::exception ) override;
//XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
@@ -274,6 +266,7 @@ public:
// XEventsSupplier
virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) throw(css::uno::RuntimeException, std::exception) override;
void * SAL_CALL operator new( size_t ) throw();
void SAL_CALL operator delete( void * ) throw();
};
@@ -281,7 +274,6 @@ public:
class SwOLENode;
typedef cppu::ImplInheritanceHelper
< SwXFrame,
css::text::XTextContent,
css::document::XEmbeddedObjectSupplier2,
css::document::XEventsSupplier
> SwXTextEmbeddedObjectBaseClass;
@@ -302,15 +294,6 @@ public:
static css::uno::Reference<css::text::XTextContent>
CreateXTextEmbeddedObject(SwDoc & rDoc, SwFrameFormat * pFrameFormat);
//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;
//XComponent
virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw( css::uno::RuntimeException, std::exception ) override;
//XEmbeddedObjectSupplier2
virtual css::uno::Reference< css::lang::XComponent > SAL_CALL getEmbeddedObject() throw( css::uno::RuntimeException, std::exception ) override;
virtual css::uno::Reference< css::embed::XEmbeddedObject > SAL_CALL getExtendedControlOverEmbeddedObject() throw( css::uno::RuntimeException, std::exception ) override;
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 8547509..6e037ed 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -3422,35 +3422,6 @@ SwXTextGraphicObject::CreateXTextGraphicObject(SwDoc & rDoc, SwFrameFormat *cons
return CreateXFrame<text::XTextContent, SwXTextGraphicObject>(rDoc, pFrameFormat);
}
void SwXTextGraphicObject::attach(const uno::Reference< text::XTextRange > & xTextRange) throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
{
SwXFrame::attach(xTextRange);
}
uno::Reference< text::XTextRange > SwXTextGraphicObject::getAnchor() throw( uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
return SwXFrame::getAnchor();
}
void SwXTextGraphicObject::dispose() throw( uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
SwXFrame::dispose();
}
void SwXTextGraphicObject::addEventListener(const uno::Reference< lang::XEventListener > & aListener)
throw( uno::RuntimeException, std::exception )
{
SwXFrame::addEventListener(aListener);
}
void SwXTextGraphicObject::removeEventListener(const uno::Reference< lang::XEventListener > & aListener)
throw( uno::RuntimeException, std::exception )
{
SwXFrame::removeEventListener(aListener);
}
OUString SwXTextGraphicObject::getImplementationName() throw( uno::RuntimeException, std::exception )
{
return OUString("SwXTextGraphicObject");
@@ -3511,33 +3482,6 @@ SwXTextEmbeddedObject::CreateXTextEmbeddedObject(SwDoc & rDoc, SwFrameFormat *co
return CreateXFrame<text::XTextContent, SwXTextEmbeddedObject>(rDoc, pFrameFormat);
}
void SwXTextEmbeddedObject::attach(const uno::Reference< text::XTextRange > & xTextRange) throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
{
SwXFrame::attach(xTextRange);
}
uno::Reference< text::XTextRange > SwXTextEmbeddedObject::getAnchor() throw( uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
return SwXFrame::getAnchor();
}
void SwXTextEmbeddedObject::dispose() throw( uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
SwXFrame::dispose();
}
void SwXTextEmbeddedObject::addEventListener(const uno::Reference< lang::XEventListener > & aListener) throw( uno::RuntimeException, std::exception )
{
SwXFrame::addEventListener(aListener);
}
void SwXTextEmbeddedObject::removeEventListener(const uno::Reference< lang::XEventListener > & aListener) throw( uno::RuntimeException, std::exception )
{
SwXFrame::removeEventListener(aListener);
}
uno::Reference< lang::XComponent > SwXTextEmbeddedObject::getEmbeddedObject() throw( uno::RuntimeException, std::exception )
{
uno::Reference<embed::XEmbeddedObject> xObj(getExtendedControlOverEmbeddedObject());
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index ddb9d46..43b29b5 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1735,7 +1735,7 @@ SwXText::convertToTextFrame(
sMessage = rRuntime.Message;
bRuntimeException = true;
}
xRet = &rNewFrame;
xRet = xNewFrame;
if (bParaBeforeInserted || bParaAfterInserted)
{
const uno::Reference<text::XTextCursor> xFrameTextCursor =
