diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-10-12 12:05:10 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-10-12 12:05:10 +0000 |
| commit | 6a6ed2d0612720a8c42a54f0f02ae6f8d30dcd66 (patch) | |
| tree | 7aa0e8e29335bd4999cf1b1b301a83650b6be8ae /xmloff | |
| parent | 12afe39c8847aa0214f3fdf21fa1eb4704863c99 (diff) | |
INTEGRATION: CWS sj09 (1.69.6); FILE MERGED
2004/09/17 16:01:22 sj 1.69.6.4: chaned text path mode
2004/09/16 12:45:31 sj 1.69.6.3: some minor changes for customshapes
2004/09/13 12:40:13 sj 1.69.6.2: changed some properties
2004/09/09 17:15:39 sj 1.69.6.1: added viewBox for CustomShapes
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/core/xmltoken.cxx | 66 |
1 files changed, 16 insertions, 50 deletions
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 9492e80e35..bb46b36a22 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmltoken.cxx,v $ * - * $Revision: 1.69 $ + * $Revision: 1.70 $ * - * last change: $Author: rt $ $Date: 2004-08-20 08:14:02 $ + * last change: $Author: hr $ $Date: 2004-10-12 13:05:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2239,10 +2239,6 @@ namespace xmloff { namespace token { TOKEN( "engine" ), // XML_ENGINE TOKEN( "enhanced-geometry" ), // XML_ENHANCED_GEOMETRY TOKEN( "predefined-type" ), // XML_PREDEFINED_TYPE - TOKEN( "coordinate-origin-x" ), // XML_COORDINATE_ORIGIN_X - TOKEN( "coordinate-origin-y" ), // XML_COORDINATE_ORIGIN_Y - TOKEN( "coordinate-width" ), // XML_COORDINATE_WIDTH - TOKEN( "coordinate-height" ), // XML_COORDINATE_HEIGHT TOKEN( "text-rotate-angle" ), // XML_TEXT_ROTATE_ANGLE TOKEN( "mirror-vertical" ), // XML_MIRROR_VERTICAL TOKEN( "mirror-horizontal" ), // XML_MIRROR_HORIZONTAL @@ -2250,36 +2246,26 @@ namespace xmloff { namespace token { TOKEN( "text-path-allowed" ), // XML_TEXT_PATH_ALLOWED TOKEN( "conentric-gradient-fill-allowed" ), // XML_CONCENTRIC_GRADIENT_FILL_ALLOWED TOKEN( "extrusion" ), // XML_EXTRUSION - TOKEN( "extrusion-auto-rotation-center" ), // XML_EXTRUSION_AUTO_ROTATION_CENTER - TOKEN( "extrusion-backward-depth" ), // XML_EXTRUSION_BACKWARD_DEPTH TOKEN( "extrusion-brightness" ), // XML_EXTRUSION_BRIGHTNESS - TOKEN( "extrusion-diffusity" ), // XML_EXTRUSION_DIFFUSITY - TOKEN( "extrusion-edge" ), // XML_EXTRUSION_EDGE - TOKEN( "extrusion-facet" ), // XML_EXTRUSION_FACET - TOKEN( "extrusion-foreward-depth" ), // XML_EXTRUSION_FOREWARD_DEPTH + TOKEN( "extrusion-depth" ), // XML_EXTRUSION_DEPTH + TOKEN( "extrusion-diffusion" ), // XML_EXTRUSION_DIFFUSION + TOKEN( "extrusion-number-of-line-segments" ),// XML_EXTRUSION_NUMBER_OF_LINE_SEGMENTS TOKEN( "extrusion-light-face" ), // XML_EXTRUSION_LIGHT_FACE - TOKEN( "extrusion-light-harsh1" ), // XML_EXTRUSION_LIGHT_HARSH1 - TOKEN( "extrusion-light-harsh2" ), // XML_EXTRUSION_LIGHT_HARSH2 - TOKEN( "extrusion-light-level1" ), // XML_EXTRUSION_LIGHT_LEVEL1 - TOKEN( "extrusion-light-level2" ), // XML_EXTRUSION_LIGHT_LEVEL2 - TOKEN( "extrusion-light-direction1" ), // XML_EXTRUSION_LIGHT_DIRECTION1 - TOKEN( "extrusion-light-direction2" ), // XML_EXTRUSION_LIGHT_DIRECTION2 + TOKEN( "extrusion-first-light-harsh" ), // XML_EXTRUSION_FIRST_LIGHT_HARSH + TOKEN( "extrusion-second-light-harsh" ), // XML_EXTRUSION_SECOND_LIGHT_HARSH + TOKEN( "extrusion-first-light-level" ), // XML_EXTRUSION_FIRST_LIGHT_LEVEL + TOKEN( "extrusion-second-light-level" ), // XML_EXTRUSION_SECOND_LIGHT_LEVEL + TOKEN( "extrusion-first-light-direction" ), // XML_EXTRUSION_FIRST_LIGHT_DIRECTION + TOKEN( "extrusion-second-light-direction" ),// XML_EXTRUSION_SECOND_LIGHT_DIRECTION TOKEN( "extrusion-metal" ), // XML_EXTRUSION_METAL - TOKEN( "extrusion-plane" ), // XML_EXTRUSION_PLANE - TOKEN( "extrusion-render-mode" ), // XML_EXTRUSION_RENDER_MODE - TOKEN( "extrusion-rotation-angle-x" ), // XML_EXTRUSION_ROTATION_ANGLE_X - TOKEN( "extrusion-rotation-angle-y" ), // XML_EXTRUSION_ROTATION_ANGLE_Y - TOKEN( "extrusion-rotation-center-x" ), // XML_EXTRUSION_ROTATION_CENTER_X - TOKEN( "extrusion-rotation-center-y" ), // XML_EXTRUSION_ROTATION_CENTER_Y - TOKEN( "extrusion-rotation-center-z" ), // XML_EXTRUSION_ROTATION_CENTER_Z + TOKEN( "extrusion-rotation-angle" ), // XML_EXTRUSION_ROTATION_ANGLE + TOKEN( "extrusion-rotation-center" ), // XML_EXTRUSION_ROTATION_CENTER TOKEN( "extrusion-shininess" ), // XML_EXTRUSION_SHININESS TOKEN( "extrusion-skew" ), // XML_EXTRUSION_SKEW - TOKEN( "extrusion-skew-angle" ), // XML_EXTRUSION_SKEW_ANGLE TOKEN( "extrusion-specularity" ), // XML_EXTRUSION_SPECULARITY - TOKEN( "extrusion-parallel" ), // XML_EXTRUSION_PARALLEL + TOKEN( "extrusion-projection-mode" ), // XML_EXTRUSION_PROJECTION_MODE TOKEN( "extrusion-viewpoint" ), // XML_EXTRUSION_VIEWPOINT - TOKEN( "extrusion-origin-x" ), // XML_EXTRUSION_ORIGIN_X - TOKEN( "extrusion-origin-y" ), // XML_EXTRUSION_ORIGIN_Y + TOKEN( "extrusion-origin" ), // XML_EXTRUSION_ORIGIN TOKEN( "extrusion-color" ), // XML_EXTRUSION_COLOR TOKEN( "secondary-fill-color" ), // XML_SECONDARY_FILL_COLOR TOKEN( "enhanced-path" ), // XML_ENHANCED_PATH @@ -2290,8 +2276,7 @@ namespace xmloff { namespace token { TOKEN( "glue-point-type" ), // XML_GLUE_POINT_TYPE TOKEN( "glue-point-leaving-direction" ), // XML_GLUE_POINT_LEAVING_DIRECTIONS TOKEN( "text-path" ), // XML_TEXT_PATH - TOKEN( "text-path-fit-text" ), // XML_TEXT_PATH_FIT_TEXT - TOKEN( "text-path-fit-shape" ), // XML_TEXT_PATH_FIT_SHAPE + TOKEN( "text-path-mode" ), // XML_TEXT_PATH_MODE TOKEN( "text-path-scale-x" ), // XML_TEXT_PATH_SCALE_X TOKEN( "text-path-same-letter-heights" ), // XML_TEXT_PATH_SAME_LETTER_HEIGHTS TOKEN( "adjustments" ), // XML_ADJUSTMENTS @@ -2308,28 +2293,10 @@ namespace xmloff { namespace token { TOKEN( "handle-polar" ), // XML_HANDLE_POLAR TOKEN( "handle-radius-range-minimum" ), // XML_HANDLE_RADIUS_RANGE_MINIMUM TOKEN( "handle-radius-range-maximum" ), // XML_HANDLE_RADIUS_RANGE_MAXIMUM - TOKEN( "callout" ), // XML_CALLOUT - TOKEN( "callout-accent-bar" ), // XML_CALLOUT_ACCENT_BAR - TOKEN( "callout-angle" ), // XML_CALLOUT_ANGLE - TOKEN( "callout-drop-distance" ), // XML_CALLOUT_DROP_DISTANCE - TOKEN( "callout-drop" ), // XML_CALLOUT_DROP - TOKEN( "callout-drop-automatic" ), // XML_CALLOUT_DROP_AUTOMATIC - TOKEN( "callout-gap" ), // XML_CALLOUT_GAP - TOKEN( "callout-length" ), // XML_CALLOUT_LENGTH - TOKEN( "callout-length-specified" ), // XML_CALLOUT_LENGTH_SPECIFIED - TOKEN( "callout-flip-x" ), // XML_CALLOUT_FLIP_X - TOKEN( "callout-flip-y" ), // XML_CALLOUT_FLIP_Y - TOKEN( "callout-text-border" ), // XML_CALLOUT_TEXT_BORDER - TOKEN( "callout-type" ), // XML_CALLOUT_TYPE TOKEN( "rectangle" ), // XML_RECTANGLE TOKEN( "roundrectangle" ), // XML_ROUNDRECTANGLE TOKEN( "oval" ), // XML_OVAL TOKEN( "cloud" ), // XML_CLOUD - TOKEN( "on" ), // XML_ON - TOKEN( "off" ), // XML_OFF - TOKEN( "xy" ), // XML_XY - TOKEN( "zx" ), // XML_ZX - TOKEN( "yz" ), // XML_YZ TOKEN( "boundingcube" ), // XML_BOUNDINGCUBE TOKEN( "wireframe" ), // XML_WIREFRAME TOKEN( "mid" ), // XML_MID @@ -2342,7 +2309,6 @@ namespace xmloff { namespace token { TOKEN( "sumangle" ), // XML_SUMANGLE TOKEN( "segments" ), // XML_SEGMENTS TOKEN( "word-wrap" ), // XML_WORD_WRAP - TOKEN( "auto-grow-size" ), // XML_AUTO_GROW_SIZE TOKEN( "collapsing" ), // XML_COLLAPSING TOKEN( "separating" ), // XML_SEPARATING |