diff options
| -rw-r--r-- | writerfilter/CustomTarget_source.mk | 7 | ||||
| -rw-r--r-- | writerfilter/Library_writerfilter.mk | 1 | ||||
| -rw-r--r-- | writerfilter/inc/resourcemodel/QNameToString.hxx | 1 | ||||
| -rw-r--r-- | writerfilter/source/doctok/qnametostr.xsl | 32 | ||||
| -rw-r--r-- | writerfilter/source/doctok/resourcetools.xsl | 10 | ||||
| -rw-r--r-- | writerfilter/source/resourcemodel/qnametostrcore.cxx | 1 |
6 files changed, 0 insertions, 52 deletions
diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk index ec5fb97b0c52..367928ea31a2 100644 --- a/writerfilter/CustomTarget_source.mk +++ b/writerfilter/CustomTarget_source.mk @@ -42,7 +42,6 @@ writerfilter_OOXMLNAMESPACES= \ wml writerfilter_ALL = \ - $(writerfilter_GEN_doctok_QNameToStr_cxx) \ $(writerfilter_GEN_doctok_SprmIds_hxx) \ $(writerfilter_GEN_model_SprmCodeToStr_cxx) \ $(writerfilter_GEN_ooxml_Factory_cxx) \ @@ -60,7 +59,6 @@ writerfilter_ALL = \ $(patsubst %,$(writerfilter_WORK)/OOXMLFactory_%.cxx,$(writerfilter_OOXMLNAMESPACES)) \ writerfilter_DEP_ooxml_Namespaces_txt=$(call gb_CustomTarget_get_workdir,oox/generated)/misc/namespaces.txt -writerfilter_GEN_doctok_QNameToStr_cxx=$(writerfilter_WORK)/doctok/qnametostr.cxx writerfilter_GEN_doctok_SprmIds_hxx=$(writerfilter_WORK)/doctok/sprmids.hxx writerfilter_GEN_model_SprmCodeToStr_cxx=$(writerfilter_WORK)/sprmcodetostr.cxx writerfilter_GEN_model_SprmCodeToStr_tmp=$(writerfilter_WORK)/sprmcodetostr.tmp @@ -80,7 +78,6 @@ writerfilter_GEN_ooxml_ResourceIds_hxx=$(writerfilter_WORK)/ooxml/resourceids.hx writerfilter_GEN_ooxml_Token_tmp=$(writerfilter_WORK)/token.tmp writerfilter_GEN_ooxml_Token_xml=$(writerfilter_WORK)/token.xml writerfilter_SRC_doctok_Model=$(writerfilter_SRC)/doctok/resources.xmi -writerfilter_SRC_doctok_QNameToStr_xsl=$(writerfilter_SRC)/doctok/qnametostr.xsl writerfilter_SRC_doctok_ResourceTools_xsl=$(writerfilter_SRC)/doctok/resourcetools.xsl writerfilter_SRC_doctok_SprmCodeToStr_xsl=$(writerfilter_SRC)/doctok/sprmcodetostr.xsl writerfilter_SRC_doctok_SprmIds_xsl=$(writerfilter_SRC)/doctok/sprmids.xsl @@ -97,10 +94,6 @@ writerfilter_SRC_ooxml_Preprocess_xsl=$(writerfilter_SRC)/ooxml/modelpreprocess. writerfilter_SRC_ooxml_QNameToStr_xsl=$(writerfilter_SRC)/ooxml/qnametostr.xsl writerfilter_SRC_ooxml_ResourceIds_xsl=$(writerfilter_SRC)/ooxml/resourceids.xsl -$(writerfilter_GEN_doctok_QNameToStr_cxx): $(writerfilter_SRC_doctok_QNameToStr_xsl) $(writerfilter_SRC_doctok_Model) $(writerfilter_SRC_doctok_ResourceTools_xsl) | $(writerfilter_WORK)/.dir - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1) - $(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_doctok_QNameToStr_xsl) $(writerfilter_SRC_doctok_Model)) > $@ - $(writerfilter_GEN_doctok_SprmIds_hxx) : $(writerfilter_SRC_doctok_Model) $(writerfilter_SRC_doctok_SprmIds_xsl) | $(writerfilter_WORK)/doctok/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1) $(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_doctok_SprmIds_xsl) $(writerfilter_SRC_doctok_Model)) > $@ diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 63bd1a5f9bf9..9c88b38b5433 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -153,7 +153,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,writerfilter,\ CustomTarget/writerfilter/source/OOXMLFactory_generated \ CustomTarget/writerfilter/source/OOXMLFactory_values \ CustomTarget/writerfilter/source/sprmcodetostr \ - CustomTarget/writerfilter/source/doctok/qnametostr \ CustomTarget/writerfilter/source/ooxml/qnametostr \ )) diff --git a/writerfilter/inc/resourcemodel/QNameToString.hxx b/writerfilter/inc/resourcemodel/QNameToString.hxx index dab7776746b0..08da0837ee41 100644 --- a/writerfilter/inc/resourcemodel/QNameToString.hxx +++ b/writerfilter/inc/resourcemodel/QNameToString.hxx @@ -38,7 +38,6 @@ class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC QNameToString static Pointer_t pInstance; - void init_doctok(); void init_ooxml(); Map mMap; diff --git a/writerfilter/source/doctok/qnametostr.xsl b/writerfilter/source/doctok/qnametostr.xsl deleted file mode 100644 index 7af94419428b..000000000000 --- a/writerfilter/source/doctok/qnametostr.xsl +++ /dev/null @@ -1,32 +0,0 @@ -<!-- - * 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:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:UML = 'org.omg.xmi.namespace.UML' xml:space="default"> -<xsl:output method="text" /> - -<xsl:include href="resourcetools.xsl"/> - -<xsl:template match="/"> -#include "resourcemodel/QNameToString.hxx" - -namespace writerfilter -{ - <xsl:apply-templates select=".//UML:Model" mode="qnametostr"/> -} -</xsl:template> -</xsl:stylesheet> diff --git a/writerfilter/source/doctok/resourcetools.xsl b/writerfilter/source/doctok/resourcetools.xsl index 7ab6e84c89c1..c00dc9cdaf67 100644 --- a/writerfilter/source/doctok/resourcetools.xsl +++ b/writerfilter/source/doctok/resourcetools.xsl @@ -109,16 +109,6 @@ </xsl:for-each> </xsl:template> -<xsl:template match='UML:Model' mode='qnametostr'> - <xsl:text> -void QNameToString::init_doctok() -{</xsl:text> -<xsl:call-template name="qnametostrattrs"/> -<xsl:text> -} -</xsl:text> -</xsl:template> - <xsl:key name="ids" match='UML:Attribute[@name!="reserved"]//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref="attrid"]|UML:Operation[@name!="reserved"]//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref="opid"]' use=".//UML:TaggedValue.dataValue"/> <xsl:template match="UML:Model" mode="qnametostrfunc"> diff --git a/writerfilter/source/resourcemodel/qnametostrcore.cxx b/writerfilter/source/resourcemodel/qnametostrcore.cxx index e43150a16a05..81ba68ebc43f 100644 --- a/writerfilter/source/resourcemodel/qnametostrcore.cxx +++ b/writerfilter/source/resourcemodel/qnametostrcore.cxx @@ -45,7 +45,6 @@ string WRITERFILTER_RESOURCEMODEL_DLLPUBLIC QNameToString::operator()(Id qName) QNameToString::QNameToString() { - init_doctok(); init_ooxml(); } |