From 21d4cfe19e2796ebf89c408e292c4473924b2bc4 Mon Sep 17 00:00:00 2001 From: Jacobo Aragunde PĂ©rez Date: Tue, 20 May 2014 20:11:13 +0200 Subject: oox, writerfilter: add a14 namespace and tokens Added the artistic effects defined in the MS-ODRAWXML extension. Ref: http://msdn.microsoft.com/en-us/library/dd905216(v=office.12).aspx Change-Id: I24c5e5bbe569f160d300a7a7293ca047cb7a1b88. --- oox/source/token/namespaces-strict.txt | 1 + oox/source/token/namespaces.txt | 1 + oox/source/token/tokens.txt | 43 ++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) (limited to 'oox/source/token') diff --git a/oox/source/token/namespaces-strict.txt b/oox/source/token/namespaces-strict.txt index 9549483ec280..d49be5eed128 100644 --- a/oox/source/token/namespaces-strict.txt +++ b/oox/source/token/namespaces-strict.txt @@ -75,6 +75,7 @@ wps http://schemas.microsoft.com/office/word/2010/wordproces wpg http://schemas.microsoft.com/office/word/2010/wordprocessingGroup wp14 http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing w14 http://schemas.microsoft.com/office/word/2010/wordml +a14 http://schemas.microsoft.com/office/drawingml/2010/main # extlst namespaces diff --git a/oox/source/token/namespaces.txt b/oox/source/token/namespaces.txt index 6f0bee242736..63c0ce6af2f2 100644 --- a/oox/source/token/namespaces.txt +++ b/oox/source/token/namespaces.txt @@ -75,6 +75,7 @@ wps http://schemas.microsoft.com/office/word/2010/wordproces wpg http://schemas.microsoft.com/office/word/2010/wordprocessingGroup wp14 http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing w14 http://schemas.microsoft.com/office/word/2010/wordml +a14 http://schemas.microsoft.com/office/drawingml/2010/main # extlst namespaces diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt index bab7cf1dc859..1bdca90e2147 100644 --- a/oox/source/token/tokens.txt +++ b/oox/source/token/tokens.txt @@ -414,6 +414,7 @@ YZ Year YearAccessed ZX +a14 a aa above @@ -560,6 +561,7 @@ always alwaysMergeEmptyNamespace alwaysShow alwaysShowPlaceholderText +amount amt anchor anchorCtr @@ -640,6 +642,33 @@ array arrow arrowok artDeco +artisticBlur +artisticCement +artisticChalkSketch +artisticCrisscrossEtching +artisticCutout +artisticFilmGrain +artisticGlass +artisticGlowDiffused +artisticGlowEdges +artisticLightScreen +artisticLineDrawing +artisticMarker +artisticMosiaicBubbles +artisticPaintStrokes +artisticPaintBrush +artisticPastelsSmooth +artisticPencilGrayscale +artisticPencilSketch +artisticPhotocopy +artisticPlasticWrap +artisticTexturizer +artisticWatercolorSponge +artisticBackgroundRemoval +artisticBrightnessContrast +artisticColorTemperature +artisticSaturation +artisticSharpenSoften asDisplayed ascending ascendingAlpha @@ -947,6 +976,7 @@ brkBinSub brown browse browser +brushSize bstr btLr btnFace @@ -1257,6 +1287,7 @@ color2 colorFilter colorId colorScale +colorTemp colormenu colormode colormru @@ -1390,6 +1421,7 @@ cover coverPg cp cr +crackSpacing crashSave crazyMaze created @@ -1729,6 +1761,7 @@ destId destOrd destination destinationFile +detail detectmouseclick dgm dgmbasetextscale @@ -2430,6 +2463,7 @@ gradientInactiveCaption gradientRadial gradientUnscaled gradientshapeok +grainSize gramEnd gramStart grammar @@ -2471,6 +2505,7 @@ gridDropZones gridLegend gridLines gridLinesSet +gridSize gridSpacing gridSpan group @@ -2732,7 +2767,10 @@ imagedata imagesize imeMode img +imgEffect imgH +imgLayer +imgProps imgSz imgW immersive @@ -2795,6 +2833,7 @@ intLim intVal integer integrated +intensity interSp interactiveSeq intercept @@ -3568,6 +3607,7 @@ numStyleLink numTab number numberInDash +numberOfShades numberStoredAsText numbering numberingChange @@ -3839,6 +3879,7 @@ pctPosVOffset pctWidth peachPuff penClr +pencilSize pencils pentagon people @@ -4002,6 +4043,7 @@ preserveSortFilterLayout presetClass presetID presetSubtype +pressure prev prevAc prevCondLst @@ -4710,6 +4752,7 @@ smartTags smileyFace smooth smoothMarker +smoothness smtClean smtId snake -- cgit