From e48c4aa8e641715d646bb36abecf8bcd73e88a05 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Wed, 1 Nov 2006 13:18:22 +0000
Subject: INTEGRATION: CWS impress109 (1.51.20); FILE MERGED 2006/10/19
 12:49:28 sj 1.51.20.2: RESYNC: (1.51-1.52); FILE MERGED 2006/10/13 08:09:37
 cl 1.51.20.1: #133468# use weak reference for text edit object

---
 sd/source/ui/view/sdview.cxx | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'sd')

diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 31a3f43021ec..8c255dc26677 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: sdview.cxx,v $
  *
- *  $Revision: 1.52 $
+ *  $Revision: 1.53 $
  *
- *  last change: $Author: obo $ $Date: 2006-10-13 11:03:02 $
+ *  last change: $Author: vg $ $Date: 2006-11-01 14:18:22 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -684,9 +684,6 @@ BOOL View::BegTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin,
         pOL->SetParaRemovingHdl(LINK(this, View, ParagraphRemovingHdl));
     }
 
-    if( GetTextEditObject() )
-        GetTextEditObject()->AddObjectUser( *this );
-
     return(bReturn);
 }
 
@@ -723,9 +720,6 @@ SdrEndTextEditKind View::EndTextEdit(BOOL bDontDeleteReally, FunctionReference x
         }
     }
 
-    if( GetTextEditObject() )
-        GetTextEditObject()->RemoveObjectUser( *this );
-
     FuText* pFuText = dynamic_cast<FuText*>(xFunc.get());
     if ( pFuText )
     {
@@ -1148,14 +1142,6 @@ IMPL_LINK( View, ParagraphRemovingHdl, ::Outliner *, pOutliner )
     return 0;
 }
 
-void View::ObjectInDestruction(const SdrObject& rObject)
-{
-    if( GetTextEditObject() == &rObject )
-    {
-        pTextEditObj = 0;
-    }
-}
-
 bool View::isRecordingUndo() const
 {
     sd::UndoManager* pUndoManager = pDoc ? pDoc->GetUndoManager() : 0;
-- 
cgit