diff options
author | Michael Stahl <mstahl@redhat.com> | 2014-08-20 14:19:31 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-08-20 16:40:18 +0200 |
commit | 9f01ba1b78edf6a08d36be39658327451120d613 (patch) | |
tree | d8d95274ec4d7211a57bc8ef1b4925e5feacbd7b /sw | |
parent | bd6f0559af3cd07e42ebefc55529c7e1ea77366f (diff) |
i#107771: sw: burn, UnoCallBack, burn!
Change-Id: Ifdb6d4b2e404bd160e6fcec3229691e750bdf698
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/doc.hxx | 4 | ||||
-rw-r--r-- | sw/source/core/doc/docnew.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/docnode/nodes.cxx | 9 | ||||
-rw-r--r-- | sw/source/core/txtnode/thints.cxx | 7 |
4 files changed, 0 insertions, 22 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 1fbb20693e1d..2ff506bbaa52 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -346,7 +346,6 @@ class SW_DLLPUBLIC SwDoc : SwLayoutCache *mpLayoutCache; /**< Layout cache to read and save with the document for a faster formatting */ - SwModify *mpUnoCallBack; IGrammarContact *mpGrammarContact; //< for grammar checking in paragraphs during editing // table of forbidden characters of this document @@ -1562,9 +1561,6 @@ public: */ bool ContainsHiddenChars() const; - // call back for API wrapper - SwModify* GetUnoCallBack() const { return mpUnoCallBack; } - IGrammarContact* getGrammarContact() const { return mpGrammarContact; } /** Marks/Unmarks a list level of a certain list diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index c5ec7fe7fee5..c18fe20a625e 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -254,7 +254,6 @@ SwDoc::SwDoc() mpExtInputRing( 0 ), mpStyleAccess( 0 ), mpLayoutCache( 0 ), - mpUnoCallBack(new SwModify(0)), mpGrammarContact(createGrammarContact()), m_pXmlIdRegistry(), mReferenceCount(0), @@ -446,7 +445,6 @@ SwDoc::~SwDoc() getIDocumentTimerAccess().StopIdling(); // stop idle timer - delete mpUnoCallBack, mpUnoCallBack = 0; delete mpURLStateChgd; // Deactivate Undo notification from Draw diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx index b65429686cf9..253a7925513b 100644 --- a/sw/source/core/docnode/nodes.cxx +++ b/sw/source/core/docnode/nodes.cxx @@ -263,7 +263,6 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz, GetDoc()->GetIDocumentUndoRedo().IsUndoNodes(rNds); for( size_t i = pHts->Count(); i; ) { - sal_uInt16 nDelMsg = 0; SwTxtAttr * const pAttr = pHts->GetTextHint( --i ); switch ( pAttr->Which() ) { @@ -325,14 +324,6 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz, default: break; } - - if( nDelMsg && bToUndo ) - { - SwPtrMsgPoolItem aMsgHint( nDelMsg, - (void*)&pAttr->GetAttr() ); - rNds.GetDoc()->GetUnoCallBack()-> - ModifyNotification( &aMsgHint, &aMsgHint ); - } } } //FEATURE::CONDCOLL diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 2ca92bab52fc..3e228ac7b943 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -1114,7 +1114,6 @@ void SwTxtNode::DestroyAttr( SwTxtAttr* pAttr ) { // einige Sachen muessen vorm Loeschen der "Format-Attribute" erfolgen SwDoc* pDoc = GetDoc(); - sal_uInt16 nDelMsg = 0; switch( pAttr->Which() ) { case RES_TXTATR_FLYCNT: @@ -1198,12 +1197,6 @@ void SwTxtNode::DestroyAttr( SwTxtAttr* pAttr ) break; } - if( nDelMsg && !pDoc->IsInDtor() && GetNodes().IsDocNodes() ) - { - SwPtrMsgPoolItem aMsgHint( nDelMsg, (void*)&pAttr->GetAttr() ); - pDoc->GetUnoCallBack()->ModifyNotification( &aMsgHint, &aMsgHint ); - } - SwTxtAttr::Destroy( pAttr, pDoc->GetAttrPool() ); } } |