diff options
| -rw-r--r-- | sc/source/filter/xml/xmlstyli.cxx | 24 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmlstyli.hxx | 10 |
2 files changed, 19 insertions, 15 deletions
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index cd1ba3fd821d..60c94a081a22 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlstyli.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: sab $ $Date: 2001-09-13 15:15:15 $ + * last change: $Author: dvo $ $Date: 2001-09-21 16:32:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -140,8 +140,9 @@ using namespace xmloff::token; //using namespace ::com::sun::star::text; ScXMLCellImportPropertyMapper::ScXMLCellImportPropertyMapper( - const UniReference< XMLPropertySetMapper >& rMapper ) : - SvXMLImportPropertyMapper( rMapper ) + const UniReference< XMLPropertySetMapper >& rMapper, + SvXMLImport& rImport) : + SvXMLImportPropertyMapper( rMapper, rImport ) { } @@ -232,8 +233,9 @@ void ScXMLCellImportPropertyMapper::finished(::std::vector< XMLPropertyState >& } ScXMLRowImportPropertyMapper::ScXMLRowImportPropertyMapper( - const UniReference< XMLPropertySetMapper >& rMapper ) : - SvXMLImportPropertyMapper( rMapper ) + const UniReference< XMLPropertySetMapper >& rMapper, + SvXMLImport& rImport) : + SvXMLImportPropertyMapper( rMapper, rImport ) { } @@ -776,8 +778,8 @@ UniReference < SvXMLImportPropertyMapper > if( !xCellImpPropMapper.is() ) { ((XMLTableStylesContext *)this)->xCellImpPropMapper = - new ScXMLCellImportPropertyMapper( GetScImport().GetCellStylesPropertySetMapper() ); - xCellImpPropMapper->ChainImportMapper(XMLTextImportHelper::CreateCharExtPropMapper(const_cast<XMLFontStylesContext*>(GetScImport().GetFontDecls()))); + new ScXMLCellImportPropertyMapper( GetScImport().GetCellStylesPropertySetMapper(), (SvXMLImport)GetImport() ); + xCellImpPropMapper->ChainImportMapper(XMLTextImportHelper::CreateCharExtPropMapper((SvXMLImport)GetImport(), const_cast<XMLFontStylesContext*>(GetScImport().GetFontDecls()))); } xMapper = xCellImpPropMapper; } @@ -786,7 +788,7 @@ UniReference < SvXMLImportPropertyMapper > { if( !xColumnImpPropMapper.is() ) ((XMLTableStylesContext *)this)->xColumnImpPropMapper = - new SvXMLImportPropertyMapper( GetScImport().GetColumnStylesPropertySetMapper() ); + new SvXMLImportPropertyMapper( GetScImport().GetColumnStylesPropertySetMapper(), (SvXMLImport)GetImport() ); xMapper = xColumnImpPropMapper; } break; @@ -794,7 +796,7 @@ UniReference < SvXMLImportPropertyMapper > { if( !xRowImpPropMapper.is() ) ((XMLTableStylesContext *)this)->xRowImpPropMapper = - new ScXMLRowImportPropertyMapper( GetScImport().GetRowStylesPropertySetMapper() ); + new ScXMLRowImportPropertyMapper( GetScImport().GetRowStylesPropertySetMapper(), (SvXMLImport)GetImport() ); xMapper = xRowImpPropMapper; } break; @@ -802,7 +804,7 @@ UniReference < SvXMLImportPropertyMapper > { if( !xTableImpPropMapper.is() ) ((XMLTableStylesContext *)this)->xTableImpPropMapper = - new SvXMLImportPropertyMapper( GetScImport().GetTableStylesPropertySetMapper() ); + new SvXMLImportPropertyMapper( GetScImport().GetTableStylesPropertySetMapper(), (SvXMLImport)GetImport() ); xMapper = xTableImpPropMapper; } break; diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx index 3e6717fef535..d0ccca6c5e44 100644 --- a/sc/source/filter/xml/xmlstyli.hxx +++ b/sc/source/filter/xml/xmlstyli.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlstyli.hxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: sab $ $Date: 2001-06-11 05:48:08 $ + * last change: $Author: dvo $ $Date: 2001-09-21 16:32:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -101,7 +101,8 @@ protected: public: ScXMLCellImportPropertyMapper( - const UniReference< XMLPropertySetMapper >& rMapper ); + const UniReference< XMLPropertySetMapper >& rMapper, + SvXMLImport& rImport); virtual ~ScXMLCellImportPropertyMapper(); /** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_IMPORT flag set */ @@ -132,7 +133,8 @@ protected: public: ScXMLRowImportPropertyMapper( - const UniReference< XMLPropertySetMapper >& rMapper ); + const UniReference< XMLPropertySetMapper >& rMapper, + SvXMLImport& rImport); virtual ~ScXMLRowImportPropertyMapper(); /** This method is called when all attributes have been processed. It may be used to remove items that are incomplete */ |