INTEGRATION: CWS oasisbf1 (1.4.2); FILE MERGED

2004/11/08 17:41:55 mib 1.4.2.9: RESYNC: (1.5-1.6); FILE MERGED
2004/10/18 13:37:09 fs 1.4.2.8: #i30706# control's text alignment must be translated
2004/10/14 12:21:29 cl 1.4.2.7: #i34452# #i34449# added missing d3d and draw:mirror attributes
2004/09/11 16:44:52 sab 1.4.2.6: #i33804#; duplicate text_align property
2004/09/10 09:38:35 mib 1.4.2.5: #i32793#: hatch-name
2004/09/02 08:22:38 mib 1.4.2.4: RESYNC: (1.4-1.5); FILE MERGED
2004/08/18 14:17:37 mib 1.4.2.3: i32904#: hidden text
2004/08/18 08:27:12 mib 1.4.2.2: #i32796#: font art properties were missing
2004/08/12 13:57:08 mib 1.4.2.1: #i32795#: text:ansimation-steps was missing

1 files changed, 46 insertions, 18 deletions

diff --git a/xmloff/source/transform/PropertyActionsOOo.cxx b/xmloff/source/transform/PropertyActionsOOo.cxx
index 83e2f539f10e..a23a8b29b658 100644
--- a/xmloff/source/transform/PropertyActionsOOo.cxx
+++ b/xmloff/source/transform/PropertyActionsOOo.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: PropertyActionsOOo.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: rt $ $Date: 2004-11-03 16:43:32 $
+ *  last change: $Author: hr $ $Date: 2004-11-09 12:24:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -107,6 +107,8 @@ XMLTransformerActionInit aGraphicPropertyOOoAttrActionTable[] =
           NO_PARAMS }, /* generated entry */
     { XML_NAMESPACE_TEXT, XML_ANIMATION_DELAY, XML_ATACTION_COPY,
           NO_PARAMS }, /* generated entry */
+    { XML_NAMESPACE_TEXT, XML_ANIMATION_STEPS, XML_ATACTION_COPY,
+          NO_PARAMS }, /* TODO: missing in OASIS spec */
     { XML_NAMESPACE_DRAW, XML_AUTO_GROW_WIDTH, XML_ATACTION_RENAME,
         XMLTransformerActionInit::QNameParam( XML_NAMESPACE_DRAW,
                                                  XML_AUTO_GROW_HEIGHT   ), 0 },
@@ -215,16 +217,18 @@ XMLTransformerActionInit aGraphicPropertyOOoAttrActionTable[] =
           NO_PARAMS }, /* generated entry */
     { XML_NAMESPACE_DR3D, XML_NORMALS_DIRECTION, XML_ATACTION_COPY,
           NO_PARAMS }, /* generated entry */
-//  { XML_NAMESPACE_DR3D, XML_TEXTURE_GENERATION_MODE_X, XML_ATACTION_COPY,
-//      NO_PARAMS }, /* TODO: does not exist! */
-//  { XML_NAMESPACE_DR3D, XML_TEXTURE_GENERATION_MODE_Y, XML_ATACTION_COPY,
-//      NO_PARAMS }, /* TODO: does not exist! */
-//  { XML_NAMESPACE_DR3D, XML_TEXTURE_KIND, XML_ATACTION_COPY,
-//      NO_PARAMS }, /* TODO: does not exist! */
-//  { XML_NAMESPACE_DR3D, XML_TEXTURE_FILTER, XML_ATACTION_COPY,
-//      NO_PARAMS }, /* TODO: does not exist! */
-//  { XML_NAMESPACE_DR3D, XML_TEXTURE_MODE, XML_ATACTION_COPY,
-//      NO_PARAMS }, /* TODO: does not exist! */
+    { XML_NAMESPACE_DR3D, XML_TEX_GENERATION_MODE_X, XML_ATACTION_COPY,
+          NO_PARAMS },
+    { XML_NAMESPACE_DR3D, XML_TEX_GENERATION_MODE_Y, XML_ATACTION_COPY,
+          NO_PARAMS },
+    { XML_NAMESPACE_DR3D, XML_END_ANGLE, XML_ATACTION_COPY,
+        NO_PARAMS },
+    { XML_NAMESPACE_DR3D, XML_TEX_KIND, XML_ATACTION_COPY,
+          NO_PARAMS },
+    { XML_NAMESPACE_DR3D, XML_TEX_FILTER, XML_ATACTION_COPY,
+          NO_PARAMS },
+    { XML_NAMESPACE_DR3D, XML_TEX_MODE, XML_ATACTION_COPY,
+          NO_PARAMS },
     { XML_NAMESPACE_DR3D, XML_AMBIENT_COLOR, XML_ATACTION_COPY,
           NO_PARAMS }, /* generated entry */
     { XML_NAMESPACE_DR3D, XML_EMISSIVE_COLOR, XML_ATACTION_COPY,
@@ -367,7 +371,7 @@ XMLTransformerActionInit aGraphicPropertyOOoAttrActionTable[] =
     { XML_NAMESPACE_DRAW, XML_FILL_GRADIENT_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF,
         NO_PARAMS  },
     { XML_NAMESPACE_DRAW, XML_GRADIENT_STEP_COUNT, XML_ATACTION_COPY, NO_PARAMS }, /* generated entry */
-    { XML_NAMESPACE_DRAW, XML_FILL_HATCH_NAME, XML_ATACTION_ENCODE_STYLE_NAME, NO_PARAMS }, /* generated entry */
+    { XML_NAMESPACE_DRAW, XML_FILL_HATCH_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF, NO_PARAMS }, /* generated entry */
     { XML_NAMESPACE_DRAW, XML_FILL_HATCH_SOLID, XML_ATACTION_COPY, NO_PARAMS }, /* generated entry */
     { XML_NAMESPACE_DRAW, XML_FILL_IMAGE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF,
         NO_PARAMS  },
@@ -390,6 +394,28 @@ XMLTransformerActionInit aGraphicPropertyOOoAttrActionTable[] =
     { XML_NAMESPACE_DRAW, XML_MOVE_PROTECT, XML_ATACTION_COPY, NO_PARAMS },
     { XML_NAMESPACE_DRAW, XML_SIZE_PROTECT, XML_ATACTION_COPY, NO_PARAMS },
     { XML_NAMESPACE_DRAW, XML_FIT_TO_CONTOUR, XML_ATACTION_COPY, NO_PARAMS },
+
+
+    // Font work properties
+    { XML_NAMESPACE_DRAW, XML_FONTWORK_STYLE, XML_ATACTION_COPY, NO_PARAMS },
+    { XML_NAMESPACE_DRAW, XML_FONTWORK_ADJUST, XML_ATACTION_COPY, NO_PARAMS },
+    { XML_NAMESPACE_DRAW, XML_FONTWORK_DISTANCE, XML_ATACTION_INCH2IN, NO_PARAMS },
+    { XML_NAMESPACE_DRAW, XML_FONTWORK_START, XML_ATACTION_INCH2IN, NO_PARAMS },
+    { XML_NAMESPACE_DRAW, XML_FONTWORK_MIRROR, XML_ATACTION_COPY, NO_PARAMS },
+    { XML_NAMESPACE_DRAW, XML_FONTWORK_OUTLINE, XML_ATACTION_COPY, NO_PARAMS },
+    { XML_NAMESPACE_DRAW, XML_FONTWORK_SHADOW, XML_ATACTION_COPY, NO_PARAMS },
+    { XML_NAMESPACE_DRAW, XML_FONTWORK_SHADOW_COLOR, XML_ATACTION_COPY, NO_PARAMS },
+    { XML_NAMESPACE_DRAW, XML_FONTWORK_SHADOW_OFFSET_X, XML_ATACTION_INCH2IN, NO_PARAMS },
+    { XML_NAMESPACE_DRAW, XML_FONTWORK_SHADOW_OFFSET_Y, XML_ATACTION_INCH2IN, NO_PARAMS },
+    { XML_NAMESPACE_DRAW, XML_FONTWORK_FORM, XML_ATACTION_COPY, NO_PARAMS },
+    { XML_NAMESPACE_DRAW, XML_FONTWORK_HIDE_FORM, XML_ATACTION_COPY, NO_PARAMS },
+    { XML_NAMESPACE_DRAW, XML_FONTWORK_SHADOW_TRANSPARENCE, XML_ATACTION_COPY, NO_PARAMS },
+
+    { XML_NAMESPACE_DRAW, XML_WRAP_INFLUENCE_ON_POSITION, XML_ATACTION_COPY, NO_PARAMS }, // new in OOo 2.0
+
+    { XML_NAMESPACE_DRAW, XML_MIRROR, XML_ATACTION_COPY,
+          NO_PARAMS }, /* generated entry */
+
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
@@ -406,8 +432,8 @@ XMLTransformerActionInit aDrawingPagePropertyOOoAttrActionTable[] =
     // style-graphic-fill-properties-attlist
     { XML_NAMESPACE_DRAW, XML_FILL_GRADIENT_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF,
         NO_PARAMS  },
-    { XML_NAMESPACE_DRAW, XML_FILL_HATCH_NAME, XML_ATACTION_ENCODE_STYLE_NAME, NO_PARAMS }, /* generated entry */
-    { XML_NAMESPACE_DRAW, XML_FILL_HATCH_SOLID, XML_ATACTION_ENCODE_STYLE_NAME, NO_PARAMS }, /* generated entry */
+    { XML_NAMESPACE_DRAW, XML_FILL_HATCH_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF, NO_PARAMS }, /* generated entry */
+    { XML_NAMESPACE_DRAW, XML_FILL_HATCH_SOLID, XML_ATACTION_COPY, NO_PARAMS }, /* generated entry */
     { XML_NAMESPACE_DRAW, XML_FILL_IMAGE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF,
         NO_PARAMS  },
     { XML_NAMESPACE_DRAW, XML_FILL_IMAGE_WIDTH, XML_ATACTION_INCH2IN, NO_PARAMS }, /* generated entry */
@@ -642,6 +668,8 @@ XMLTransformerActionInit aTextPropertyOOoAttrActionTable[] =
           NO_PARAMS }, /* generated entry */
     { XML_NAMESPACE_STYLE, XML_TEXT_ROTATION_SCALE, XML_ATACTION_COPY,
           NO_PARAMS }, /* generated entry */
+    { XML_NAMESPACE_TEXT, XML_DISPLAY, XML_ATACTION_COPY,
+          NO_PARAMS }, /* new in OOo 2.0 */
     { XML_NAMESPACE_FO, XML_HYPHENATE, XML_ATACTION_COPY,
           NO_PARAMS }, /* generated entry */
     { XML_NAMESPACE_FO, XML_HYPHENATION_REMAIN_CHAR_COUNT, XML_ATACTION_COPY,
@@ -671,6 +699,8 @@ XMLTransformerActionInit aParagraphPropertyOOoAttrActionTable[] =
           NO_PARAMS }, /* generated entry */
     { XML_NAMESPACE_FO, XML_TEXT_ALIGN_LAST, XML_ATACTION_COPY,
           NO_PARAMS }, /* generated entry */
+    { XML_NAMESPACE_STYLE, XML_TEXT_ALIGN, XML_ATACTION_RENAME,
+          XMLTransformerActionInit::QNameParam( XML_NAMESPACE_FO, XML_TEXT_ALIGN ), 0 },
     { XML_NAMESPACE_STYLE, XML_JUSTIFY_SINGLE_WORD, XML_ATACTION_COPY,
           NO_PARAMS }, /* generated entry */
     { XML_NAMESPACE_STYLE, XML_BREAK_INSIDE, XML_ATACTION_COPY,
@@ -824,7 +854,7 @@ XMLTransformerActionInit aTableCellPropertyOOoAttrActionTable[] =
     { XML_NAMESPACE_FO, XML_VERTICAL_ALIGN, XML_ATACTION_RENAME,
         XMLTransformerActionInit::QNameParam( XML_NAMESPACE_STYLE,
                                                  XML_VERTICAL_ALIGN ), 0 },
-    { XML_NAMESPACE_FO, XML_TEXT_ALIGN, XML_ATACTION_COPY,
+    { XML_NAMESPACE_FO, XML_TEXT_ALIGN, XML_ATACTION_COPY_DUPLICATE,
           XML_PROP_TYPE_PARAGRAPH, 0, 0 }, /* generated entry */
     { XML_NAMESPACE_STYLE, XML_TEXT_ALIGN_SOURCE, XML_ATACTION_COPY,
           NO_PARAMS }, /* generated entry */
@@ -889,8 +919,6 @@ XMLTransformerActionInit aTableCellPropertyOOoAttrActionTable[] =
           NO_PARAMS }, /* generated entry */
     { XML_NAMESPACE_STYLE, XML_DECIMAL_PLACES, XML_ATACTION_COPY,
           NO_PARAMS }, /* generated entry */
-    { XML_NAMESPACE_FO, XML_MARGIN_LEFT, XML_ATACTION_INCH2IN,
-          NO_PARAMS }, /* generated entry */
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };