From 38868cce5ec853d4bb242c9bff2695e659da6353 Mon Sep 17 00:00:00 2001
From: Christian Lippka <cl@openoffice.org>
Date: Wed, 13 Dec 2000 18:16:42 +0000
Subject: #80699# reworked shape id creation and fixed import for all shapes

---
 xmloff/source/draw/ximpnote.cxx | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'xmloff/source/draw/ximpnote.cxx')

diff --git a/xmloff/source/draw/ximpnote.cxx b/xmloff/source/draw/ximpnote.cxx
index 7c8a92502791..1cb2256b1e54 100644
--- a/xmloff/source/draw/ximpnote.cxx
+++ b/xmloff/source/draw/ximpnote.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ximpnote.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: cl $ $Date: 2000-12-11 08:00:05 $
+ *  last change: $Author: cl $ $Date: 2000-12-13 19:13:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,7 +78,7 @@ SdXMLNotesContext::SdXMLNotesContext( SdXMLImport& rImport,
     USHORT nPrfx, const OUString& rLocalName,
     const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
     uno::Reference< drawing::XShapes >& rShapes)
-:   SdXMLGroupShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ),
+:   SdXMLGenericPageContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ),
     mbNotesMode(FALSE)
 {
     if(GetSdImport().IsImpress())
@@ -144,7 +144,7 @@ SvXMLImportContext *SdXMLNotesContext::CreateChildContext( USHORT nPrefix,
 
         // call parent when no own context was created
         if(!pContext)
-            pContext = SdXMLGroupShapeContext::CreateChildContext(nPrefix, rLocalName, xAttrList);
+            pContext = SdXMLGenericPageContext::CreateChildContext(nPrefix, rLocalName, xAttrList);
 
         return pContext;
     }
@@ -159,8 +159,7 @@ SvXMLImportContext *SdXMLNotesContext::CreateChildContext( USHORT nPrefix,
 
 void SdXMLNotesContext::EndElement()
 {
-    SdXMLGroupShapeContext::EndElement();
-    GetImport().GetShapeImport()->restoreConnections();
+    SdXMLGenericPageContext::EndElement();
 }
 
 
-- 
cgit