#79544# _CreateShape: correction of ref count

1 files changed, 4 insertions, 275 deletions

diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 478956814c3e..94b0c5f27cec 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unodraw.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-19 00:08:28 $
+ *  last change: $Author: os $ $Date: 2000-10-20 08:58:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -312,7 +312,9 @@ uno::Reference< drawing::XShape >  SwFmDrawPage::_CreateShape( SdrObject *pObj )
         pShape = (SwXShape*)xShapeTunnel->getSomething(SwXShape::getUnoTunnelId());
     if(!pShape)
     {
+        xShapeTunnel = 0;
         uno::Reference< uno::XInterface > xCreate(xShape, uno::UNO_QUERY);
+        xShape = 0;
         uno::Reference< XPropertySet >  xPrSet = new SwXShape( xCreate );
         xShape = uno::Reference< drawing::XShape >(xPrSet, uno::UNO_QUERY);
     }
@@ -1145,276 +1147,3 @@ SvxShape*   SwXShape::GetSvxShape()
     return pSvxShape;
 }
 
-
-
-/*------------------------------------------------------------------------
-
-    $Log: not supported by cvs2svn $
-    Revision 1.86  2000/09/18 16:04:31  willem.vandorp
-    OpenOffice header added.
-
-    Revision 1.85  2000/09/11 09:56:01  os
-    #78642# getTypes corrected
-
-    Revision 1.84  2000/09/11 07:59:09  os
-    #77691# dont try to aggregate twice
-
-    Revision 1.83  2000/06/20 15:36:33  hr
-    syntax
-
-    Revision 1.82  2000/06/16 12:29:59  os
-    UNO3 errors removed
-
-    Revision 1.81  2000/05/16 09:14:54  os
-    project usr removed
-
-    Revision 1.80  2000/04/11 08:31:03  os
-    UNICODE
-
-    Revision 1.79  2000/03/27 10:21:09  os
-    UNO III
-
-    Revision 1.78  2000/03/21 15:42:24  os
-    UNOIII
-
-    Revision 1.77  2000/02/11 14:35:24  hr
-    #70473# changes for unicode ( patched by automated patchtool )
-
-    Revision 1.76  2000/02/01 16:02:38  os
-    #72517# aggregation: complete class hierarchy
-
-    Revision 1.75  2000/01/03 12:15:10  os
-    #71284# ::group: return SwXShape
-
-    Revision 1.74  1999/11/19 16:40:18  os
-    modules renamed
-
-    Revision 1.73  1999/07/21 10:29:36  OS
-    #65953# SwXDrawPage::group - uno::Exception if shapes are anchored in_content
-
-
-      Rev 1.72   21 Jul 1999 12:29:36   OS
-   #65953# SwXDrawPage::group - uno::Exception if shapes are anchored in_content
-
-      Rev 1.71   03 Jun 1999 12:15:10   OS
-   #66425# ServiceInfo des SvxShape weiterleiten
-
-      Rev 1.70   31 May 1999 08:00:20   OS
-   #66429# Shape-Properties schon vor den Einfuegen verfuegbar
-
-      Rev 1.69   23 Apr 1999 08:26:24   OS
-   #65194# Semikolon muss weg
-
-      Rev 1.68   22 Apr 1999 16:13:38   OS
-   #65194# throw -> throw; #65124# not impl. nur noch warning; EventListener
-
-      Rev 1.67   14 Apr 1999 14:57:14   OS
-   #64676# Shape auch per InsertTextContent einfuegen
-
-      Rev 1.66   15 Mar 1999 14:36:30   OS
-   #62845# Makro fuer ServiceInfo jetzt auch fuer OS/2
-
-      Rev 1.65   12 Mar 1999 09:41:06   OS
-   #62845# XServiceInfo impl.
-
-      Rev 1.64   09 Mar 1999 12:40:58   OS
-   #62008# Solar-Mutex
-
-      Rev 1.63   04 Mar 1999 15:01:30   OS
-   #62191# UINT nicht mehr verwenden
-
-      Rev 1.62   03 Mar 1999 12:52:54   MIB
-   #62566#: Position auch dann richtig, wenn sie direkt am Shape gesetzt wird
-
-      Rev 1.61   26 Feb 1999 07:40:06   OS
-   #62352# uno::Reference< drawing::XShape >  aggregieren: beim Format anmelden
-
-      Rev 1.60   23 Feb 1999 10:33:46   OS
-   #61968# Positionierung auch ohne Range richtig konvertieren
-
-      Rev 1.59   18 Feb 1999 15:51:02   OS
-   #61698# Positionierung berichtigt
-
-      Rev 1.58   17 Feb 1999 14:14:50   OS
-   #61957# chaos::Action fuer einfuegen und umankern
-
-      Rev 1.57   17 Feb 1999 11:52:02   OS
-   #52654# Gruppierung wieder geweckt
-
-      Rev 1.56   15 Feb 1999 11:22:42   OS
-   #52654# Aggragation fuer Shape besser
-
-      Rev 1.55   10 Feb 1999 11:10:18   OS
-   #52552# Returnwert fuer SvxDrawPage::_CreateShape geaendert
-
-      Rev 1.54   09 Feb 1999 16:50:10   HR
-   ?:-Operator erwartert gleiche Typen auf beiden Seiten des :
-
-      Rev 1.53   09 Feb 1999 15:04:36   OS
-   #56371# gehackte Speicherloecher
-
-      Rev 1.52   09 Feb 1999 15:00:46   OS
-   #56371# NAMESPACE ausgebaut
-
-      Rev 1.51   09 Feb 1999 14:15:04   OS
-   #56371# NAMESPACE ausgebaut
-
-      Rev 1.50   05 Feb 1999 15:08:56   OS
-   #56371# Hori/VertOrient wieder verfuegbar
-
-      Rev 1.49   05 Feb 1999 10:47:02   MIB
-   #56371#: Nur einmal in Twip umrechnen
-
-      Rev 1.48   04 Feb 1999 16:29:08   OS
-   #56371# Position richtig auswerten, existierende drawing::Shapes nicht neu anlegen
-
-      Rev 1.47   04 Feb 1999 09:19:10   OS
-   #56371# drawing::ShapeDescriptor funktioniert wieder
-
-      Rev 1.46   01 Feb 1999 15:49:36   OS
-   #56371# Descriptor-Ctor fuer SwXShape
-
-      Rev 1.45   29 Jan 1999 17:18:46   JP
-   Task #61014#: FindSdrObject/FindContactObject als Methoden vom SwFrmFmt
-
-      Rev 1.44   28 Jan 1999 16:15:28   JP
-   Task #61014#: FindSdrObject/FindContactObject als Methoden vom SwFrmFmt
-
-      Rev 1.43   28 Jan 1999 16:07:12   OS
-   #56371# richtige Aggregation
-
-      Rev 1.42   27 Jan 1999 12:29:46   OS
-   #56371# TF_ONE51 TextRange nicht in alter Version
-
-      Rev 1.41   27 Jan 1999 12:06:52   OS
-   #56371# TF_ONE51
-
-      Rev 1.40   22 Jan 1999 15:09:06   OS
-   #56371# Draw wieder verfuegbar
-
-      Rev 1.39   10 Dec 1998 15:53:10   OS
-   #56371# TF_ONE51 Zwischenstand
-
-      Rev 1.38   09 Nov 1998 14:44:32   OS
-   #58785# getSelection an der XTextView vollstaendig
-
-      Rev 1.37   04 Nov 1998 08:42:08   OS
-   #58749# Assertion fuer Multiselektion nur noch bei Bedarf
-
-      Rev 1.36   23 Oct 1998 12:29:38   OS
-   #58371# fuer jedes ShowPage auch ein HidePage rufen
-
-      Rev 1.35   17 Sep 1998 09:13:46   OS
-   #52654# Ankerwechsel mit ChgAnchor
-
-      Rev 1.34   03 Sep 1998 15:45:34   OS
-   #52552 SelectObjectsInView mit zweitem Parameter
-
-      Rev 1.33   16 Jul 1998 13:26:30   OS
-   Konvertierung Twip/1/100 mm #52654#
-
-      Rev 1.32   10 Jul 1998 18:09:02   OS
-   PropertySetInfo und IdlClass static
-
-      Rev 1.31   09 Jul 1998 09:15:02   OS
-   ChgAnchor jetzt am Doc
-
-      Rev 1.30   03 Jul 1998 16:58:58   OS
-   falsche Assertion raus
-
-      Rev 1.29   03 Jul 1998 16:17:08   OS
-   Ableitung von drawing::XShapeGrouper
-
-      Rev 1.28   30 Jun 1998 12:10:22   OS
-   Twip-Konvertierung wieder raus
-
-      Rev 1.27   27 Jun 1998 16:25:46   OS
-   PropertyMapProvider
-
-      Rev 1.26   24 Jun 1998 14:16:38   HR
-   Klammern bei Methodenaufruf vergessen
-
-      Rev 1.25   23 Jun 1998 14:13:18   MIB
-   XFormPage-Interface wegen Abhaengigkeit vom DrawModel
-
-      Rev 1.24   23 Jun 1998 13:09:34   OS
-   Einheitenkonvertierung
-
-      Rev 1.23   18 Jun 1998 08:08:30   OS
-   Syntax OS/2
-
-      Rev 1.22   15 Jun 1998 14:02:42   OS
-   InsertShape: Anker immer setzen
-
-      Rev 1.21   15 Jun 1998 13:58:52   MIB
-   getIdlClassen nun richtig
-
-
-      Rev 1.20   10 Jun 1998 09:54:46   OS
-   Package-Umstellung
-
-      Rev 1.19   08 Jun 1998 08:45:54   OS
-   insertShape->insertShapeAtTextPosition
-
-      Rev 1.18   05 Jun 1998 14:02:38   OS
-   getIdlClasses fuer Shape verwendet Aggregation
-
-
-      Rev 1.17   04 Jun 1998 16:10:08   MIB
-   insertShape: zeichengebundene Objekte bekommen Position (0,0)
-
-      Rev 1.16   04 Jun 1998 12:18:22   OS
-   getIdlClasses
-
-
-      Rev 1.15   02 Jun 1998 16:03:58   MIB
-   neue form-Control-Anbindung
-
-      Rev 1.14   29 May 1998 12:18:26   OS
-   getImplementation fuer SwXShape
-
-
-      Rev 1.13   19 May 1998 19:04:42   MIB
-   LRSpace und ULSpace berichtigt
-
-      Rev 1.12   19 May 1998 11:28:40   OS
-   mehr Attribute fuer den drawing::ShapeDescriptor
-
-      Rev 1.11   14 May 1998 10:27:02   OS
-   SfxExtItemPropertySet doch schon ab 390, Map berichtigt
-
-      Rev 1.10   14 May 1998 08:22:32   OS
-   FmPage aggregieren
-
-      Rev 1.9   13 May 1998 15:29:14   OS
-   TextPosition-Auswertung verbessert
-
-      Rev 1.8   12 May 1998 17:10:16   JP
-   rund um Flys/DrawObjs im Doc/FESh umgestellt/optimiert
-
-      Rev 1.7   12 May 1998 15:28:32   OS
-   alte Methoden raus
-
-      Rev 1.6   12 May 1998 12:48:34   OS
-   Properties verknuepft
-
-      Rev 1.5   11 May 1998 11:07:24   OS
-   Sonderzeichen geloescht
-
-      Rev 1.4   11 May 1998 10:48:00   OS
-   chaos::Action fuer InsertShape
-
-      Rev 1.3   11 May 1998 09:05:04   MIB
-   Aggregation statt Pointer
-
-      Rev 1.2   08 May 1998 08:07:18   MIB
-   form-Control-Integration
-
-      Rev 1.1   06 May 1998 17:05:30   OS
-   eigene Properties fuer drawing::ShapeDescriptor
-
-      Rev 1.0   06 May 1998 16:17:24   OS
-   Initial revision.
-
-------------------------------------------------------------------------*/
-