INTEGRATION: CWS presentationengine01 (1.52.14); FILE MERGED

2004/11/22 23:09:10 thb 1.52.14.15: #i10000# Resolving merge problems: XMLImpressImport* no longer in the master version, removed
2004/11/17 19:08:04 thb 1.52.14.14: RESYNC: (1.69-1.73); FILE MERGED
2004/10/13 17:58:38 thb 1.52.14.13: #i10000# Removed merge artifact (introduced duplicate declaration of XML_DIAMOND token)
2004/10/12 22:21:41 thb 1.52.14.12: RESYNC: (1.68-1.69); FILE MERGED
2004/10/04 19:13:46 thb 1.52.14.11: #i34946# Added missing subtypes for slide transitions
2004/09/23 15:56:09 cl 1.52.14.10: final smil xml spec changes
2004/09/22 16:43:25 cl 1.52.14.9: smil spec update
2004/08/31 18:46:20 cl 1.52.14.8: added missing transition types and subtypes
2004/08/23 08:39:19 cl 1.52.14.7: resolved merge conflicts
2004/07/28 10:39:55 cl 1.52.14.6: fixes
2004/07/27 20:24:01 cl 1.52.14.5: fixes
2004/07/23 12:16:17 thb 1.52.14.4: RESYNC: (1.58-1.62); FILE MERGED
2004/07/06 12:52:19 thb 1.52.14.3: RESYNC: (1.52-1.58); FILE MERGED
2004/06/18 14:43:29 cl 1.52.14.2: initial after effect support
2004/04/16 12:43:42 cl 1.52.14.1: smil support for impress

1 files changed, 261 insertions, 2 deletions

diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 1da4eba37442..3f5aeb592ec0 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -2,9 +2,9 @@
 *
 *  $RCSfile: xmltoken.cxx,v $
 *
-*  $Revision: 1.80 $
+*  $Revision: 1.81 $
 *
-*  last change: $Author: rt $ $Date: 2004-11-26 14:09:14 $
+*  last change: $Author: rt $ $Date: 2004-11-26 19:30:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2600,6 +2600,265 @@ namespace xmloff { namespace token {
         TOKEN( "anyURI",                           XML_ANYURI ),
         TOKEN( "dateTime",                         XML_DATETIME_XSD ),
 
+        TOKEN( "remove",                        XML_REMOVE ),
+        TOKEN( "hold",                      XML_HOLD ),
+        TOKEN( "transition",                    XML_TRANSITION ),
+        TOKEN( "inherit",                       XML_INHERIT ),
+        TOKEN( "fillDefault",                   XML_FILLDEFAULT ),
+        TOKEN( "restart",                       XML_RESTART ),
+        TOKEN( "restartDefault",                XML_RESTARTDEFAULT ),
+        TOKEN( "whenNotActive",             XML_WHENNOTACTIVE ),
+        TOKEN( "never",                     XML_NEVER ),
+        TOKEN( "accelerate",                    XML_ACCELERATE ),
+        TOKEN( "decelerate",                    XML_DECELERATE ),
+        TOKEN( "autoReverse",                   XML_AUTOREVERSE ),
+        TOKEN( "indefinite",                    XML_INDEFINITE ),
+        TOKEN( "repeatCount",                   XML_REPEATCOUNT ),
+        TOKEN( "repeatDur",                 XML_REPEATDUR ),
+        TOKEN( "endsync",                       XML_ENDSYNC ),
+        TOKEN( "first",                     XML_FIRST ),
+        TOKEN( "last",                      XML_LAST ),
+        TOKEN( "media",                     XML_MEDIA ),
+        TOKEN( "dur",                           XML_DUR ),
+        TOKEN( "begin",                     XML_BEGIN ),
+        TOKEN( "whole",                     XML_WHOLE ),
+        TOKEN( "from",                      XML_FROM ),
+        TOKEN( "to",                            XML_TO ),
+        TOKEN( "by",                            XML_BY ),
+        TOKEN( "values",                        XML_VALUES ),
+        TOKEN( "keyTimes",                  XML_KEYTIMES ),
+        TOKEN( "keySplines",                    XML_KEYSPLINES ),
+        TOKEN( "calcMode",                  XML_CALCMODE ),
+        TOKEN( "discrete",                  XML_DISCRETE ),
+        TOKEN( "paced",                     XML_PACED ),
+        TOKEN( "spline",                        XML_SPLINE ),
+        TOKEN( "accumulate",                    XML_ACCUMULATE ),
+        TOKEN( "additive",                  XML_ADDITIVE ),
+        TOKEN( "multiply",                  XML_MULTIPLY ),
+        TOKEN( "animate",                       XML_ANIMATE ),
+        TOKEN( "animateMotion",             XML_ANIMATEMOTION ),
+        TOKEN( "animateTransform",          XML_ANIMATETRANSFORM ),
+        TOKEN( "animateColor",              XML_ANIMATECOLOR ),
+        TOKEN( "transitionFilter",          XML_TRANSITIONFILTER ),
+        TOKEN( "attributeName",             XML_ATTRIBUTENAME ),
+
+        TOKEN( "smil",                      XML_NP_SMIL ),
+        TOKEN( "http://www.w3.org/2001/SMIL20", XML_N_SMIL ),
+
+        TOKEN( "anim",                      XML_NP_ANIMATION ),
+        TOKEN( "urn:oasis:names:tc:openoffice:xmlns:animation:1.0",  XML_N_ANIMATION ),
+
+        TOKEN( "par",                           XML_PAR ),
+        TOKEN( "seq",                           XML_SEQ ),
+
+        TOKEN( "translate",                 XML_TRANSLATE ),
+        TOKEN( "skewX",                     XML_SKEWX ),
+        TOKEN( "skewY",                     XML_SKEWY ),
+
+        TOKEN( "audio",                     XML_AUDIO ),
+
+        TOKEN( "color-interpolation",           XML_COLOR_INTERPOLATION ),
+        TOKEN( "color-interpolation-direction", XML_COLOR_INTERPOLATION_DIRECTION ),
+        TOKEN( "hsl",                           XML_HSL ),
+        TOKEN( "rgb",                           XML_RGB ),
+
+        TOKEN( "barWipe",                       XML_BARWIPE ),
+        TOKEN( "boxWipe",                       XML_BOXWIPE ),
+        TOKEN( "fourBoxWipe",                   XML_FOURBOXWIPE ),
+        TOKEN( "barnDoorWipe",              XML_BARNDOORWIPE ),
+        TOKEN( "diagonalWipe",              XML_DIAGONALWIPE ),
+        TOKEN( "bowTieWipe",                    XML_BOWTIEWIPE ),
+        TOKEN( "miscDiagonalWipe",          XML_MISCDIAGONALWIPE ),
+        TOKEN( "veeWipe",                       XML_VEEWIPE ),
+        TOKEN( "barnVeeWipe",                   XML_BARNVEEWIPE ),
+        TOKEN( "zigZagWipe",                    XML_ZIGZAGWIPE ),
+        TOKEN( "barnZigZagWipe",                XML_BARNZIGZAGWIPE ),
+        TOKEN( "irisWipe",                  XML_IRISWIPE ),
+        TOKEN( "triangleWipe",              XML_TRIANGLEWIPE ),
+        TOKEN( "arrowHeadWipe",             XML_ARROWHEADWIPE ),
+        TOKEN( "pentagonWipe",              XML_PENTAGONWIPE ),
+        TOKEN( "hexagonWipe",                   XML_HEXAGONWIPE ),
+        TOKEN( "ellipseWipe",                   XML_ELLIPSEWIPE ),
+        TOKEN( "eyeWipe",                       XML_EYEWIPE ),
+        TOKEN( "roundRectWipe",             XML_ROUNDRECTWIPE ),
+        TOKEN( "starWipe",                  XML_STARWIPE ),
+        TOKEN( "miscShapeWipe",             XML_MISCSHAPEWIPE ),
+        TOKEN( "clockWipe",                 XML_CLOCKWIPE ),
+        TOKEN( "pinWheelWipe",              XML_PINWHEELWIPE ),
+        TOKEN( "singleSweepWipe",               XML_SINGLESWEEPWIPE ),
+        TOKEN( "fanWipe",                       XML_FANWIPE ),
+        TOKEN( "doubleFanWipe",             XML_DOUBLEFANWIPE ),
+        TOKEN( "doubleSweepWipe",               XML_DOUBLESWEEPWIPE ),
+        TOKEN( "saloonDoorWipe",                XML_SALOONDOORWIPE ),
+        TOKEN( "windshieldWipe",                XML_WINDSHIELDWIPE ),
+        TOKEN( "snakeWipe",                 XML_SNAKEWIPE ),
+        TOKEN( "spiralWipe",                    XML_SPIRALWIPE ),
+        TOKEN( "parallelSnakesWipe",            XML_PARALLELSNAKESWIPE ),
+        TOKEN( "boxSnakesWipe",             XML_BOXSNAKESWIPE ),
+        TOKEN( "waterfallWipe",             XML_WATERFALLWIPE ),
+        TOKEN( "pushWipe",                  XML_PUSHWIPE ),
+        TOKEN( "slideWipe",                 XML_SLIDEWIPE ),
+        TOKEN( "blindsWipe",                    XML_BLINDSWIPE ),
+        TOKEN( "randomBarWipe",             XML_RANDOMBARWIPE ),
+        TOKEN( "checkerBoardWipe",          XML_CHECKERBOARDWIPE ),
+        TOKEN( "zoom",                      XML_ZOOM ),
+
+        TOKEN( "leftToRight",                   XML_LEFTTORIGHT ),
+        TOKEN( "topToBottom",                   XML_TOPTOBOTTOM ),
+        TOKEN( "topLeft",                       XML_TOPLEFT ),
+        TOKEN( "topRight",                  XML_TOPRIGHT ),
+        TOKEN( "bottomRight",                   XML_BOTTOMRIGHT ),
+        TOKEN( "bottomLeft",                    XML_BOTTOMLEFT ),
+        TOKEN( "topCenter",                 XML_TOPCENTER ),
+        TOKEN( "rightCenter",                   XML_RIGHTCENTER ),
+        TOKEN( "bottomCenter",              XML_BOTTOMCENTER ),
+        TOKEN( "leftCenter",                    XML_LEFTCENTER ),
+        TOKEN( "cornersIn",                 XML_CORNERSIN ),
+        TOKEN( "cornersOut",                    XML_CORNERSOUT ),
+        TOKEN( "diagonalBottomLeft",            XML_DIAGONALBOTTOMLEFT ),
+        TOKEN( "diagonalTopLeft",               XML_DIAGONALTOPLEFT ),
+        TOKEN( "doubleBarnDoor",                XML_DOUBLEBARNDOOR ),
+        TOKEN( "doubleDiamond",             XML_DOUBLEDIAMOND ),
+        TOKEN( "fourPoint",                 XML_FOURPOINT ),
+        TOKEN( "fivePoint",                 XML_FIVEPOINT ),
+        TOKEN( "sixPoint",                  XML_SIXPOINT ),
+        TOKEN( "heart",                     XML_HEART ),
+        TOKEN( "keyhole",                       XML_KEYHOLE ),
+        TOKEN( "clockwiseTwelve",               XML_CLOCKWISETWELVE ),
+        TOKEN( "clockwiseThree",                XML_CLOCKWISETHREE ),
+        TOKEN( "clockwiseSix",              XML_CLOCKWISESIX ),
+        TOKEN( "clockwiseNine",             XML_CLOCKWISENINE ),
+        TOKEN( "twoBladeVertical",          XML_TWOBLADEVERTICAL ),
+        TOKEN( "twoBladeHorizontal",            XML_TWOBLADEHORIZONTAL ),
+        TOKEN( "fourBlade",                 XML_FOURBLADE ),
+        TOKEN( "clockwiseTop",              XML_CLOCKWISETOP ),
+        TOKEN( "clockwiseRight",                XML_CLOCKWISERIGHT ),
+        TOKEN( "clockwiseBottom",               XML_CLOCKWISEBOTTOM ),
+        TOKEN( "clockwiseLeft",             XML_CLOCKWISELEFT ),
+        TOKEN( "clockwiseTopLeft",          XML_CLOCKWISETOPLEFT ),
+        TOKEN( "counterClockwiseBottomLeft",    XML_COUNTERCLOCKWISEBOTTOMLEFT ),
+        TOKEN( "clockwiseBottomRight",      XML_CLOCKWISEBOTTOMRIGHT ),
+        TOKEN( "counterClockwiseTopRight",  XML_COUNTERCLOCKWISETOPRIGHT ),
+        TOKEN( "centerTop",                 XML_CENTERTOP ),
+        TOKEN( "centerRight",                   XML_CENTERRIGHT ),
+        TOKEN( "fanOutVertical",                XML_FANOUTVERTICAL ),
+        TOKEN( "fanOutHorizontal",          XML_FANOUTHORIZONTAL ),
+        TOKEN( "fanInVertical",             XML_FANINVERTICAL ),
+        TOKEN( "fanInHorizontal",               XML_FANINHORIZONTAL ),
+        TOKEN( "parallelVertical",          XML_PARALLELVERTICAL ),
+        TOKEN( "parallelDiagonal",          XML_PARALLELDIAGONAL ),
+        TOKEN( "oppositeVertical",          XML_OPPOSITEVERTICAL ),
+        TOKEN( "oppositeHorizontal",            XML_OPPOSITEHORIZONTAL ),
+        TOKEN( "parallelDiagonalTopLeft",       XML_PARALLELDIAGONALTOPLEFT ),
+        TOKEN( "parallelDiagonalBottomLeft",    XML_PARALLELDIAGONALBOTTOMLEFT ),
+        TOKEN( "topLeftHorizontal",         XML_TOPLEFTHORIZONTAL ),
+        TOKEN( "topLeftDiagonal",               XML_TOPLEFTDIAGONAL ),
+        TOKEN( "topRightDiagonal",          XML_TOPRIGHTDIAGONAL ),
+        TOKEN( "bottomRightDiagonal",           XML_BOTTOMRIGHTDIAGONAL ),
+        TOKEN( "bottomLeftDiagonal",            XML_BOTTOMLEFTDIAGONAL ),
+        TOKEN( "topLeftClockwise",          XML_TOPLEFTCLOCKWISE ),
+        TOKEN( "topRightClockwise",         XML_TOPRIGHTCLOCKWISE ),
+        TOKEN( "bottomRightClockwise",      XML_BOTTOMRIGHTCLOCKWISE ),
+        TOKEN( "bottomLeftClockwise",           XML_BOTTOMLEFTCLOCKWISE ),
+        TOKEN( "topLeftCounterClockwise",       XML_TOPLEFTCOUNTERCLOCKWISE ),
+        TOKEN( "topRightCounterClockwise",  XML_TOPRIGHTCOUNTERCLOCKWISE ),
+        TOKEN( "bottomRightCounterClockwise",   XML_BOTTOMRIGHTCOUNTERCLOCKWISE ),
+        TOKEN( "bottomLeftCounterClockwise",    XML_BOTTOMLEFTCOUNTERCLOCKWISE ),
+        TOKEN( "verticalTopSame",               XML_VERTICALTOPSAME ),
+        TOKEN( "verticalBottomSame",            XML_VERTICALBOTTOMSAME ),
+        TOKEN( "verticalTopLeftOpposite",       XML_VERTICALTOPLEFTOPPOSITE ),
+        TOKEN( "verticalBottomLeftOpposite",    XML_VERTICALBOTTOMLEFTOPPOSITE ),
+        TOKEN( "horizontalLeftSame",            XML_HORIZONTALLEFTSAME ),
+        TOKEN( "horizontalRightSame",           XML_HORIZONTALRIGHTSAME ),
+        TOKEN( "horizontalTopLeftOpposite", XML_HORIZONTALTOPLEFTOPPOSITE ),
+        TOKEN( "horizontalTopRightOpposite",    XML_HORIZONTALTOPRIGHTOPPOSITE ),
+        TOKEN( "diagonalBottomLeftOpposite",    XML_DIAGONALBOTTOMLEFTOPPOSITE ),
+        TOKEN( "diagonalTopLeftOpposite",       XML_DIAGONALTOPLEFTOPPOSITE ),
+        TOKEN( "twoBoxTop",                 XML_TWOBOXTOP ),
+        TOKEN( "twoBoxBottom",              XML_TWOBOXBOTTOM ),
+        TOKEN( "twoBoxLeft",                    XML_TWOBOXLEFT ),
+        TOKEN( "twoBoxRight",                   XML_TWOBOXRIGHT ),
+        TOKEN( "fourBoxVertical ",          XML_FOURBOXVERTICAL ),
+        TOKEN( "fourBoxHorizontal",         XML_FOURBOXHORIZONTAL ),
+        TOKEN( "verticalLeft",              XML_VERTICALLEFT ),
+        TOKEN( "verticalRight",             XML_VERTICALRIGHT ),
+        TOKEN( "horizontalLeft",                XML_HORIZONTALLEFT ),
+        TOKEN( "horizontalRight",               XML_HORIZONTALRIGHT ),
+        TOKEN( "fromLeft",                  XML_FROMLEFT ),
+        TOKEN( "fromTop",                       XML_FROMTOP ),
+        TOKEN( "fromRight",                 XML_FROMRIGHT ),
+        TOKEN( "fromBottom",                    XML_FROMBOTTOM ),
+        TOKEN( "crossfade",                 XML_CROSSFADE ),
+        TOKEN( "fadeToColor",                   XML_FADETOCOLOR ),
+        TOKEN( "fadeFromColor",             XML_FADEFROMCOLOR ),
+        TOKEN( "fadeOverColor",             XML_FADEOVERCOLOR ),
+        TOKEN( "threeBlade",                    XML_THREEBLADE ),
+        TOKEN( "eightBlade",                    XML_EIGHTBLADE ),
+        TOKEN( "oneBlade",                  XML_ONEBLADE ),
+        TOKEN( "across",                        XML_ACROSS ),
+        TOKEN( "combHorizontal",                XML_COMBHORIZONTAL ),
+        TOKEN( "combVertical",              XML_COMBVERTICAL ),
+        TOKEN( "rotateIn",                  XML_ROTATEIN ),
+        TOKEN( "rotateOut",                 XML_ROTATEOUT ),
+        TOKEN( "fromTopLeft",                   XML_FROMTOPLEFT ),
+        TOKEN( "fromTopRight",              XML_FROMTOPRIGHT ),
+        TOKEN( "fromBottomLeft",                XML_FROMBOTTOMLEFT ),
+        TOKEN( "fromBottomRight",               XML_FROMBOTTOMRIGHT ),
+
+        TOKEN( "subtype",                       XML_SUBTYPE ),
+        TOKEN( "out",                           XML_OUT ),
+
+        TOKEN( "forward",                       XML_FORWARD ),
+        TOKEN( "reverse",                       XML_REVERSE ),
+
+        TOKEN( "fadeColor",                 XML_FADECOLOR ),
+
+        TOKEN( "onbegin",                       XML_ONBEGIN ),
+        TOKEN( "onend",                     XML_ONEND ),
+        TOKEN( "click",                     XML_CLICK ),
+        TOKEN( "doubleclick",                   XML_DOUBLECLICK ),
+        TOKEN( "mouseover",                 XML_MOUSEOVER ),
+        TOKEN( "mouseout",                  XML_MOUSEOUT ),
+
+        TOKEN( "node-type",         XML_NODE_TYPE ),
+        TOKEN( "preset-id",         XML_PRESET_ID ),
+        TOKEN( "preset-sub-type",       XML_PRESET_SUB_TYPE ),
+        TOKEN( "preset-class",      XML_PRESET_CLASS ),
+        TOKEN( "custom",                XML_CUSTOM ),
+        TOKEN( "entrance",          XML_ENTRANCE ),
+        TOKEN( "exit",              XML_EXIT ),
+        TOKEN( "emphasis",          XML_EMPHASIS ),
+        TOKEN( "motion-path",           XML_MOTION_PATH ),
+        TOKEN( "ole-action",            XML_OLE_ACTION ),
+        TOKEN( "media-call",            XML_MEDIA_CALL ),
+        TOKEN( "on-click",          XML_ON_CLICK ),
+        TOKEN( "with-previous",     XML_WITH_PREVIOUS ),
+        TOKEN( "after-previous",        XML_AFTER_PREVIOUS ),
+        TOKEN( "main-sequence",     XML_MAIN_SEQUENCE ),
+        TOKEN( "timing-root",           XML_TIMING_ROOT ),
+        TOKEN( "interactive-sequence",XML_INTERACTIVE_SEQUENCE ),
+
+        TOKEN( "base",              XML_BASE ),
+
+        TOKEN( "sub-item",          XML_SUB_ITEM ),
+        TOKEN( "iterate-type",      XML_ITERATE_TYPE ),
+        TOKEN( "iterate-interval",  XML_ITERATE_INTERVAL ),
+        TOKEN( "iterate",               XML_ITERATE ),
+        TOKEN( "by-paragraph",      XML_BY_PARAGRAPH ),
+        TOKEN( "by-word",               XML_BY_WORD ),
+        TOKEN( "by-letter",         XML_BY_LETTER ),
+
+        TOKEN( "after-effect",      XML_AFTER_EFFECT ),
+        TOKEN( "master",                XML_MASTER ),
+
+        TOKEN( "group-id",          XML_GROUP_ID ),
+        TOKEN( "targetElement",     XML_TARGETELEMENT ),
+        TOKEN( "toggle-pause",      XML_TOGGLE_PAUSE ),
+        TOKEN( "master-element",        XML_MASTER_ELEMENT ),
+        TOKEN( "stop-audio",            XML_STOP_AUDIO ),
+
+        TOKEN( "audio-level",           XML_AUDIO_LEVEL ),
+
 #if OSL_DEBUG_LEVEL > 0
         { 0, NULL, NULL,                       XML_TOKEN_END }
 #else