Kaydet (Commit) 4b43155f authored tarafından Michael Stahl's avatar Michael Stahl

sw: remove SwEventListenerContainer in SwXTextCursor

was totally pointless since this one doesn't even implement XComponent

Change-Id: I0b8d9b0299f6fd06f2bfe5f75be4cbef5fd672b3
üst e31813b0
...@@ -73,7 +73,6 @@ ...@@ -73,7 +73,6 @@
#include <unomap.hxx> #include <unomap.hxx>
#include <unosett.hxx> #include <unosett.hxx>
#include <unoprnms.hxx> #include <unoprnms.hxx>
#include <unoevtlstnr.hxx>
#include <unodraw.hxx> #include <unodraw.hxx>
#include <unocoll.hxx> #include <unocoll.hxx>
#include <unostyle.hxx> #include <unostyle.hxx>
...@@ -707,15 +706,12 @@ class SwXTextCursor::Impl ...@@ -707,15 +706,12 @@ class SwXTextCursor::Impl
{ {
public: public:
const SfxItemPropertySet & m_rPropSet; const SfxItemPropertySet & m_rPropSet;
const enum CursorType m_eType; const enum CursorType m_eType;
const uno::Reference< text::XText > m_xParentText; const uno::Reference< text::XText > m_xParentText;
SwEventListenerContainer m_ListenerContainer;
bool m_bIsDisposed; bool m_bIsDisposed;
Impl( SwXTextCursor & rThis, Impl( SwDoc & rDoc,
SwDoc & rDoc,
const enum CursorType eType, const enum CursorType eType,
uno::Reference<text::XText> xParent, uno::Reference<text::XText> xParent,
SwPosition const& rPoint, SwPosition const*const pMark) SwPosition const& rPoint, SwPosition const*const pMark)
...@@ -723,7 +719,6 @@ public: ...@@ -723,7 +719,6 @@ public:
, m_rPropSet(*aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_CURSOR)) , m_rPropSet(*aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_CURSOR))
, m_eType(eType) , m_eType(eType)
, m_xParentText(xParent) , m_xParentText(xParent)
, m_ListenerContainer(static_cast< ::cppu::OWeakObject* >(&rThis))
, m_bIsDisposed(false) , m_bIsDisposed(false)
{ {
if (pMark) if (pMark)
...@@ -754,7 +749,6 @@ public: ...@@ -754,7 +749,6 @@ public:
void Invalidate() { void Invalidate() {
m_bIsDisposed = true; m_bIsDisposed = true;
m_ListenerContainer.Disposing();
} }
protected: protected:
// SwClient // SwClient
...@@ -810,14 +804,13 @@ SwXTextCursor::SwXTextCursor( ...@@ -810,14 +804,13 @@ SwXTextCursor::SwXTextCursor(
const enum CursorType eType, const enum CursorType eType,
const SwPosition& rPos, const SwPosition& rPos,
SwPosition const*const pMark) SwPosition const*const pMark)
: m_pImpl( new SwXTextCursor::Impl(*this, rDoc, eType, xParent, : m_pImpl( new Impl(rDoc, eType, xParent, rPos, pMark) )
rPos, pMark ) )
{ {
} }
SwXTextCursor::SwXTextCursor(uno::Reference< text::XText > const& xParent, SwXTextCursor::SwXTextCursor(uno::Reference< text::XText > const& xParent,
SwPaM const& rSourceCursor, const enum CursorType eType) SwPaM const& rSourceCursor, const enum CursorType eType)
: m_pImpl( new SwXTextCursor::Impl(*this, *rSourceCursor.GetDoc(), eType, : m_pImpl( new Impl(*rSourceCursor.GetDoc(), eType,
xParent, *rSourceCursor.GetPoint(), xParent, *rSourceCursor.GetPoint(),
rSourceCursor.HasMark() ? rSourceCursor.GetMark() : 0) ) rSourceCursor.HasMark() ? rSourceCursor.GetMark() : 0) )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment