diff options
author | Jan Holesovsky <kendy@collabora.com> | 2014-02-11 14:52:44 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2014-02-13 12:58:53 +0100 |
commit | f48d1df73bc3f777c178d6856f7dc2922265e08b (patch) | |
tree | dbd5859e219841dff9f09ce76b687931d9c6cbac | |
parent | 08aa1c83c7c5b1a244f0d70c9cfe368b99e0d5d2 (diff) |
writerfilter: Get rid of a whole load of static OUStrings.
Change-Id: Ic5b254d1e6579baf2c9acdd24ddbaa95d554cf68
-rw-r--r-- | writerfilter/CustomTarget_source.mk | 7 | ||||
-rw-r--r-- | writerfilter/source/ooxml/factory_values.xsl | 31 | ||||
-rw-r--r-- | writerfilter/source/ooxml/factoryimpl_values.xsl | 82 |
3 files changed, 16 insertions, 104 deletions
diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk index 61744c7c990f..0824258d12ce 100644 --- a/writerfilter/CustomTarget_source.mk +++ b/writerfilter/CustomTarget_source.mk @@ -47,7 +47,6 @@ writerfilter_ALL = \ $(writerfilter_GEN_model_SprmCodeToStr_cxx) \ $(writerfilter_GEN_ooxml_Factory_cxx) \ $(writerfilter_GEN_ooxml_Factory_hxx) \ - $(writerfilter_GEN_ooxml_FactoryValues_cxx) \ $(writerfilter_GEN_ooxml_FactoryValues_hxx) \ $(writerfilter_GEN_ooxml_FastTokens_hxx) \ $(writerfilter_GEN_ooxml_GperfFastToken_hxx) \ @@ -63,7 +62,6 @@ writerfilter_DEP_ooxml_Namespaces_txt=$(call gb_CustomTarget_get_workdir,oox/gen 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 -writerfilter_GEN_ooxml_FactoryValues_cxx=$(writerfilter_WORK)/OOXMLFactory_values.cxx writerfilter_GEN_ooxml_FactoryValues_hxx=$(writerfilter_WORK)/OOXMLFactory_values.hxx writerfilter_GEN_ooxml_Factory_cxx=$(writerfilter_WORK)/OOXMLFactory_generated.cxx writerfilter_GEN_ooxml_Factory_hxx=$(writerfilter_WORK)/OOXMLFactory_generated.hxx @@ -85,7 +83,6 @@ writerfilter_SRC_doctok_SprmIds_xsl=$(writerfilter_SRC)/doctok/sprmids.xsl 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_FactoryValuesImpl_xsl=$(writerfilter_SRC)/ooxml/factoryimpl_values.xsl writerfilter_SRC_ooxml_FactoryValues_xsl=$(writerfilter_SRC)/ooxml/factory_values.xsl writerfilter_SRC_ooxml_FastTokens_xsl=$(writerfilter_SRC)/ooxml/fasttokens.xsl writerfilter_SRC_ooxml_GperfFastTokenHandler_xsl=$(writerfilter_SRC)/ooxml/gperffasttokenhandler.xsl @@ -115,10 +112,6 @@ $(writerfilter_GEN_ooxml_Factory_hxx) : $(writerfilter_SRC)/ooxml/factoryinc.xsl $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1) $(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $< $(writerfilter_GEN_ooxml_Model_processed)) > $@ -$(writerfilter_GEN_ooxml_FactoryValues_cxx) : $(writerfilter_SRC_ooxml_FactoryValuesImpl_xsl) $(writerfilter_GEN_ooxml_Model_processed) - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1) - $(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_ooxml_FactoryValuesImpl_xsl) $(writerfilter_GEN_ooxml_Model_processed)) > $@ - $(writerfilter_GEN_ooxml_FactoryValues_hxx) : $(writerfilter_SRC_ooxml_FactoryValues_xsl) $(writerfilter_GEN_ooxml_Model_processed) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1) $(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_ooxml_FactoryValues_xsl) $(writerfilter_GEN_ooxml_Model_processed)) > $@ diff --git a/writerfilter/source/ooxml/factory_values.xsl b/writerfilter/source/ooxml/factory_values.xsl index 1d8b37832344..5f76b22a1def 100644 --- a/writerfilter/source/ooxml/factory_values.xsl +++ b/writerfilter/source/ooxml/factory_values.xsl @@ -54,22 +54,23 @@ <!-- Generates constant declarations for attribute values. --> - <xsl:template name="valueconstantdecls"> - <xsl:text> -extern OUString - </xsl:text> - <xsl:call-template name="valuestringname"> - <xsl:with-param name="string"></xsl:with-param> - </xsl:call-template> - <xsl:text>;</xsl:text> - <xsl:for-each select="//rng:value[generate-id(key('value-with-content', text())[1]) = generate-id(.)]"> - <xsl:text> -extern OUString </xsl:text> + <xsl:template name="valueconstants"> + <xsl:text>#define </xsl:text> <xsl:call-template name="valuestringname"> - <xsl:with-param name="string" select="."/> + <xsl:with-param name="string"></xsl:with-param> </xsl:call-template> - <xsl:text>;</xsl:text> - </xsl:for-each> + <xsl:text> "" +</xsl:text> + <xsl:for-each select="//rng:value[generate-id(key('value-with-content', text())[1]) = generate-id(.)]"> + <xsl:text>#define </xsl:text> + <xsl:call-template name="valuestringname"> + <xsl:with-param name="string" select="."/> + </xsl:call-template> + <xsl:text> "</xsl:text> + <xsl:value-of select="."/> + <xsl:text>" +</xsl:text> + </xsl:for-each> </xsl:template> <xsl:template match="/"> @@ -77,7 +78,7 @@ extern OUString </xsl:text> #ifndef INCLUDED_FACTORY_VALUES</xsl:text> #include <rtl/ustring.hxx> -<xsl:call-template name="valueconstantdecls"/> +<xsl:call-template name="valueconstants"/> <xsl:text> #endif // INCLUDED_FACTORY_VALUES
</xsl:text> </xsl:template> diff --git a/writerfilter/source/ooxml/factoryimpl_values.xsl b/writerfilter/source/ooxml/factoryimpl_values.xsl deleted file mode 100644 index 886553d1b4da..000000000000 --- a/writerfilter/source/ooxml/factoryimpl_values.xsl +++ /dev/null @@ -1,82 +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:rng="http://relaxng.org/ns/structure/1.0" - 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:param name="prefix"/> - - <xsl:include href="factorytools.xsl"/> - - <!-- - Generates constant definitions for attribute values. - --> - <xsl:template name="valueconstants"> - <xsl:text> -OUString </xsl:text> -<xsl:call-template name="valuestringname"> - <xsl:with-param name="string"></xsl:with-param> -</xsl:call-template> -<xsl:text>("");</xsl:text> -<xsl:for-each select="//rng:value[generate-id(key('value-with-content', text())[1]) = generate-id(.)]"> - <xsl:text> -OUString </xsl:text> -<xsl:call-template name="valuestringname"> - <xsl:with-param name="string" select="."/> -</xsl:call-template> -<xsl:text>("</xsl:text> -<xsl:value-of select="."/> -<xsl:text>");</xsl:text> -</xsl:for-each> - </xsl:template> - - <xsl:template match="/"> - <xsl:text> -#include "OOXMLFactory_values.hxx"</xsl:text> -<xsl:call-template name="valueconstants"/> -<xsl:text>
</xsl:text> - </xsl:template> -</xsl:stylesheet> |