diff options
-rw-r--r-- | xmloff/source/style/xmlnume.cxx | 17 | ||||
-rw-r--r-- | xmloff/source/style/xmlnumi.cxx | 13 |
2 files changed, 23 insertions, 7 deletions
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx index 96c961b9d030..a401d8d940c6 100644 --- a/xmloff/source/style/xmlnume.cxx +++ b/xmloff/source/style/xmlnume.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlnume.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: cl $ $Date: 2001-10-17 13:26:13 $ + * last change: $Author: cl $ $Date: 2002-03-01 14:11:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -576,9 +576,16 @@ void SvxXMLNumRuleExport::exportLevelStyle( INT32 nLevel, if( bHasColor ) { const Color aColor( nColor ); - SvXMLUnitConverter::convertColor( sBuffer, aColor ); - GetExport().AddAttribute( XML_NAMESPACE_FO, XML_COLOR, - sBuffer.makeStringAndClear() ); + if( aColor.GetColor() == 0xffffffff ) + { + GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_USE_WINDOW_FONT_COLOR, XML_TRUE ); + } + else + { + SvXMLUnitConverter::convertColor( sBuffer, aColor ); + GetExport().AddAttribute( XML_NAMESPACE_FO, XML_COLOR, + sBuffer.makeStringAndClear() ); + } } // fo:height="...%" diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index cd748fb100d5..a97b757d18a2 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlnumi.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: cl $ $Date: 2001-08-23 13:03:43 $ + * last change: $Author: cl $ $Date: 2002-03-01 14:11:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -662,6 +662,7 @@ enum SvxXMLStyleAttributesAttrTokens XML_TOK_STYLE_ATTRIBUTES_ATTR_WIDTH, XML_TOK_STYLE_ATTRIBUTES_ATTR_HEIGHT, XML_TOK_STYLE_ATTRIBUTES_ATTR_COLOR, + XML_TOK_STYLE_ATTRIBUTES_ATTR_WINDOW_FONT_COLOR, XML_TOK_STYLE_ATTRIBUTES_ATTR_FONT_SIZE, XML_TOK_STYLE_ATTRIBUTES_ATTR_END=XML_TOK_UNKNOWN @@ -699,6 +700,8 @@ static __FAR_DATA SvXMLTokenMapEntry aStyleAttributesAttrTokenMap[] = XML_TOK_STYLE_ATTRIBUTES_ATTR_HEIGHT }, { XML_NAMESPACE_FO, XML_COLOR, XML_TOK_STYLE_ATTRIBUTES_ATTR_COLOR }, + { XML_NAMESPACE_STYLE, XML_USE_WINDOW_FONT_COLOR, + XML_TOK_STYLE_ATTRIBUTES_ATTR_WINDOW_FONT_COLOR }, { XML_NAMESPACE_FO, XML_FONT_SIZE, XML_TOK_STYLE_ATTRIBUTES_ATTR_FONT_SIZE }, @@ -794,6 +797,12 @@ SvxXMLListLevelStyleAttrContext_Impl::SvxXMLListLevelStyleAttrContext_Impl( rListLevel.SetColor( (sal_Int32)aColor.GetColor() ); } break; + case XML_TOK_STYLE_ATTRIBUTES_ATTR_WINDOW_FONT_COLOR: + { + if( IsXMLToken( rValue, XML_TRUE ) ) + rListLevel.SetColor( (sal_Int32)0xffffffff ); + } + break; case XML_TOK_STYLE_ATTRIBUTES_ATTR_FONT_SIZE: if(SvXMLUnitConverter::convertPercent( nVal, rValue ) ) rListLevel.SetRelSize( (sal_Int16)nVal ); |