Skip to content

Commit 9475ac5

Browse files
author
Steve Canny
committed
ns: add missing namespaces
Also fixed some sorting errors in source XML for namespace constants.
1 parent 4dd2960 commit 9475ac5

File tree

2 files changed

+41
-13
lines changed

2 files changed

+41
-13
lines changed

‎opc/constants.py

+18
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,10 @@ class CONTENT_TYPE(object):
231231
SML_SHEET = (
232232
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
233233
)
234+
SML_SHEET_MAIN = (
235+
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.m'
236+
'ain+xml'
237+
)
234238
SML_SHEET_METADATA = (
235239
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheetMe'
236240
'tadata+xml'
@@ -247,6 +251,10 @@ class CONTENT_TYPE(object):
247251
'application/vnd.openxmlformats-officedocument.spreadsheetml.tableSi'
248252
'ngleCells+xml'
249253
)
254+
SML_TEMPLATE_MAIN = (
255+
'application/vnd.openxmlformats-officedocument.spreadsheetml.templat'
256+
'e.main+xml'
257+
)
250258
SML_USER_NAMES = (
251259
'application/vnd.openxmlformats-officedocument.spreadsheetml.userNam'
252260
'es+xml'
@@ -333,12 +341,22 @@ class CONTENT_TYPE(object):
333341

334342
class NAMESPACE(object):
335343
"""Constant values for OPC XML namespaces"""
344+
DML_WORDPROCESSING_DRAWING = (
345+
'http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDraw'
346+
'ing'
347+
)
348+
OFC_RELATIONSHIPS = (
349+
'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
350+
)
336351
OPC_RELATIONSHIPS = (
337352
'http://schemas.openxmlformats.org/package/2006/relationships'
338353
)
339354
OPC_CONTENT_TYPES = (
340355
'http://schemas.openxmlformats.org/package/2006/content-types'
341356
)
357+
WML_MAIN = (
358+
'http://schemas.openxmlformats.org/wordprocessingml/2006/main'
359+
)
342360

343361

344362
class RELATIONSHIP_TARGET_MODE(object):

‎util/src_data/part-types.xml

+23-13
Original file line numberDiff line numberDiff line change
@@ -363,11 +363,6 @@
363363
<RootNamespace>http://schemas.openxmlformats.org/spreadsheetml/2006/main</RootNamespace>
364364
<SourceRelationship>http://schemas.openxmlformats.org/officeDocument/2006/relationships/externalLink</SourceRelationship>
365365
</Part>
366-
<Part>
367-
<ContentType>application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml</ContentType>
368-
<RootNamespace>http://schemas.openxmlformats.org/spreadsheetml/2006/main</RootNamespace>
369-
<SourceRelationship>http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable</SourceRelationship>
370-
</Part>
371366
<Part>
372367
<ContentType>application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheDefinition+xml</ContentType>
373368
<RootNamespace>http://schemas.openxmlformats.org/spreadsheetml/2006/main</RootNamespace>
@@ -378,30 +373,40 @@
378373
<RootNamespace>http://schemas.openxmlformats.org/spreadsheetml/2006/main</RootNamespace>
379374
<SourceRelationship>http://schemas.openxmlformats.org/officeDocument/2006/relationships/spreadsheetml/pivotCacheRecords</SourceRelationship>
380375
</Part>
376+
<Part>
377+
<ContentType>application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml</ContentType>
378+
<RootNamespace>http://schemas.openxmlformats.org/spreadsheetml/2006/main</RootNamespace>
379+
<SourceRelationship>http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable</SourceRelationship>
380+
</Part>
381381
<Part>
382382
<ContentType>application/vnd.openxmlformats-officedocument.spreadsheetml.queryTable+xml</ContentType>
383383
<RootNamespace>http://schemas.openxmlformats.org/spreadsheetml/2006/main</RootNamespace>
384384
<SourceRelationship>http://schemas.openxmlformats.org/officeDocument/2006/relationships/queryTable</SourceRelationship>
385385
</Part>
386386
<Part>
387-
<ContentType>application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml</ContentType>
387+
<ContentType>application/vnd.openxmlformats-officedocument.spreadsheetml.revisionHeaders+xml</ContentType>
388388
<RootNamespace>http://schemas.openxmlformats.org/spreadsheetml/2006/main</RootNamespace>
389-
<SourceRelationship>http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings</SourceRelationship>
389+
<SourceRelationship>http://schemas.openxmlformats.org/officeDocument/2006/relationships/revisionHeaders</SourceRelationship>
390390
</Part>
391391
<Part>
392-
<ContentType>application/vnd.openxmlformats-officedocument.spreadsheetml.sheetMetadata+xml</ContentType>
392+
<ContentType>application/vnd.openxmlformats-officedocument.spreadsheetml.revisionLog+xml</ContentType>
393393
<RootNamespace>http://schemas.openxmlformats.org/spreadsheetml/2006/main</RootNamespace>
394-
<SourceRelationship>http://schemas.openxmlformats.org/officeDocument/2006/relationships/sheetMetadata</SourceRelationship>
394+
<SourceRelationship>http://schemas.openxmlformats.org/officeDocument/2006/relationships/revisionLog</SourceRelationship>
395395
</Part>
396396
<Part>
397-
<ContentType>application/vnd.openxmlformats-officedocument.spreadsheetml.revisionHeaders+xml</ContentType>
397+
<ContentType>application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml</ContentType>
398398
<RootNamespace>http://schemas.openxmlformats.org/spreadsheetml/2006/main</RootNamespace>
399-
<SourceRelationship>http://schemas.openxmlformats.org/officeDocument/2006/relationships/revisionHeaders</SourceRelationship>
399+
<SourceRelationship>http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings</SourceRelationship>
400400
</Part>
401401
<Part>
402-
<ContentType>application/vnd.openxmlformats-officedocument.spreadsheetml.revisionLog+xml</ContentType>
402+
<ContentType>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml</ContentType>
403403
<RootNamespace>http://schemas.openxmlformats.org/spreadsheetml/2006/main</RootNamespace>
404-
<SourceRelationship>http://schemas.openxmlformats.org/officeDocument/2006/relationships/revisionLog</SourceRelationship>
404+
<SourceRelationship>http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument</SourceRelationship>
405+
</Part>
406+
<Part>
407+
<ContentType>application/vnd.openxmlformats-officedocument.spreadsheetml.sheetMetadata+xml</ContentType>
408+
<RootNamespace>http://schemas.openxmlformats.org/spreadsheetml/2006/main</RootNamespace>
409+
<SourceRelationship>http://schemas.openxmlformats.org/officeDocument/2006/relationships/sheetMetadata</SourceRelationship>
405410
</Part>
406411
<Part>
407412
<ContentType>application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml</ContentType>
@@ -418,6 +423,11 @@
418423
<RootNamespace>http://schemas.openxmlformats.org/spreadsheetml/2006/main</RootNamespace>
419424
<SourceRelationship>http://schemas.openxmlformats.org/officeDocument/2006/relationships/tableSingleCells</SourceRelationship>
420425
</Part>
426+
<Part>
427+
<ContentType>application/vnd.openxmlformats-officedocument.spreadsheetml.template.main+xml</ContentType>
428+
<RootNamespace>http://schemas.openxmlformats.org/spreadsheetml/2006/main</RootNamespace>
429+
<SourceRelationship>http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument</SourceRelationship>
430+
</Part>
421431
<Part>
422432
<ContentType>application/vnd.openxmlformats-officedocument.spreadsheetml.userNames+xml</ContentType>
423433
<RootNamespace>http://schemas.openxmlformats.org/spreadsheetml/2006/main</RootNamespace>

0 commit comments

Comments
 (0)