diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 11:24:27 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 11:24:27 +0000 |
| commit | 9e7c283f080231f05f0f0355a3b5aeba98d456de (patch) | |
| tree | 97e3b936b2618b7460db352e0831e77ea3447c6b /xmloff | |
| parent | f3b56aee3ce2b484fb0305288b824e40508817bf (diff) | |
INTEGRATION: CWS oasisbf1 (1.4.2); FILE MERGED
2004/11/08 17:42:11 mib 1.4.2.6: RESYNC: (1.5-1.6); FILE MERGED
2004/11/02 15:55:36 sab 1.4.2.5: #i36485#; remove repeat-content attribute
2004/10/18 13:37:35 fs 1.4.2.4: #i30706# +XML_OPTACTION_CONTROL_TEXT_ALIGN
2004/09/10 09:38:35 mib 1.4.2.3: #i32793#: hatch-name
2004/09/02 08:22:21 mib 1.4.2.2: RESYNC: (1.4-1.5); FILE MERGED
2004/08/18 08:27:12 mib 1.4.2.1: #i32796#: font art properties were missing
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/transform/PropertyActionsOASIS.cxx | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/xmloff/source/transform/PropertyActionsOASIS.cxx b/xmloff/source/transform/PropertyActionsOASIS.cxx index b1621512d0d7..c0e1a02b30ff 100644 --- a/xmloff/source/transform/PropertyActionsOASIS.cxx +++ b/xmloff/source/transform/PropertyActionsOASIS.cxx @@ -2,9 +2,9 @@ * * $RCSfile: PropertyActionsOASIS.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2004-11-03 16:43:14 $ + * last change: $Author: hr $ $Date: 2004-11-09 12:24:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -201,6 +201,13 @@ XMLTransformerActionInit aGraphicPropertyOASISAttrActionTable[] = XML_FAMILY_TYPE_HATCH, 0 }, { XML_NAMESPACE_DRAW, XML_FILL_IMAGE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, XML_FAMILY_TYPE_FILL_IMAGE, 0 }, + + // Font work properties + { XML_NAMESPACE_DRAW, XML_FONTWORK_DISTANCE, XML_ATACTION_IN2INCH, NO_PARAMS }, + { XML_NAMESPACE_DRAW, XML_FONTWORK_START, XML_ATACTION_IN2INCH, NO_PARAMS }, + { XML_NAMESPACE_DRAW, XML_FONTWORK_SHADOW_OFFSET_X, XML_ATACTION_IN2INCH, NO_PARAMS }, + { XML_NAMESPACE_DRAW, XML_FONTWORK_SHADOW_OFFSET_Y, XML_ATACTION_IN2INCH, NO_PARAMS }, + { XML_NAMESPACE_DRAW, XML_AUTO_GROW_WIDTH, XML_ATACTION_RENAME, XMLTransformerActionInit::QNameParam( XML_NAMESPACE_DRAW, XML_AUTO_GROW_HEIGHT ), 0 }, @@ -215,8 +222,7 @@ XMLTransformerActionInit aDrawingPagePropertyOASISAttrActionTable[] = // style-graphic-fill-properties-attlist { XML_NAMESPACE_DRAW, XML_FILL_GRADIENT_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, NO_PARAMS }, - { XML_NAMESPACE_DRAW, XML_FILL_HATCH_NAME, XML_ATACTION_DECODE_STYLE_NAME, NO_PARAMS }, /* generated entry */ - { XML_NAMESPACE_DRAW, XML_FILL_HATCH_SOLID, XML_ATACTION_DECODE_STYLE_NAME, NO_PARAMS }, /* generated entry */ + { XML_NAMESPACE_DRAW, XML_FILL_HATCH_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, NO_PARAMS }, /* generated entry */ { XML_NAMESPACE_DRAW, XML_FILL_IMAGE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, NO_PARAMS }, { XML_NAMESPACE_DRAW, XML_FILL_IMAGE_WIDTH, XML_ATACTION_IN2INCH, NO_PARAMS }, /* generated entry */ @@ -378,6 +384,8 @@ XMLTransformerActionInit aTextPropertyOASISAttrActionTable[] = XMLTransformerActionInit aParagraphPropertyOASISAttrActionTable[] = { + { XML_NAMESPACE_FO, XML_TEXT_ALIGN, XML_OPTACTION_CONTROL_TEXT_ALIGN, + NO_PARAMS }, { XML_NAMESPACE_FO, XML_LINE_HEIGHT, XML_ATACTION_IN2INCH, NO_PARAMS }, /* generated entry */ { XML_NAMESPACE_STYLE, XML_LINE_HEIGHT_AT_LEAST, XML_ATACTION_IN2INCH, @@ -513,6 +521,8 @@ XMLTransformerActionInit aTableCellPropertyOASISAttrActionTable[] = XML_DIRECTION), 0 }, { XML_NAMESPACE_STYLE, XML_SHADOW, XML_ATACTION_INS2INCHS, NO_PARAMS }, + { XML_NAMESPACE_STYLE, XML_REPEAT_CONTENT, XML_ATACTION_REMOVE, + NO_PARAMS }, /* new entry*/ { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS } }; |