[Libreoffice-commits] core.git: 4 commits - writerfilter/CustomTarget_source.mk writerfilter/inc writerfilter/Library_writerfilter.mk writerfilter/README writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Sat Mar 8 03:26:56 PST 2014
writerfilter/CustomTarget_source.mk | 22
writerfilter/Library_writerfilter.mk | 1
writerfilter/README | 1
writerfilter/inc/pch/precompiled_writerfilter.hxx | 1
writerfilter/inc/resourcemodel/TableManager.hxx | 1
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 1
writerfilter/source/dmapper/NumberingManager.cxx | 1
writerfilter/source/dmapper/TablePropertiesHandler.cxx | 1
writerfilter/source/doctok/resources.xmi | 14
writerfilter/source/doctok/resourcetools.xsl | 386 ---------------
writerfilter/source/doctok/sprmcodetostr.xsl | 27 -
writerfilter/source/doctok/sprmids.xsl | 59 --
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 1
writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx | 3
writerfilter/source/ooxml/factoryimpl.xsl | 1
writerfilter/source/ooxml/factoryimpl_ns.xsl | 1
writerfilter/source/resourcemodel/sprmcodetostrheader | 1
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 1
writerfilter/source/rtftok/rtfsprm.cxx | 2
19 files changed, 525 deletions(-)
New commits:
commit 0859d3723931cc71e42fc6e8d68564e60d7c0c9c
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sat Mar 8 12:13:56 2014 +0100
writerfilter: remove no longer needed doctok/resources.xmi
Change-Id: Ieda9780452af21aef40b925eff6693b8098e91f7
diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk
index b562fbc..789a627 100644
--- a/writerfilter/CustomTarget_source.mk
+++ b/writerfilter/CustomTarget_source.mk
@@ -71,7 +71,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_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_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
diff --git a/writerfilter/README b/writerfilter/README
index 0b66f4b..0e8d1dc 100644
--- a/writerfilter/README
+++ b/writerfilter/README
@@ -11,7 +11,6 @@ Import filter for docx, doc and rtf.
== Source contents ==
* dmapper: the domain mapper, hiding UNO from the tokenizers, used by DOCX and RTF import
- * doctok: incomplete and unused ww8 (.doc) tokenizer
* filter: the UNO filter service implementations, invoked by UNO and calling
the dmapper + one of the tokenizers
* ooxml: the docx tokenizer
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
deleted file mode 100644
index f145cfab..0000000
--- a/writerfilter/source/doctok/resources.xmi
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<XMI xmlns:UML="org.omg.xmi.namespace.UML" xmi.version="1.2">
- <XMI.header>
- <XMI.documentation/>
- </XMI.header>
- <XMI.content>
- <UML:Model name="WW8Document">
- <UML:Namespace.ownedElement>
- <!--SPRMS-->
- <!--SPRMS-->
- </UML:Namespace.ownedElement>
- </UML:Model>
- </XMI.content>
-</XMI>
commit af5a4f4cb39eb8e5201d402bc5810d60e9ee72b8
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sat Mar 8 12:13:34 2014 +0100
writerfilter: remove no longer needed doctok/resourcetools.xsl
Change-Id: I378df2ddfc0912610b5f0d674c2a76601f4440c8
diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk
index e2a9732..b562fbc 100644
--- a/writerfilter/CustomTarget_source.mk
+++ b/writerfilter/CustomTarget_source.mk
@@ -72,7 +72,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_ResourceTools_xsl=$(writerfilter_SRC)/doctok/resourcetools.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
diff --git a/writerfilter/source/doctok/resourcetools.xsl b/writerfilter/source/doctok/resourcetools.xsl
deleted file mode 100644
index c00dc9c..0000000
--- a/writerfilter/source/doctok/resourcetools.xsl
+++ /dev/null
@@ -1,386 +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:template name='idtoqname'>
- <xsl:param name='id'/>
- <xsl:text>NS_</xsl:text>
- <xsl:value-of select='substring-before($id, ":")'/>
- <xsl:text>::LN_</xsl:text>
- <xsl:value-of select='substring-after($id, ":")'/>
-</xsl:template>
-
-<xsl:template name="parenttype">
- <xsl:param name='type'/>
- <xsl:for-each select='/XMI/XMI.content/UML:Model/UML:Namespace.ownedElement/UML:Generalization[UML:Generalization.child/UML:Class/@xmi.idref=$type]'>
- <xsl:value-of select='./UML:Generalization.parent/UML:Class/@xmi.idref'/>
- </xsl:for-each>
-</xsl:template>
-
-<xsl:template name='saltype'>
- <xsl:param name='type'/>
- <xsl:param name='parenttype'/>
- <xsl:choose>
- <xsl:when test="$type='U8'">sal_uInt8</xsl:when>
- <xsl:when test="$type='S8'">sal_Int8</xsl:when>
- <xsl:when test="$type='U16'">sal_uInt16</xsl:when>
- <xsl:when test="$type='S16'">sal_Int16</xsl:when>
- <xsl:when test="$type='U32'">sal_uInt32</xsl:when>
- <xsl:when test="$type='S32'">sal_Int32</xsl:when>
- <xsl:when test="$type='String'">OUString</xsl:when>
- <xsl:otherwise>
- <xsl:text>writerfilter::Reference < </xsl:text>
- <xsl:value-of select='$parenttype'/>
- <xsl:text> >::Pointer_t</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template name='typetype'>
- <xsl:param name='type'/><xsl:choose>
- <xsl:when test="$type='U8'">simple</xsl:when>
- <xsl:when test="$type='S8'">simple</xsl:when>
- <xsl:when test="$type='U16'">simple</xsl:when>
- <xsl:when test="$type='S16'">simple</xsl:when>
- <xsl:when test="$type='U32'">simple</xsl:when>
- <xsl:when test="$type='S32'">simple</xsl:when>
- <xsl:when test="$type='String'">string</xsl:when>
- <xsl:when test="$type='Binary'">binary</xsl:when>
- <xsl:otherwise>complex</xsl:otherwise>
-</xsl:choose>
-</xsl:template>
-
-<xsl:template name="valuetype">
- <xsl:param name="type"/>
- <xsl:choose>
- <xsl:when test='$type="U8"'>WW8IntValue</xsl:when>
- <xsl:when test='$type="S8"'>WW8IntValue</xsl:when>
- <xsl:when test='$type="U16"'>WW8IntValue</xsl:when>
- <xsl:when test='$type="S16"'>WW8IntValue</xsl:when>
- <xsl:when test='$type="U32"'>WW8IntValue</xsl:when>
- <xsl:when test='$type="S32"'>WW8IntValue</xsl:when>
- <xsl:otherwise>WW8PropertiesValue</xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="UML:Attribute" mode="valuetype">
- <xsl:call-template name="valuetype">
- <xsl:with-param name="type" select='.//UML:DataType/@xmi.idref'/>
- </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="qnametostrattrs">
- <xsl:text>
- /* Attributes */</xsl:text>
- <xsl:for-each select='.//UML:Attribute[@name!="reserved"]'>
- <xsl:for-each select='.//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref="attrid"]'>
- <xsl:choose>
- <xsl:when test='.//UML:Stereotype[@xmi.idref="noresolve"]'>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>
- mMap[</xsl:text>
- <xsl:call-template name='idtoqname'>
- <xsl:with-param name='id'><xsl:value-of select='.//UML:TaggedValue.dataValue'/></xsl:with-param>
- </xsl:call-template>
- <xsl:text>] = "</xsl:text>
- <xsl:value-of select='.//UML:TaggedValue.dataValue'/>
- <xsl:text>";</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </xsl:for-each>
-</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">
- <xsl:text>
-string qnameToString(sal_uInt32 nToken)
-{
- string sResult;
-
- switch (nToken)
- {
- // Attributes</xsl:text>
- <xsl:for-each select='.//UML:Attribute[@name!="reserved"]//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref="attrid"]'>
- <xsl:choose>
- <xsl:when test='.//UML:Stereotype[@xmi.idref="noresolve"]'>
- </xsl:when>
- <xsl:otherwise>
- <xsl:if test="generate-id(key('ids', .//UML:TaggedValue.dataValue)[1])=generate-id(.)">
- <xsl:text>
- case </xsl:text>
- <xsl:call-template name='idtoqname'>
- <xsl:with-param name='id'><xsl:value-of select='.//UML:TaggedValue.dataValue'/></xsl:with-param>
- </xsl:call-template>
- <xsl:text>:
- sResult = "</xsl:text>
- <xsl:value-of select='.//UML:TaggedValue.dataValue'/>
- <xsl:text>";
- break;</xsl:text>
- </xsl:if>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- <xsl:text>
- // Operations</xsl:text>
- <xsl:for-each select='.//UML:Operation[@name!="reserved"]//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref="opid"]'>
- <xsl:choose>
- <xsl:when test='.//UML:Stereotype[@xmi.idref="noresolve"]'>
- </xsl:when>
- <xsl:otherwise>
- <xsl:if test="generate-id(key('ids', .//UML:TaggedValue.dataValue)[1])=generate-id(.)">
- <xsl:text>
- case </xsl:text>
- <xsl:call-template name='idtoqname'>
- <xsl:with-param name='id'><xsl:value-of select='.//UML:TaggedValue.dataValue'/></xsl:with-param>
- </xsl:call-template>
- <xsl:text>:
- sResult = "</xsl:text>
- <xsl:value-of select='.//UML:TaggedValue.dataValue'/>
- <xsl:text>";
- break;</xsl:text>
- </xsl:if>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- <xsl:text>
- // Classes:</xsl:text>
- <xsl:for-each select='.//UML:Class[@name!="reserved"]//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref="classid"]'>
- <xsl:text>
- case </xsl:text>
- <xsl:call-template name='idtoqname'>
- <xsl:with-param name='id'><xsl:value-of select='.//UML:TaggedValue.dataValue'/></xsl:with-param>
- </xsl:call-template>
- <xsl:text>:
- sResult = "</xsl:text>
- <xsl:value-of select='.//UML:TaggedValue.dataValue'/>
- <xsl:text>";
- break;</xsl:text>
- </xsl:for-each>
- <xsl:text>
- default:
- ;
- }
-
- return sResult;
-}</xsl:text>
-</xsl:template>
-
-<xsl:template match='UML:Model' mode='sprmcodetostr'>
-<xsl:text>
-SprmIdToString::SprmIdToString()
-{</xsl:text>
-<xsl:variable name='tmp'>map < sal_uInt32, string > </xsl:variable>
-<xsl:for-each select='.//UML:Class[.//UML:Stereotype/@xmi.idref="ww8sprm"]'>
- <xsl:variable name="sprmconst">
- <xsl:call-template name="sprmCodeOfClass"/>
- </xsl:variable>
- <xsl:text>
- mMap[</xsl:text>
- <xsl:value-of select="$sprmconst"/>
- <xsl:text>] = "</xsl:text>
- <xsl:value-of select='.//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref="sprmid"]//UML:TaggedValue.dataValue'/>
- <xsl:text>";</xsl:text>
-</xsl:for-each>
-<xsl:text>
-}
-</xsl:text>
-</xsl:template>
-
-<xsl:key name="classes-with-kind" match="UML:TagDefinition[@xmi.idref='kind']"
- use="ancestor::UML:TaggedValue/UML:TaggedValue.dataValue"/>
-
-<xsl:template name="sprmCodeOfClass">
- <xsl:variable name="tmp">
- <xsl:text>sprm:</xsl:text>
- <xsl:value-of select="substring-after(@name, 'sprm')"/>
- </xsl:variable>
- <xsl:call-template name="idtoqname">
- <xsl:with-param name="id" select="$tmp"/>
- </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="sprmkindcase">
- <xsl:param name="kind"/>
- <xsl:for-each select="key('classes-with-kind', $kind)/ancestor::UML:Class">
- <xsl:text>
- case </xsl:text>
- <xsl:call-template name="sprmCodeOfClass"/>
- <xsl:text>:</xsl:text>
- </xsl:for-each>
-</xsl:template>
-
-<xsl:template match="UML:Model" mode='sprmkind'>
-<xsl:text>
-Sprm::Kind SprmKind(sal_uInt32 sprmCode)
-{
- Sprm::Kind nResult = Sprm::UNKNOWN;
-
- switch(sprmCode)
- {</xsl:text>
- <xsl:call-template name="sprmkindcase">
- <xsl:with-param name="kind">paragraph</xsl:with-param>
- </xsl:call-template>
- <xsl:text>
- nResult = Sprm::PARAGRAPH;
- break;</xsl:text>
- <xsl:call-template name="sprmkindcase">
- <xsl:with-param name="kind">character</xsl:with-param>
- </xsl:call-template>
- <xsl:text>
- nResult = Sprm::CHARACTER;
- break;</xsl:text>
- <xsl:call-template name="sprmkindcase">
- <xsl:with-param name="kind">table</xsl:with-param>
- </xsl:call-template>
- <xsl:text>
- nResult = Sprm::TABLE;
- break;</xsl:text>
- <xsl:text>
- default:
- break;
- }
-
- return nResult;
-}
-</xsl:text>
-</xsl:template>
-
-<xsl:template match="UML:Model" mode='sprmids'>
- <xsl:text>
-namespace NS_sprm { </xsl:text>
- <xsl:for-each select=".//UML:Class[.//UML:Stereotype/@xmi.idref='ww8sprm']">
- <xsl:variable name="sprmcode">
- <xsl:value-of select=".//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref = 'sprmcode']/UML:TaggedValue.dataValue"/>
- </xsl:variable>
- <xsl:variable name="sprmcodelower">
- <xsl:value-of select="translate($sprmcode, 'ABCDEF', 'abcdef')"/>
- </xsl:variable>
- <xsl:variable name="sprmidname">
- <xsl:text>LN_</xsl:text>
- <xsl:value-of select="substring-after(@name, 'sprm')"/>
- </xsl:variable>
- <xsl:text>
- const sal_uInt16 </xsl:text>
- <xsl:value-of select="$sprmidname"/>
- <xsl:text> = </xsl:text>
- <xsl:value-of select="$sprmcodelower"/>
- <xsl:text>;</xsl:text>
- </xsl:for-each>
- <xsl:text>
-}
-</xsl:text>
-</xsl:template>
-
-<xsl:template match="UML:Model" mode='sprmidsed'>
- <xsl:text>#!/bin/sh
- cat $1 \
</xsl:text>
- <xsl:for-each select=".//UML:Class[.//UML:Stereotype/@xmi.idref='ww8sprm']">
- <xsl:variable name="sprmcode">
- <xsl:value-of select=".//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref = 'sprmcode']/UML:TaggedValue.dataValue"/>
- </xsl:variable>
- <xsl:variable name="sprmcodelower">
- <xsl:value-of select="translate($sprmcode, 'ABCDEF', 'abcdef')"/>
- </xsl:variable>
- <xsl:variable name="sprmidname">
- <xsl:text>NS_sprm::LN_</xsl:text>
- <xsl:value-of select="substring-after(@name, 'sprm')"/>
- </xsl:variable>
- <xsl:text>| sed "s/</xsl:text>
-<xsl:value-of select="$sprmcode"/>
-<xsl:text>/</xsl:text>
-<xsl:value-of select="$sprmidname"/>
-<xsl:text>/g" \
</xsl:text>
- <xsl:text>| sed "s/</xsl:text>
-<xsl:value-of select="$sprmcodelower"/>
-<xsl:text>/</xsl:text>
-<xsl:value-of select="$sprmidname"/>
-<xsl:text>/g" \
</xsl:text>
- </xsl:for-each>
- <xsl:text> | cat
</xsl:text>
-</xsl:template>
-
-<xsl:template match="UML:Model" mode='sprmreplace'>
- <xsl:for-each select=".//UML:Class[.//UML:Stereotype/@xmi.idref='ww8sprm']">
- <xsl:variable name="pattern">
- <xsl:value-of select=".//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref = 'sprmcode']/UML:TaggedValue.dataValue"/>
- </xsl:variable>
- <xsl:variable name="lowerpattern">
- <xsl:value-of select="translate($pattern, 'ABCDEF', 'abcdef')"/>
- </xsl:variable>
- <xsl:variable name="upperpattern">
- <xsl:value-of select="translate($pattern, 'abcdef', 'ABCDEF')"/>
- </xsl:variable>
- <xsl:variable name="tmp">
- <xsl:text>sprm:</xsl:text>
- <xsl:value-of select="substring-after(@name, 'sprm')"/>
- </xsl:variable>
- <xsl:variable name="constname">
- <xsl:call-template name="idtoqname">
- <xsl:with-param name="id" select="$tmp"/>
- </xsl:call-template>
- </xsl:variable>
- <xsl:text>
-sed "s/</xsl:text>
- <xsl:value-of select="$lowerpattern"/>
- <xsl:text>/</xsl:text>
- <xsl:value-of select="$constname"/>
- <xsl:text>/g" < $1 > $1.out && mv $1.out $1 </xsl:text>
- <xsl:text>
-sed "s/</xsl:text>
- <xsl:value-of select="$upperpattern"/>
- <xsl:text>/</xsl:text>
- <xsl:value-of select="$constname"/>
- <xsl:text>/g" < $1 > $1.out && mv $1.out $1 </xsl:text>
- </xsl:for-each>
- <xsl:text>
</xsl:text>
-</xsl:template>
-
-<!-- Key all attributes with the same name and same value -->
-<xsl:key name="same-valued-tagged-data"
- match="UML:TaggedValue.dataValue" use="." />
-
- <xsl:template name="licenseheader">
- <xsl:text>
-/*
- * 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 .
- */
-/*
- THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT!
- */
-
</xsl:text>
- </xsl:template>
-</xsl:stylesheet>
commit 64b08929557ea10f74a2e960db9d67e70b63dceb
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sat Mar 8 12:13:15 2014 +0100
writerfilter: remove no longer needed doctok/sprmcodetostr.xsl
Change-Id: I4dcb2a6e73b95054204e31a3a54eedad2689db2c
diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk
index ebe232c..e2a9732 100644
--- a/writerfilter/CustomTarget_source.mk
+++ b/writerfilter/CustomTarget_source.mk
@@ -44,7 +44,6 @@ writerfilter_OOXMLNAMESPACES= \
wml
writerfilter_ALL = \
- $(writerfilter_GEN_model_SprmCodeToStr_cxx) \
$(writerfilter_GEN_ooxml_Factory_cxx) \
$(writerfilter_GEN_ooxml_Factory_hxx) \
$(writerfilter_GEN_ooxml_FactoryValues_hxx) \
@@ -54,13 +53,10 @@ writerfilter_ALL = \
$(writerfilter_GEN_ooxml_QNameToStr_cxx) \
$(writerfilter_GEN_ooxml_ResourceIds_hxx) \
$(writerfilter_GEN_ooxml_Model_processed) \
- $(writerfilter_GEN_model_SprmCodeToStr_tmp) \
$(patsubst %,$(writerfilter_WORK)/OOXMLFactory_%.hxx,$(writerfilter_OOXMLNAMESPACES)) \
$(patsubst %,$(writerfilter_WORK)/OOXMLFactory_%.cxx,$(writerfilter_OOXMLNAMESPACES)) \
writerfilter_DEP_ooxml_Namespaces_txt=$(call gb_CustomTarget_get_workdir,oox/generated)/misc/namespaces.txt
-writerfilter_GEN_model_SprmCodeToStr_cxx=$(writerfilter_WORK)/sprmcodetostr.cxx
-writerfilter_GEN_model_SprmCodeToStr_tmp=$(writerfilter_WORK)/sprmcodetostr.tmp
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
@@ -77,7 +73,6 @@ 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_ResourceTools_xsl=$(writerfilter_SRC)/doctok/resourcetools.xsl
-writerfilter_SRC_doctok_SprmCodeToStr_xsl=$(writerfilter_SRC)/doctok/sprmcodetostr.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
@@ -90,14 +85,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_model_SprmCodeToStr_cxx): $(writerfilter_SRC)/resourcemodel/sprmcodetostrheader $(writerfilter_GEN_model_SprmCodeToStr_tmp) $(writerfilter_SRC)/resourcemodel/sprmcodetostrfooter
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CAT,1)
- cat $^ > $@
-
-$(writerfilter_GEN_model_SprmCodeToStr_tmp) : $(writerfilter_SRC_doctok_SprmCodeToStr_xsl) $(writerfilter_SRC_doctok_Model) | $(writerfilter_WORK)/.dir
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
- $(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_doctok_SprmCodeToStr_xsl) $(writerfilter_SRC_doctok_Model)) > $@
-
$(writerfilter_GEN_ooxml_Factory_cxx) : $(writerfilter_SRC)/ooxml/factoryimpl.xsl $(writerfilter_GEN_ooxml_Model_processed)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $< $(writerfilter_GEN_ooxml_Model_processed)) > $@
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index 592970e..9ba4aff 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -154,7 +154,6 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\
$(eval $(call gb_Library_add_generated_exception_objects,writerfilter,\
$(patsubst %,CustomTarget/writerfilter/source/OOXMLFactory_%,$(writerfilter_OOXMLNAMESPACES)) \
CustomTarget/writerfilter/source/OOXMLFactory_generated \
- CustomTarget/writerfilter/source/sprmcodetostr \
CustomTarget/writerfilter/source/ooxml/qnametostr \
))
diff --git a/writerfilter/source/doctok/sprmcodetostr.xsl b/writerfilter/source/doctok/sprmcodetostr.xsl
deleted file mode 100644
index fdf5a26..0000000
--- a/writerfilter/source/doctok/sprmcodetostr.xsl
+++ /dev/null
@@ -1,27 +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="/">
- <xsl:apply-templates select=".//UML:Model" mode="sprmcodetostr"/>
-</xsl:template>
-</xsl:stylesheet>
diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
index 6d227af1..15027b5 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
@@ -111,9 +111,6 @@ string OOXMLPropertyImpl::getName() const
string sResult = (*QNameToString::Instance())(mId);
if (sResult.length() == 0)
- sResult = (*SprmIdToString::Instance())(mId);
-
- if (sResult.length() == 0)
sResult = fastTokenToId(mId);
if (sResult.length() == 0)
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx
index f27e10e..e794391 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -62,8 +62,6 @@ std::string RTFSprm::toString() const
OStringBuffer aBuf("RTFSprm");
std::string sResult = (*QNameToString::Instance())(m_nKeyword);
- if (sResult.length() == 0)
- sResult = (*SprmIdToString::Instance())(m_nKeyword);
aBuf.append(" ('");
if (sResult.length() == 0)
commit 55a40edf5afa6db3e0117a598bbb761958c88807
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sat Mar 8 12:12:45 2014 +0100
writerfilter: remove no longer needed doctok/sprmids.xsl
Change-Id: Ia846d279ea5a4d375f8eb3736a0aabd419a07382
diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk
index b3ecff3..ebe232c 100644
--- a/writerfilter/CustomTarget_source.mk
+++ b/writerfilter/CustomTarget_source.mk
@@ -44,7 +44,6 @@ writerfilter_OOXMLNAMESPACES= \
wml
writerfilter_ALL = \
- $(writerfilter_GEN_doctok_SprmIds_hxx) \
$(writerfilter_GEN_model_SprmCodeToStr_cxx) \
$(writerfilter_GEN_ooxml_Factory_cxx) \
$(writerfilter_GEN_ooxml_Factory_hxx) \
@@ -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_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_hxx=$(writerfilter_WORK)/OOXMLFactory_values.hxx
@@ -80,7 +78,6 @@ writerfilter_GEN_ooxml_Token_xml=$(writerfilter_WORK)/token.xml
writerfilter_SRC_doctok_Model=$(writerfilter_SRC)/doctok/resources.xmi
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
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
@@ -93,10 +90,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_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)) > $@
-
$(writerfilter_GEN_model_SprmCodeToStr_cxx): $(writerfilter_SRC)/resourcemodel/sprmcodetostrheader $(writerfilter_GEN_model_SprmCodeToStr_tmp) $(writerfilter_SRC)/resourcemodel/sprmcodetostrfooter
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CAT,1)
cat $^ > $@
diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx b/writerfilter/inc/pch/precompiled_writerfilter.hxx
index 8a05443..e08d1beb 100644
--- a/writerfilter/inc/pch/precompiled_writerfilter.hxx
+++ b/writerfilter/inc/pch/precompiled_writerfilter.hxx
@@ -160,7 +160,6 @@
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include <doctok/sprmids.hxx>
#include <editeng/borderline.hxx>
#include <filter/msfilter/escherex.hxx>
#include <filter/msfilter/util.hxx>
diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx b/writerfilter/inc/resourcemodel/TableManager.hxx
index 68e6573..648748c 100644
--- a/writerfilter/inc/resourcemodel/TableManager.hxx
+++ b/writerfilter/inc/resourcemodel/TableManager.hxx
@@ -24,7 +24,6 @@
#include <resourcemodel/WW8ResourceModel.hxx>
-#include <doctok/sprmids.hxx>
#include <ooxml/resourceids.hxx>
#include <boost/shared_ptr.hpp>
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 29d28b4..103befa 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -31,7 +31,6 @@
#include <com/sun/star/text/VertOrientation.hpp>
#include <com/sun/star/text/WritingMode2.hpp>
#include <ooxml/resourceids.hxx>
-#include <doctok/sprmids.hxx>
#include <dmapperLoggers.hxx>
namespace writerfilter {
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 856fbeb..553c024 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -21,7 +21,6 @@
#include "StyleSheetTable.hxx"
#include "PropertyIds.hxx"
-#include <doctok/sprmids.hxx>
#include <ooxml/resourceids.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index 4b48b7c..3bd1768 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -28,7 +28,6 @@
#include "DomainMapperTableManager.hxx"
#include <ooxml/resourceids.hxx>
-#include <doctok/sprmids.hxx>
#include <com/sun/star/text/SizeType.hpp>
#include <com/sun/star/text/VertOrientation.hpp>
diff --git a/writerfilter/source/doctok/sprmids.xsl b/writerfilter/source/doctok/sprmids.xsl
deleted file mode 100644
index 22f7183..0000000
--- a/writerfilter/source/doctok/sprmids.xsl
+++ /dev/null
@@ -1,59 +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="/">
- <out>
- <xsl:text>
-/*
- * 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 .
- */
-/*
- THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT!
- */
-#ifndef INCLUDED_SPRMIDS
-#define INCLUDED_SPRMIDS
-
-#include <sal/types.h>
-
-</xsl:text>
-<xsl:apply-templates select=".//UML:Model" mode="sprmids"/>
-<xsl:text>
-
-#endif // INCLUDED_SPRMIDS
</xsl:text>
- </out>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index e75e151..b735441 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -27,7 +27,6 @@
#include <resourcemodel/XPathLogger.hxx>
#include <resourcemodel/util.hxx>
#include <ooxml/resourceids.hxx>
-#include <doctok/sprmids.hxx>
#include <oox/token/namespaces.hxx>
#include <ooxml/OOXMLnamespaceids.hxx>
#include <dmapper/DomainMapper.hxx>
diff --git a/writerfilter/source/ooxml/factoryimpl.xsl b/writerfilter/source/ooxml/factoryimpl.xsl
index fe45620..8695c1c 100644
--- a/writerfilter/source/ooxml/factoryimpl.xsl
+++ b/writerfilter/source/ooxml/factoryimpl.xsl
@@ -347,7 +347,6 @@ uno::Reference < xml::sax::XFastParser > OOXMLStreamImpl::getFastParser()
#include "ooxml/OOXMLFactory.hxx"
#include "ooxml/OOXMLFastHelper.hxx"
#include "ooxml/OOXMLStreamImpl.hxx"
-#include "doctok/sprmids.hxx"
</xsl:text>
<xsl:call-template name="factoryincludes"/>
<xsl:text>
diff --git a/writerfilter/source/ooxml/factoryimpl_ns.xsl b/writerfilter/source/ooxml/factoryimpl_ns.xsl
index 6e3e998..8d5f565 100644
--- a/writerfilter/source/ooxml/factoryimpl_ns.xsl
+++ b/writerfilter/source/ooxml/factoryimpl_ns.xsl
@@ -898,7 +898,6 @@ string </xsl:text>
<xsl:template match="/">
<xsl:variable name="ns" select="substring-before(substring-after($file, 'OOXMLFactory_'), '.cxx')"/>
<xsl:text>
-#include "doctok/sprmids.hxx"
#include "ooxml/resourceids.hxx"
#include "OOXMLFactory_values.hxx"
#include "OOXMLFactory_</xsl:text>
diff --git a/writerfilter/source/resourcemodel/sprmcodetostrheader b/writerfilter/source/resourcemodel/sprmcodetostrheader
index 70d7b80..7df97a4 100644
--- a/writerfilter/source/resourcemodel/sprmcodetostrheader
+++ b/writerfilter/source/resourcemodel/sprmcodetostrheader
@@ -18,7 +18,6 @@
#include <ooxml/resourceids.hxx>
#include <resourcemodel/QNameToString.hxx>
-#include <doctok/sprmids.hxx>
namespace writerfilter
{
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 7887865..cdb77b5 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -41,7 +41,6 @@
#include <sfx2/sfxbasemodel.hxx>
#include <oox/mathml/import.hxx>
-#include <doctok/sprmids.hxx>
#include <ooxml/resourceids.hxx>
#include <ooxml/OOXMLFastTokens.hxx>
#include <oox/token/namespaces.hxx>
More information about the Libreoffice-commits
mailing list