diff options
| author | Christian Lippka <cl@openoffice.org> | 2001-01-17 15:23:54 +0000 |
|---|---|---|
| committer | Christian Lippka <cl@openoffice.org> | 2001-01-17 15:23:54 +0000 |
| commit | 1c8dcb30c84e5ff5efdf542e999a36156bd4d257 (patch) | |
| tree | 0ddeb31867c10e39b7ccb185e933691fb756f427 /xmloff | |
| parent | 6906af87d79e2863e05811337540cfe7a4c8cd0c (diff) | |
renamed fo:height to fo:font-size
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/style/xmlnume.cxx | 6 | ||||
| -rw-r--r-- | xmloff/source/style/xmlnumi.cxx | 19 |
2 files changed, 15 insertions, 10 deletions
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx index 20c70d3442e5..127a55975312 100644 --- a/xmloff/source/style/xmlnume.cxx +++ b/xmloff/source/style/xmlnume.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlnume.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: cl $ $Date: 2001-01-16 22:10:35 $ + * last change: $Author: cl $ $Date: 2001-01-17 16:23:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -583,7 +583,7 @@ void SvxXMLNumRuleExport::exportLevelStyle( INT32 nLevel, if( nBullRelSize ) { GetExport().GetMM100UnitConverter().convertPercent( sTmp, nBullRelSize ); - GetExport().AddAttribute( XML_NAMESPACE_FO, sXML_height, + GetExport().AddAttribute( XML_NAMESPACE_FO, sXML_font_size, sTmp.makeStringAndClear() ); } } diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index 89c85322d356..3be77355c4a2 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlnumi.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: cl $ $Date: 2001-01-16 22:10:35 $ + * last change: $Author: cl $ $Date: 2001-01-17 16:23:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -592,7 +592,8 @@ enum SvxXMLStyleAttributesAttrTokens XML_TOK_STYLE_ATTRIBUTES_ATTR_VERTICAL_REL, XML_TOK_STYLE_ATTRIBUTES_ATTR_WIDTH, XML_TOK_STYLE_ATTRIBUTES_ATTR_HEIGHT, - XML_TOK_TEXT_LEVEL_ATTR_BULLET_COLOR, + XML_TOK_STYLE_ATTRIBUTES_ATTR_COLOR, + XML_TOK_STYLE_ATTRIBUTES_ATTR_FONT_SIZE, XML_TOK_STYLE_ATTRIBUTES_ATTR_END=XML_TOK_UNKNOWN }; @@ -628,7 +629,9 @@ static __FAR_DATA SvXMLTokenMapEntry aStyleAttributesAttrTokenMap[] = { XML_NAMESPACE_FO, sXML_height, XML_TOK_STYLE_ATTRIBUTES_ATTR_HEIGHT }, { XML_NAMESPACE_FO, sXML_color, - XML_TOK_TEXT_LEVEL_ATTR_BULLET_COLOR }, + XML_TOK_STYLE_ATTRIBUTES_ATTR_COLOR }, + { XML_NAMESPACE_FO, sXML_font_size, + XML_TOK_STYLE_ATTRIBUTES_ATTR_FONT_SIZE }, XML_TOKEN_MAP_END }; @@ -714,16 +717,18 @@ SvxXMLListLevelStyleAttrContext_Impl::SvxXMLListLevelStyleAttrContext_Impl( case XML_TOK_STYLE_ATTRIBUTES_ATTR_HEIGHT: if( aUnitConv.convertMeasure( nVal, rValue, 0, LONG_MAX ) ) rListLevel.SetImageHeight( nVal ); - if(SvXMLUnitConverter::convertPercent( nVal, rValue ) ) - rListLevel.SetRelSize( (sal_Int16)nVal ); break; - case XML_TOK_TEXT_LEVEL_ATTR_BULLET_COLOR: + case XML_TOK_STYLE_ATTRIBUTES_ATTR_COLOR: { Color aColor; if( SvXMLUnitConverter::convertColor( aColor, rValue ) ) rListLevel.SetColor( (sal_Int32)aColor.GetColor() ); } break; + case XML_TOK_STYLE_ATTRIBUTES_ATTR_FONT_SIZE: + if(SvXMLUnitConverter::convertPercent( nVal, rValue ) ) + rListLevel.SetRelSize( (sal_Int16)nVal ); + break; } } |