writerfilter/source/ooxml/factoryimpl.py | 6 ++-- writerfilter/source/ooxml/model.xml | 44 +++++++++++++++---------------- 2 files changed, 25 insertions(+), 25 deletions(-)
New commits: commit 024d135a5bf6a45885dea58080609001bd465e3c Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Sun Aug 31 13:23:46 2014 +0200 Unused arguments / variables Change-Id: I5903b2f72314f8518beb1821c218fca6a3550d7f diff --git a/writerfilter/source/ooxml/factoryimpl.py b/writerfilter/source/ooxml/factoryimpl.py index 475620e..dcd6248 100644 --- a/writerfilter/source/ooxml/factoryimpl.py +++ b/writerfilter/source/ooxml/factoryimpl.py @@ -153,7 +153,7 @@ std::string fastTokenToId(sal_uInt32 nToken) """) -def getFastParser(model): +def getFastParser(): print("""uno::Reference <xml::sax::XFastParser> OOXMLStreamImpl::getFastParser() { if (!mxFastParser.is()) @@ -194,14 +194,14 @@ using namespace com::sun::star; getFactoryForNamespace(model) createFastChildContextFromStart(model) fastTokenToId(model) - getFastParser(model) + getFastParser() def parseNamespaces(fro): sock = open(fro) for i in sock.readlines(): line = i.strip() - id, alias, url = line.split(' ') + alias, url = line.split(' ')[1:] # first column is ID, not interesting for us ooxUrlAliases[url] = alias sock.close() commit 65613586117d5cf90d5459d4babd968c8de5fe4b Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Sun Aug 31 13:21:35 2014 +0200 Remove not needed xmlns:xsd attributes Change-Id: I3ed897a7d5a3182d9ae9f64269e3eb6851eeab73 diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 55c9289..906b645 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -52,7 +52,7 @@ <start name="themeOverride"/> <start name="themeManager"/> <start name="hlinkClick"/> - <grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main"> + <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main"> <!-- ISO RELAX NG Schema --> <include href="dml-baseStylesheet.rng"/> <!-- start = theme | themeOverride | themeManager | hlinkClick --> @@ -229,7 +229,7 @@ </grammar> </namespace> <namespace name="dml-shape3DLighting" file="dml-shape3DLighting.rng"> - <grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main"> + <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main"> <define name="ST_LightRigDirection"> <choice> <!-- Top Left --> @@ -379,7 +379,7 @@ </grammar> </namespace> <namespace name="dml-shape3DStyles" file="dml-shape3DStyles.rng"> - <grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main"> + <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main"> <!-- ISO RELAX NG Schema --> <include href="dml-shapeGeometry.rng"/> <define name="ST_BevelPresetType"> @@ -533,7 +533,7 @@ </resource> </namespace> <namespace name="dml-shape3DCamera" file="dml-shape3DCamera.rng"> - <grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main"> + <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main"> <define name="ST_PresetCameraType"> <choice> <!-- Legacy Oblique Top Left --> @@ -745,7 +745,7 @@ </resource> </namespace> <namespace name="dml-baseStylesheet" file="dml-baseStylesheet.rng"> - <grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main"> + <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main"> <!-- ISO RELAX NG Schema --> <define name="ST_ColorSchemeIndex"> <choice> @@ -1001,7 +1001,7 @@ </resource> </namespace> <namespace name="dml-textCharacter" file="dml-textCharacter.rng"> - <grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main"> + <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main"> <!-- ISO RELAX NG Schema --> <include href="dml-shapeEffects.rng"/> <include href="dml-shapeLineProperties.rng"/> @@ -1259,7 +1259,7 @@ </resource> </namespace> <namespace name="dml-shapeEffects" file="dml-shapeEffects.rng"> - <grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main"> + <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main"> <!-- start = blip --> <define name="CT_AlphaBiLevelEffect"> <attribute name="thresh"> @@ -2271,7 +2271,7 @@ </resource> </namespace> <namespace name="dml-shapeLineProperties" file="dml-shapeLineProperties.rng"> - <grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main"> + <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main"> <!-- ISO RELAX NG Schema --> <include href="dml-shapeEffects.rng"/> <define name="ST_LineEndType"> @@ -2600,7 +2600,7 @@ </resource> </namespace> <namespace name="dml-baseTypes" file="dml-baseTypes"> - <grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main"> + <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main"> <!-- ISO RELAX NG Schema --> <include href="shared-relationshipReference.rng"/> <define name="CT_OfficeArtExtension"> @@ -3755,7 +3755,7 @@ <resource name="ST_DrawingElementId" resource="Integer"/> </namespace> <namespace name="dml-documentProperties" file="dml-documentProperties.rng"> - <grammar xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main"> + <grammar xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main"> <!-- ISO RELAX NG Schema --> <include href="dml-shapeGeometry.rng"/> <define name="AG_Locking"> @@ -3973,7 +3973,7 @@ </namespace> <namespace name="dml-graphicalObject" file="dml-graphicalObject.rng"> <start name="graphic"/> - <grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main"> + <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main"> <!-- ISO RELAX NG Schema --> <!-- start = graphic --> <define name="CT_GraphicalObjectData"> @@ -4112,7 +4112,7 @@ <start name="numSpacing"/> <start name="stylisticSets"/> <start name="cntxtAlts"/> - <grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.microsoft.com/office/word/2010/wordml" attributeFormDefault="qualified"> + <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.microsoft.com/office/word/2010/wordml" attributeFormDefault="qualified"> <define name="ST_SchemeColorVal"> <choice> <value>bg1</value> @@ -5334,7 +5334,7 @@ </resource> </namespace> <namespace name="a14" file="a14.rng"> - <grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.microsoft.com/office/drawingml/2010/main"> + <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.microsoft.com/office/drawingml/2010/main"> <!-- Simple types --> <define name="ST_ArtisticEffectParam10"> <data type="integer"/> @@ -5655,7 +5655,7 @@ </grammar> </namespace> <namespace name="dml-shapeGeometry" file="dml-shapeGeometry.rng"> - <grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main"> + <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main"> <define name="ST_ShapeType"> <choice> <!-- Line Shape --> @@ -6668,7 +6668,7 @@ <namespace name="dml-wordprocessingDrawing" file="dml-wordprocessingDrawing.rng"> <start name="inline"/> <start name="anchor"/> - <grammar xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"> + <grammar xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"> <!-- ISO RELAX NG Schema --> <include href="dml-graphicalObject.rng"/> <include href="dml-documentProperties.rng"/> @@ -7148,7 +7148,7 @@ </namespace> <namespace name="sml-customXmlMappings" file="sml-customXmlMappings-rng"> <start name="schemaLibrary"/> - <grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/schemaLibrary/2006/main"> + <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/schemaLibrary/2006/main"> <!-- ISO RELAX NG Schema --> <!-- start = schemaLibrary --> <define name="CT_Schema"> @@ -7177,7 +7177,7 @@ <namespace name="shared-math" file="shared-math.rng"> <start name="oMathPara"/> <start name="oMath"/> - <grammar xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/officeDocument/2006/math" attributeFormDefault="qualified"> + <grammar xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/officeDocument/2006/math" attributeFormDefault="qualified"> <!-- ISO RELAX NG Schema --> <include href="wml.rng"/> <!-- start = mathPr | oMathPara | oMath --> @@ -8238,7 +8238,7 @@ </resource> </namespace> <namespace name="shared-relationshipReference" file="shared-relationshipReference.rng"> - <grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/officeDocument/2006/relationships"> + <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/officeDocument/2006/relationships"> <!-- ISO RELAX NG Schema --> <define name="id"> <attribute name="id"> @@ -8450,7 +8450,7 @@ <start name="polyline"/> <start name="rect"/> <start name="roundrect"/> - <grammar xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:wvml="urn:schemas-microsoft-com:office:word" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:p="urn:schemas-microsoft-com:office:powerpoint" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="urn:schemas-microsoft-com:vml"> + <grammar xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:wvml="urn:schemas-microsoft-com:office:word" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:p="urn:schemas-microsoft-com:office:powerpoint" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="urn:schemas-microsoft-com:vml"> <!-- ISO RELAX NG Schema --> <include href="vml-officeDrawing.rng"/> <!-- External schema: http://schemas.openxmlformats.org/wordprocessingml/2006/main --> @@ -9466,7 +9466,7 @@ <start name="column"/> <start name="clippath"/> <start name="fill"/> - <grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns:v="urn:schemas-microsoft-com:vml" xmlns="http://relaxng.org/ns/structure/1.0" ns="urn:schemas-microsoft-com:office:office" > + <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns:v="urn:schemas-microsoft-com:vml" xmlns="http://relaxng.org/ns/structure/1.0" ns="urn:schemas-microsoft-com:office:office" > <!-- ISO RELAX NG Schema --> <include href="vml-main.rng"/> <!-- External schema: http://schemas.openxmlformats.org/officeDocument/2006/relationships --> @@ -10442,7 +10442,7 @@ <start name="borderbottom"/> <start name="wrap"/> <start name="anchorlock"/> - <grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="urn:schemas-microsoft-com:office:word"> + <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="urn:schemas-microsoft-com:office:word"> <!-- ISO RELAX NG Schema --> <!-- start = bordertop | borderleft | borderright | borderbottom | wrap | anchorlock --> <define name="bordertop"> @@ -10603,7 +10603,7 @@ <start name="styles"/> <start name="document"/> <start name="glossaryDocument"/> - <grammar xmlns:sl="http://schemas.openxmlformats.org/schemaLibrary/2006/main" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:rel="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:v="urn:schemas-microsoft-com:vml" ns="http://schemas.openxmlformats.org/wordprocessingml/2006/main" attributeFormDefault="qualified"> + <grammar xmlns:sl="http://schemas.openxmlformats.org/schemaLibrary/2006/main" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:rel="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:v="urn:schemas-microsoft-com:vml" ns="http://schemas.openxmlformats.org/wordprocessingml/2006/main" attributeFormDefault="qualified"> <include href="shared-math.rng"/> <include href="dml-wordprocessingDrawing.rng"/> <include href="shared-relationshipReference.rng"/> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits