diff options
author | Michael Stahl <mstahl@redhat.com> | 2016-06-21 22:06:37 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2016-06-21 23:30:45 +0200 |
commit | eca55c4b8d8cb119aa1b8ad8744fa68f8fcc0ac7 (patch) | |
tree | bbaee8cf6d6d34f00b48a0a633a4779b4425f355 /sw/source | |
parent | 33b9476b047f2815664c01c1f9c124087c779318 (diff) |
sw: replace pointless XComponent and XTextContent overrides
... from SwXTextGraphicObject and SwXTextEmbeddedObject.
Change-Id: I22c2937617b84262c124d2504a8f9d889895005b
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/core/unocore/unoframe.cxx | 56 | ||||
-rw-r--r-- | sw/source/core/unocore/unotext.cxx | 2 |
2 files changed, 1 insertions, 57 deletions
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 8547509083f9..6e037edd7724 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 ddb9d46d271d..43b29b5c4086 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 = |