diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 11:16:22 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 11:16:22 +0000 |
| commit | ef1a7d71639cc684cb7ca066e414b8b862a824aa (patch) | |
| tree | f601ab52c8938907ae5e25f357fa2b1cf6fb8959 /xmloff/source | |
| parent | 85cf96c31a71098606ab320ff811e50d1b6f70d2 (diff) | |
INTEGRATION: CWS oasisbf1 (1.20.38); FILE MERGED
2004/10/15 13:57:23 fs 1.20.38.1: #i30706# text-align is in namespace fo, not style
Diffstat (limited to 'xmloff/source')
| -rw-r--r-- | xmloff/source/forms/controlpropertymap.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xmloff/source/forms/controlpropertymap.cxx b/xmloff/source/forms/controlpropertymap.cxx index 50c8d443c4a7..7189f0cc2df7 100644 --- a/xmloff/source/forms/controlpropertymap.cxx +++ b/xmloff/source/forms/controlpropertymap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: controlpropertymap.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: rt $ $Date: 2004-07-13 08:11:28 $ + * last change: $Author: hr $ $Date: 2004-11-09 12:16:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -97,6 +97,7 @@ namespace xmloff #define MAP_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context } #define MAP_CONST( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TEXT, context } +#define MAP_CONST_P( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_PARAGRAPH, context } #define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0 } XMLPropertyMapEntry* getControlStylePropertyMap_Access( ) @@ -104,7 +105,7 @@ namespace xmloff static XMLPropertyMapEntry aControlStyleProperties[] = { MAP_CONST( PROPERTY_BACKGROUNDCOLOR, XML_NAMESPACE_FO, XML_BACKGROUND_COLOR, XML_TYPE_COLOR, 0 ), - MAP_CONST( PROPERTY_ALIGN, XML_NAMESPACE_STYLE, XML_TEXT_ALIGN, XML_TYPE_TEXT_ALIGN, 0 ), + MAP_CONST_P( PROPERTY_ALIGN, XML_NAMESPACE_FO, XML_TEXT_ALIGN, XML_TYPE_TEXT_ALIGN, 0 ), MAP_CONST( PROPERTY_BORDER, XML_NAMESPACE_FO, XML_BORDER, XML_TYPE_CONTROL_BORDER|MID_FLAG_MULTI_PROPERTY|MID_FLAG_MERGE_ATTRIBUTE, 0 ), MAP_ASCII( "FontCharWidth", XML_NAMESPACE_STYLE, XML_FONT_CHAR_WIDTH, XML_TYPE_NUMBER16, 0 ), MAP_ASCII( "FontCharset", XML_NAMESPACE_STYLE, XML_FONT_CHARSET, XML_TYPE_TEXT_FONTENCODING, 0 ), |