? .svxmsbas.cxx.swp
? mypatch
Index: msdffimp.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/msfilter/msdffimp.cxx,v
retrieving revision 1.70.2.2
diff -u -r1.70.2.2 msdffimp.cxx
--- msdffimp.cxx	14 Feb 2003 14:55:08 -0000	1.70.2.2
+++ msdffimp.cxx	20 Feb 2003 12:01:27 -0000
@@ -3721,7 +3721,6 @@
 		}
 
 		//  Textrahmen, auch Title oder Outline
-		SdrObject*  pOrgObj  = pObj;
 		SdrRectObj* pTextObj = 0;
 		UINT32 nTextId = GetPropertyValue( DFF_Prop_lTxid, 0 );
 		if( nTextId )
@@ -3752,7 +3751,7 @@
             if (bTextFrame)
             {
                 delete pObj;
-                pObj = pOrgObj = 0;
+                pObj = 0;
             }
             pTextObj = new SdrRectObj(OBJ_TEXT, rTextRect);
             pTextImpRec = new SvxMSDffImportRec(*pImpRec);
@@ -3946,7 +3945,6 @@
 					SdrObject* pGroup = new SdrObjGroup;
 					pGroup->GetSubList()->NbcInsertObject( pObj );
 					pGroup->GetSubList()->NbcInsertObject( pTextObj );
-					pOrgObj = pObj;
 					pObj    = pGroup;
 				}
 			}
@@ -3957,7 +3955,6 @@
 			// this is OK for Draw but not for Calc and Writer
 			// cause here these objects have a default border
 			pObj = new SdrRectObj(rTextRect);
-			pOrgObj = pObj;
 			pObj->SetModel( pSdrModel );
             SfxItemSet aSet( pSdrModel->GetItemPool() );
 			ApplyAttributes( rSt, aSet, pObj );
@@ -4016,13 +4013,13 @@
 		if( pImpRec->nShapeId )
 		{
 			// Import-Record-Liste ergaenzen
-			if( pOrgObj )
+			if( pObj )
 			{
-				pImpRec->pObj = pOrgObj;
+				pImpRec->pObj = pObj;
 				rImportData.aRecords.Insert( pImpRec );
 			}
 
-			if( pTextObj && (pOrgObj != pTextObj) )
+			if( pTextObj && (pObj != pTextObj) )
 			{
 				// Modify ShapeId (must be unique)
 				pImpRec->nShapeId |= 0x8000000;