mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused url attribute

Browse Source 
And also make sure that the model is re-checked when the schema changes.

Change-Id: I348d11aa770255329cd47535dff4b15a95e4bd8e
This commit is contained in:
Miklos Vajna
2014-08-29 16:58:03 +02:00
parent 89940633b4
commit 9f05a87092
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
writerfilter/CustomTarget_source.mk
View File

@@ -76,7 +76,7 @@ $(writerfilter_GEN_ooxml_Factory_hxx) : $(writerfilter_SRC)/ooxml/factoryinc.py
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PY ,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PY ,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_PYTHONCOMMAND) $< $(writerfilter_GEN_ooxml_Model_processed)) > $@ $(call gb_Helper_abbreviate_dirs, $(writerfilter_PYTHONCOMMAND) $< $(writerfilter_GEN_ooxml_Model_processed)) > $@
$(writerfilter_GEN_ooxml_Model_validated) : $(writerfilter_SRC_ooxml_Model) $(writerfilter_GEN_ooxml_Model_validated) : $(writerfilter_SRC)/../documentation/ooxml/model.rng $(writerfilter_SRC_ooxml_Model)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,VAL,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,VAL,1)
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
$(writerfilter_XMLLINTCOMMAND) --noout --relaxng $(writerfilter_SRC)/../documentation/ooxml/model.rng $(writerfilter_SRC_ooxml_Model) > $@ 2>&1 \ $(writerfilter_XMLLINTCOMMAND) --noout --relaxng $(writerfilter_SRC)/../documentation/ooxml/model.rng $(writerfilter_SRC_ooxml_Model) > $@ 2>&1 \

3
writerfilter/documentation/ooxml/model.rng
View File

@@ -259,9 +259,6 @@ documentation for that file. The schema has two parts:
<optional> <optional>
<attribute name="file"/> <attribute name="file"/>
</optional> </optional>
<optional>
<attribute name="url"/>
</optional>
<zeroOrMore> <zeroOrMore>
<ref name="start-element"/> <ref name="start-element"/>
</zeroOrMore> </zeroOrMore>

2
writerfilter/source/ooxml/model.xml
View File

@@ -44,7 +44,7 @@
<token tokenid="ooxml:footerl"/> <token tokenid="ooxml:footerl"/>
<token tokenid="ooxml:footerr"/> <token tokenid="ooxml:footerr"/>
<token tokenid="ooxml:footerf"/> <token tokenid="ooxml:footerf"/>
<namespace name="dml-stylesheet" url="http://schemas.openxmlformats.org/drawingml/2006/main" file="dml-stylesheet.rng"> <namespace name="dml-stylesheet" file="dml-stylesheet.rng">
<start name="theme"/> <start name="theme"/>
<start name="themeOverride"/> <start name="themeOverride"/>
<start name="themeManager"/> <start name="themeManager"/>