[Libreoffice-commits] core.git: writerfilter/qa writerfilter/source

Miklos Vajna vmiklos at collabora.co.uk
Mon Jul 28 10:05:28 PDT 2014


 writerfilter/qa/ooxml/watch-generated-code.sh |    3 +++
 writerfilter/source/ooxml/modelpreprocess.py  |    9 ---------
 2 files changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 1b30426c818a7a45a3cb429b8b3c45b634ad2ab9
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Jul 28 18:23:46 2014 +0200

    writerfilter: nobody reads the classfordefine attribute
    
    Change-Id: I030137cb379de04968fb144516e90dbd1bdd97f6

diff --git a/writerfilter/qa/ooxml/watch-generated-code.sh b/writerfilter/qa/ooxml/watch-generated-code.sh
index 86acaf7..d674573 100755
--- a/writerfilter/qa/ooxml/watch-generated-code.sh
+++ b/writerfilter/qa/ooxml/watch-generated-code.sh
@@ -32,6 +32,9 @@ reference)
 compare)
     for i in $writerfilter_ALL
     do
+        if [ "$(basename $i)" == "model_preprocessed.xml" ]; then
+            continue
+        fi
         diff -u $mydir-reference/$i $mydir/$i
     done
     ;;
diff --git a/writerfilter/source/ooxml/modelpreprocess.py b/writerfilter/source/ooxml/modelpreprocess.py
index 022568f..82e5e3f 100644
--- a/writerfilter/source/ooxml/modelpreprocess.py
+++ b/writerfilter/source/ooxml/modelpreprocess.py
@@ -149,15 +149,6 @@ def preprocess(model):
             j.setAttribute("prefix", prefix)
             j.setAttribute("localname", localname)
 
-        for j in i.getElementsByTagName("define") + i.getElementsByTagName("ref"):
-            name = j.getAttribute("name")
-            if name.startswith("CT_") or name.startswith("EG_") or name.startswith("AG_"):
-                j.setAttribute("classfordefine", "1")
-            elif name in startElements:
-                j.setAttribute("classfordefine", "1")
-            else:
-                j.setAttribute("classfordefine", "0")
-
     for i in model.getElementsByTagName("grammar"):
         if i.getAttribute("ns").startswith("http://schemas.openxmlformats.org/"):
             i.setAttribute("application", i.getAttribute("ns").replace('http://schemas.openxmlformats.org/', '').split('/')[0])


More information about the Libreoffice-commits mailing list