INTEGRATION: CWS swautowidth (1.90.48); FILE MERGED

2004/04/28 10:10:31 fme 1.90.48.3: resolve resync conflicts
2004/04/27 09:17:27 fme 1.90.48.2: RESYNC: (1.90-1.91); FILE MERGED
2004/04/26 11:05:50 mmaher 1.90.48.1: #i27204# Added fix for autowidth textboxes

svx/source/msfilter/msdffimp.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: msdffimp.cxx,v $
  *
- *  $Revision: 1.94 $
+ *  $Revision: 1.95 $
  *
- *  last change: $Author: kz $ $Date: 2004-05-18 15:45:31 $
+ *  last change: $Author: kz $ $Date: 2004-05-18 15:46:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -6508,12 +6508,9 @@ SvxMSDffImportRec::SvxMSDffImportRec()
       bReplaceByFly   = FALSE;
       bLastBoxInChain = TRUE;
       bHasUDefProp    = FALSE; // was the DFF_msofbtUDefProp record set?
-<<<<<<< msdffimp.cxx
       bVFlip = FALSE;
       bHFlip = FALSE;
-=======
       bAutoWidth      = FALSE;
->>>>>>> 1.90.48.3
 }
 
 SvxMSDffImportRec::SvxMSDffImportRec(const SvxMSDffImportRec& rCopy)