writerfilter/CustomTarget_source.mk        |    6 -
 writerfilter/source/ooxml/analyzemodel.xsl |  121 -----------------------------
 2 files changed, 127 deletions(-)

New commits:
commit 0e8c06660b3d651900a0f20abd2b1429c854a1c8
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date:   Thu Jun 12 08:50:38 2014 +0200

    writerfilter: remove unused analyzemodel.xsl
    
    Change-Id: Ic9e44d0050413c9225b030a4be6f71f5adc654fc

diff --git a/writerfilter/CustomTarget_source.mk 
b/writerfilter/CustomTarget_source.mk
index e9cc479..4452c54 100644
--- a/writerfilter/CustomTarget_source.mk
+++ b/writerfilter/CustomTarget_source.mk
@@ -64,7 +64,6 @@ 
writerfilter_GEN_ooxml_Factory_cxx=$(writerfilter_WORK)/OOXMLFactory_generated.c
 
writerfilter_GEN_ooxml_Factory_hxx=$(writerfilter_WORK)/OOXMLFactory_generated.hxx
 
writerfilter_GEN_ooxml_FastTokens_hxx=$(writerfilter_WORK)/ooxml/OOXMLFastTokens.hxx
 
writerfilter_GEN_ooxml_GperfFastToken_hxx=$(writerfilter_WORK)/gperffasttoken.hxx
-writerfilter_GEN_ooxml_Model_analyzed=$(writerfilter_WORK)/ooxml/model_analyzed.xml
 
writerfilter_GEN_ooxml_Model_processed=$(writerfilter_WORK)/model_preprocessed.xml
 
writerfilter_GEN_ooxml_NamespaceIds_hxx=$(writerfilter_WORK)/ooxml/OOXMLnamespaceids.hxx
 writerfilter_GEN_ooxml_Namespacesmap_xsl=$(writerfilter_WORK)/namespacesmap.xsl
@@ -73,7 +72,6 @@ 
writerfilter_GEN_ooxml_QNameToStr_cxx=$(writerfilter_WORK)/ooxml/qnametostr.cxx
 
writerfilter_GEN_ooxml_ResourceIds_hxx=$(writerfilter_WORK)/ooxml/resourceids.hxx
 writerfilter_GEN_ooxml_Token_xml=$(writerfilter_WORK)/token.xml
 
writerfilter_SRC_model_NamespacePreprocess=$(writerfilter_SRC)/resourcemodel/namespace_preprocess.pl
-writerfilter_SRC_ooxml_Analyze_model_xsl=$(writerfilter_SRC)/ooxml/analyzemodel.xsl
 
writerfilter_SRC_ooxml_FactoryTools_xsl=$(writerfilter_SRC)/ooxml/factorytools.xsl
 
writerfilter_SRC_ooxml_FactoryValues_xsl=$(writerfilter_SRC)/ooxml/factory_values.xsl
 writerfilter_SRC_ooxml_FastTokens_py=$(writerfilter_SRC)/ooxml/fasttokens.py
@@ -105,10 +103,6 @@ $(writerfilter_GEN_ooxml_GperfFastToken_hxx) : 
$(writerfilter_SRC_ooxml_GperfFas
        $(call gb_Helper_abbreviate_dirs, $(writerfilter_PYTHONCOMMAND) 
$(writerfilter_SRC_ooxml_GperfFastTokenHandler_py) 
$(writerfilter_GEN_ooxml_Token_xml)) \
        | tr -d '\r' | $(GPERF) -c -E -G -I  -LC++ -S1 -t  > $@
 
-$(writerfilter_GEN_ooxml_Model_analyzed) : 
$(writerfilter_SRC_ooxml_Analyze_model_xsl) $(writerfilter_SRC_ooxml_Model) | 
$(writerfilter_WORK)/ooxml/.dir
-       $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
-       $(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $^) > $@
-
 $(writerfilter_GEN_ooxml_Model_processed) : 
$(writerfilter_GEN_ooxml_Namespacesmap_xsl) 
$(writerfilter_GEN_ooxml_Preprocess_xsl) $(writerfilter_SRC_ooxml_Model)
        $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
        $(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) 
$(writerfilter_GEN_ooxml_Namespacesmap_xsl) $(writerfilter_SRC_ooxml_Model)) > 
$@
diff --git a/writerfilter/source/ooxml/analyzemodel.xsl 
b/writerfilter/source/ooxml/analyzemodel.xsl
deleted file mode 100644
index 63ad772..0000000
--- a/writerfilter/source/ooxml/analyzemodel.xsl
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-
-<xsl:stylesheet version="1.0"
-       xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
-       xmlns:rng="http://relaxng.org/ns/structure/1.0";>
-
-<xsl:include href="factorytools.xsl"/>
-<xsl:output method="xml"/>
-
-<xsl:template match="/">
-       <analyze>
-               <xsl:for-each select="/model/namespace[not(@todo='ignore')]">
-                       <xsl:call-template name="analyzegrammar"/>
-               </xsl:for-each>
-       </analyze>
-</xsl:template>
-
-<xsl:template name="analyzegrammar">
-       <xsl:variable name="nsname" select="@name"/>
-       <xsl:for-each select="rng:grammar/rng:define">
-               <xsl:variable name="defname" select="@name"/>
-               <xsl:for-each select=".//rng:attribute|.//rng:element">
-                       <xsl:choose>
-                               <xsl:when test="local-name()='element'">        
                                
-                                       <element>
-                                               <xsl:call-template 
name="defineattrs">
-                                                       <xsl:with-param 
name="nsname" select="$nsname"/>
-                                                       <xsl:with-param 
name="defname" select="$defname"/>
-                                               </xsl:call-template>
-                                       </element>
-                               </xsl:when>
-                               <xsl:when test="local-name()='attribute'">
-                                       <attribute>
-                                               <xsl:call-template 
name="defineattrs">
-                                                       <xsl:with-param 
name="nsname" select="$nsname"/>
-                                                       <xsl:with-param 
name="defname" select="$defname"/>
-                                               </xsl:call-template>
-                                       </attribute>
-                               </xsl:when>
-                       </xsl:choose>
-               </xsl:for-each>
-       </xsl:for-each>
-</xsl:template>
-
-<xsl:template name="defineattrs">
-       <xsl:param name="nsname"/>
-       <xsl:param name="defname"/>
-
-       <xsl:variable name="localname" select="local-name()"/>
-       <xsl:variable name="name" select="@name"/>
-
-       <xsl:attribute name="id">
-               <xsl:value-of select="$nsname"/>
-               <xsl:text>:</xsl:text>
-               <xsl:value-of select="$defname"/>
-               <xsl:text>:</xsl:text>
-               <xsl:value-of select="@name"/>
-       </xsl:attribute>        
-       <xsl:for-each select="ancestor::namespace/resource[@name=$defname]">
-               <xsl:attribute name="resource"><xsl:value-of 
select="@resource"/></xsl:attribute>
-               <xsl:choose>
-                       <xsl:when test="$localname='attribute'">
-                               <xsl:for-each select="attribute[@name=$name and 
@tokenid]">
-                                       <xsl:attribute 
name="tokenid"><xsl:value-of select="@tokenid"/></xsl:attribute>
-                                       <xsl:attribute name="qname">
-                                               <xsl:call-template 
name="idtoqname">
-                                                       <xsl:with-param 
name="id" select="@tokenid"/>
-                                               </xsl:call-template>
-                                       </xsl:attribute>
-                    <xsl:attribute name="namespace">
-                        <xsl:value-of select="$nsname"/>
-                    </xsl:attribute>
-                    <xsl:attribute name="define">
-                        <xsl:value-of select="$defname"/>
-                    </xsl:attribute>
-                    <xsl:attribute name="name">
-                        <xsl:value-of select="@name"/>
-                    </xsl:attribute>
-                               </xsl:for-each>
-                       </xsl:when>
-                       <xsl:when test="$localname='element'">
-                               <xsl:for-each select="element[@name=$name and 
@tokenid]">
-                                       <xsl:attribute 
name="tokenid"><xsl:value-of select="@tokenid"/></xsl:attribute>
-                                       <xsl:attribute name="qname">
-                                               <xsl:call-template 
name="idtoqname">
-                                                       <xsl:with-param 
name="id" select="@tokenid"/>
-                                               </xsl:call-template>
-                                       </xsl:attribute>
-                    <xsl:attribute name="namespace">
-                        <xsl:value-of select="$nsname"/>
-                    </xsl:attribute>
-                    <xsl:attribute name="define">
-                        <xsl:value-of select="$defname"/>
-                    </xsl:attribute>
-                    <xsl:attribute name="name">
-                        <xsl:value-of select="@name"/>
-                    </xsl:attribute>
-                               </xsl:for-each>
-                       </xsl:when>
-               </xsl:choose>
-        <xsl:copy-of select="@tag"/>
-       </xsl:for-each>
-</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to