From 9f05a8709232bdce78760636c6f6f03bf588a1ec Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Fri, 29 Aug 2014 16:58:03 +0200
Subject: [PATCH] Remove unused url attribute

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

Change-Id: I348d11aa770255329cd47535dff4b15a95e4bd8e
---
 writerfilter/CustomTarget_source.mk        | 2 +-
 writerfilter/documentation/ooxml/model.rng | 3 ---
 writerfilter/source/ooxml/model.xml        | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk
index 09b2610a1592..8d7b3d22b690 100644
--- a/writerfilter/CustomTarget_source.mk
+++ b/writerfilter/CustomTarget_source.mk
@@ -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_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_Helper_abbreviate_dirs,\
 		$(writerfilter_XMLLINTCOMMAND) --noout --relaxng $(writerfilter_SRC)/../documentation/ooxml/model.rng $(writerfilter_SRC_ooxml_Model) > $@ 2>&1 \
diff --git a/writerfilter/documentation/ooxml/model.rng b/writerfilter/documentation/ooxml/model.rng
index 6f365ff6e913..3c9c40271cd9 100644
--- a/writerfilter/documentation/ooxml/model.rng
+++ b/writerfilter/documentation/ooxml/model.rng
@@ -259,9 +259,6 @@ documentation for that file. The schema has two parts:
       <optional>
         <attribute name="file"/>
       </optional>
-      <optional>
-        <attribute name="url"/>
-      </optional>
       <zeroOrMore>
         <ref name="start-element"/>
       </zeroOrMore>
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 42559b871609..6d639c659cc7 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -44,7 +44,7 @@
   <token tokenid="ooxml:footerl"/>
   <token tokenid="ooxml:footerr"/>
   <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="themeOverride"/>
     <start name="themeManager"/>