diff options
| author | Michael Brauer <mib@openoffice.org> | 2000-10-24 06:41:59 +0000 |
|---|---|---|
| committer | Michael Brauer <mib@openoffice.org> | 2000-10-24 06:41:59 +0000 |
| commit | 22f613b3ed1e85199abfaf58247268ac48ae4756 (patch) | |
| tree | 463c48100af0879dcc3cc40c958f6931ce8ffe19 /xmloff/source/text/txtprmap.cxx | |
| parent | 549d16549e2062314de3c41b4f61d4ab029b1429 (diff) | |
stylefont-height-rel
Diffstat (limited to 'xmloff/source/text/txtprmap.cxx')
| -rw-r--r-- | xmloff/source/text/txtprmap.cxx | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx index 924ed935b80a..3bc05e67e8f7 100644 --- a/xmloff/source/text/txtprmap.cxx +++ b/xmloff/source/text/txtprmap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtprmap.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: mib $ $Date: 2000-10-23 12:06:21 $ + * last change: $Author: mib $ $Date: 2000-10-24 07:41:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -123,6 +123,7 @@ XMLPropertyMapEntry aXMLParaPropMap[] = // RES_CHRATR_FONTSIZE M_E( "CharHeight", FO, font_size, XML_TYPE_CHAR_HEIGHT|MID_FLAG_MULTI_PROPERTY, CTF_CHARHEIGHT ), M_E( "CharPropFontHeight",FO, font_size, XML_TYPE_CHAR_HEIGHT_PROP|MID_FLAG_MULTI_PROPERTY, CTF_CHARHEIGHT_REL ), + M_E( "CharDiffFontHeight",STYLE,font_size_rel, XML_TYPE_CHAR_HEIGHT_DIFF, CTF_CHARHEIGHT_DIFF ), // RES_CHRATR_KERNING M_E( "CharKerning", FO, letter_spacing, XML_TYPE_TEXT_KERNING, 0 ), // RES_CHRATR_LANGUAGE @@ -322,6 +323,7 @@ XMLPropertyMapEntry aXMLTextPropMap[] = // RES_CHRATR_FONTSIZE M_E( "CharHeight", FO, font_size, XML_TYPE_CHAR_HEIGHT|MID_FLAG_MULTI_PROPERTY, CTF_CHARHEIGHT ), M_E( "CharPropFontHeight",FO, font_size, XML_TYPE_CHAR_HEIGHT_PROP|MID_FLAG_MULTI_PROPERTY, CTF_CHARHEIGHT_REL ), + M_E( "CharDiffFontHeight",STYLE,font_size_rel, XML_TYPE_CHAR_HEIGHT_DIFF, CTF_CHARHEIGHT_DIFF ), // RES_CHRATR_KERNING M_E( "CharKerning", FO, letter_spacing, XML_TYPE_TEXT_KERNING, 0 ), // RES_CHRATR_LANGUAGE @@ -511,6 +513,7 @@ void XMLTextPropertySetMapper::ContextFilter( // filter char height point/percent XMLPropertyState* pCharHeightState = NULL; XMLPropertyState* pCharPropHeightState = NULL; + XMLPropertyState* pCharDiffHeightState = NULL; // filter left margin measure/percent XMLPropertyState* pParaLeftMarginState = NULL; @@ -599,6 +602,7 @@ void XMLTextPropertySetMapper::ContextFilter( { case CTF_CHARHEIGHT: pCharHeightState = propertie; break; case CTF_CHARHEIGHT_REL: pCharPropHeightState = propertie; break; + case CTF_CHARHEIGHT_DIFF: pCharDiffHeightState = propertie; break; case CTF_PARALEFTMARGIN: pParaLeftMarginState = propertie; break; case CTF_PARALEFTMARGIN_REL: pParaLeftMarginRelState = propertie; break; case CTF_PARARIGHTMARGIN: pParaRightMarginState = propertie; break; @@ -669,6 +673,21 @@ void XMLTextPropertySetMapper::ContextFilter( pCharHeightState->maValue.clear(); } } + if( pCharHeightState && pCharDiffHeightState ) + { + float nTemp; + pCharDiffHeightState->maValue >>= nTemp; + if( nTemp == 0. ) + { + pCharDiffHeightState->mnIndex = -1; + pCharDiffHeightState->maValue.clear(); + } + else + { + pCharHeightState->mnIndex = -1; + pCharHeightState->maValue.clear(); + } + } if( pParaLeftMarginState && pParaLeftMarginRelState ) { |