summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.com>2015-11-06 09:48:28 +0100
committerTomaž Vajngerl <tomaz.vajngerl@collabora.com>2015-11-08 19:39:14 +0100
commit9f985de7b3377f50eea3ea47f41a0174b335c0b8 (patch)
tree567a3298b275f2e6adb988635f20c4c0c288f64c /oox
parent4115cb18362810d7b92c5a259fe3399c5e760970 (diff)
oox: p14 namespace (MSO 2010) + tokens for slide transitions
Change-Id: I72d1901ceb2e43e459efb197cb72bd701c7d8f63
Diffstat (limited to 'oox')
-rw-r--r--oox/source/token/namespaces.txt4
-rw-r--r--oox/source/token/tokens.txt19
2 files changed, 23 insertions, 0 deletions
diff --git a/oox/source/token/namespaces.txt b/oox/source/token/namespaces.txt
index 2c61d606ff9d..5d3232e0cd77 100644
--- a/oox/source/token/namespaces.txt
+++ b/oox/source/token/namespaces.txt
@@ -70,11 +70,15 @@ dcTerms http://purl.org/dc/terms/
xm http://schemas.microsoft.com/office/excel/2006/main
mce http://schemas.openxmlformats.org/markup-compatibility/2006
mceTest http://schemas.openxmlformats.org/spreadsheetml/2006/main/v2
+
+# MSO 2010 extensions -----------------------------------------------------------------------
+
wps http://schemas.microsoft.com/office/word/2010/wordprocessingShape
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/drawing/2010/main
+p14 http://schemas.microsoft.com/office/powerpoint/2010/main
# extlst namespaces
diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt
index c5843faffdd8..e44830d34b01 100644
--- a/oox/source/token/tokens.txt
+++ b/oox/source/token/tokens.txt
@@ -1403,6 +1403,7 @@ control2
controls
convMailMergeEsc
convex
+conveyor
coolSlant
coordorigin
coordsize
@@ -1926,6 +1927,7 @@ documentType
dodecagon
dodgerBlue
donut
+doors
dos
dot
dotDash
@@ -2183,6 +2185,7 @@ fans
fast
fax
fc
+ferris
ffData
fgClr
fgColor
@@ -2264,6 +2267,7 @@ fitpath
fitshape
fixed
fixedVal
+flash
flat
flatBorders
flatTx
@@ -2320,6 +2324,7 @@ flowersRoses
flowersTeacup
flowersTiny
fltVal
+flythrough
fmla
fmt
fmtId
@@ -2459,6 +2464,7 @@ ghostCol
ghostRow
ghostWhite
gingerbreadMan
+glitter
glossaryDocument
glow
goal
@@ -2687,6 +2693,7 @@ hlinkMouseOver
hold
holeSize
holly
+honeycomb
homePlate
honeydew
horizontal
@@ -2867,6 +2874,7 @@ irohaFullWidth
irregularSeal1
irregularSeal2
is
+isInverted
isLgl
isNarration
isPhoto
@@ -3437,6 +3445,7 @@ months
moon
moons
morning
+morph
mosaic
moveFrom
moveFromRangeEnd
@@ -3788,6 +3797,7 @@ overrideClrMapping
overwriteClear
owners
p
+p14
pBdr
pLen
pPos
@@ -3821,6 +3831,7 @@ paleTurquoise
paleVioletRed
palmsBlack
palmsColor
+pan
pane
panose
panose1
@@ -4083,6 +4094,7 @@ printTwoOnOne
printer
printerSettings
priority
+prism
prnPr
prnWhat
product
@@ -4110,6 +4122,7 @@ prstDash
prstGeom
prstMaterial
prstShdw
+prstTrans
prstTxWarp
pt
ptCount
@@ -4290,6 +4303,7 @@ result
rev
revDir
revPos
+reveal
reverse
reverseDiagStripe
reviewed
@@ -4319,6 +4333,7 @@ rightMargin
rightToLeft
rightVertical
rings
+ripple
ris
rm
rnd
@@ -4688,6 +4703,7 @@ showsigndate
shp
shpTxLTRAlignCh
shpTxRTLAlignCh
+shred
shrinkToFit
si
sib
@@ -5647,6 +5663,7 @@ vocabulary
vol
volType
volTypes
+vortex
vstream
vt
w
@@ -5660,6 +5677,7 @@ wOff
wR
warmMatte
warning
+warp
watermarks
wavAudioFile
wave
@@ -5702,6 +5720,7 @@ weight
wgp
wheat
wheel
+wheelReverse
whenNotActive
white
whiteFlowers