diff options
Diffstat (limited to 'xmloff/source/draw/shapeimport.cxx')
| -rw-r--r-- | xmloff/source/draw/shapeimport.cxx | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index d2ae38cbd5aa..bb170cfc8ece 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -2,9 +2,9 @@ * * $RCSfile: shapeimport.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: cl $ $Date: 2000-12-01 19:19:53 $ + * last change: $Author: cl $ $Date: 2000-12-05 23:24:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -151,17 +151,18 @@ XMLShapeImportHelper::XMLShapeImportHelper( // construct PropertySetMapper UniReference < XMLPropertySetMapper > xMapper = new XMLShapePropertySetMapper(mpSdPropHdlFactory); mpPropertySetMapper = new SvXMLImportPropertyMapper( xMapper ); - if(mpPropertySetMapper) + // set lock to avoid deletion + mpPropertySetMapper->acquire(); + + if( pExtMapper ) { - // set lock to avoid deletion - mpPropertySetMapper->acquire(); - if( pExtMapper ) - { - UniReference < SvXMLImportPropertyMapper > xExtMapper( pExtMapper ); - mpPropertySetMapper->ChainImportMapper( xExtMapper ); - } + UniReference < SvXMLImportPropertyMapper > xExtMapper( pExtMapper ); + mpPropertySetMapper->ChainImportMapper( xExtMapper ); } + // chain text attributes + mpPropertySetMapper->ChainImportMapper(XMLTextImportHelper::CreateCharExtPropMapper()); + // construct PresPagePropsMapper xMapper = new XMLPropertySetMapper((XMLPropertyMapEntry*)aXMLSDPresPageProps, mpSdPropHdlFactory); mpPresPagePropsMapper = new SvXMLImportPropertyMapper( xMapper ); |