INTEGRATION: CWS aw017 (1.2.22); FILE MERGED

2004/07/29 14:21:53 aw 1.2.22.1: #i25616#

xmloff/source/transform/PropertyActionsOASIS.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: PropertyActionsOASIS.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: hr $ $Date: 2004-08-02 17:19:43 $
+ *  last change: $Author: hr $ $Date: 2004-08-03 13:34:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -182,9 +182,11 @@ XMLTransformerActionInit aGraphicPropertyOASISAttrActionTable[] =
         XML_FAMILY_TYPE_MARKER, 0 },
     { XML_NAMESPACE_DRAW, XML_FILL_GRADIENT_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF,
         XML_FAMILY_TYPE_GRADIENT, 0 },
-    { XML_NAMESPACE_DRAW, XML_OPACITY, XML_ATACTION_RENAME_NEG_PERCENT,
-                XMLTransformerActionInit::QNameParam( XML_NAMESPACE_DRAW,
-                                                 XML_TRANSPARENCY), 0 },
+
+    // #i25616#
+    { XML_NAMESPACE_DRAW, XML_OPACITY, XML_OPTACTION_OPACITY, NO_PARAMS },
+    { XML_NAMESPACE_DRAW, XML_IMAGE_OPACITY, XML_OPTACTION_IMAGE_OPACITY, NO_PARAMS },
+
     { XML_NAMESPACE_DRAW, XML_STROKE_LINEJOIN, XML_ATACTION_RENAME,
         XMLTransformerActionInit::QNameParam( XML_NAMESPACE_SVG,
                                                  XML_STROKE_LINEJOIN), 0 },

xmloff/source/transform/PropertyActionsOASIS.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: PropertyActionsOASIS.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2004-07-13 08:57:43 $
+ *  last change: $Author: hr $ $Date: 2004-08-03 13:34:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,6 +86,11 @@ enum XMLPropOASISTransformerAction
     XML_OPTACTION_INTERPOLATION,
     XML_OPTACTION_INTERVAL_MAJOR,
     XML_OPTACTION_INTERVAL_MINOR_DIVISOR,
+
+    // #i25616#
+    XML_OPTACTION_OPACITY,
+    XML_OPTACTION_IMAGE_OPACITY,
+
     XML_OPTACTION_END=XML_ATACTION_END
 };