#90020#: use persist name of OLE objects

3 files changed, 10 insertions, 9 deletions

diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 7d6225d353e1..f3b0c3d73b8e 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sdxfer.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: ka $ $Date: 2001-09-04 14:38:20 $
+ *  last change: $Author: ka $ $Date: 2001-09-13 11:04:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -389,9 +389,6 @@ void SdTransferable::CreateData()
 
 void SdTransferable::AddSupportedFormats()
 {
-    if( !bLateInit )
-        CreateData();
-
     if( pOLEDataHelper )
     {
         AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE );
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 001c9d869084..fc6bef08f19b 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fuinsert.cxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: ka $ $Date: 2001-09-04 14:36:40 $
+ *  last change: $Author: ka $ $Date: 2001-09-13 11:05:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -633,6 +633,7 @@ FuInsertOLE::FuInsertOLE(SdViewShell* pViewSh, SdWindow* pWin, SdView* pView,
                                 pObj->SetEmptyPresObj(FALSE);
                                 ( (SdrOle2Obj*) pObj)->SetOutlinerParaObject(NULL);
                                 ( (SdrOle2Obj*) pObj)->SetObjRef(aIPObj);
+                                ( (SdrOle2Obj*) pObj)->SetPersistName(aName);
                                 ( (SdrOle2Obj*) pObj)->SetName(aName);
                                 Rectangle aRect = ( (SdrOle2Obj*) pObj)->GetLogicRect();
 
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index eb4091c34c93..14d9b9722abd 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sdview2.cxx,v $
  *
- *  $Revision: 1.20 $
+ *  $Revision: 1.21 $
  *
- *  last change: $Author: ka $ $Date: 2001-08-23 10:50:28 $
+ *  last change: $Author: ka $ $Date: 2001-09-13 11:06:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -479,6 +479,9 @@ BOOL SdView::BeginDrag(Window* pWindow, Point aStartPos)
     {
         BrkAction();
 
+        if( IsTextEdit() )
+            EndTextEdit();
+
         SdViewShell* pViewShell= pDocSh->GetViewShell();
 
         if( pViewShell && pViewShell->ISA( SdDrawViewShell ) )