writerfilter/CustomTarget_source.mk | 14 -- writerfilter/Library_writerfilter.mk | 1 writerfilter/inc/pch/precompiled_writerfilter.hxx | 1 writerfilter/inc/resourcemodel/QNameToString.hxx | 1 writerfilter/source/dmapper/BorderHandler.cxx | 1 writerfilter/source/dmapper/CellColorHandler.cxx | 1 writerfilter/source/dmapper/CellMarginHandler.cxx | 1 writerfilter/source/dmapper/DomainMapper.cxx | 18 -- writerfilter/source/dmapper/DomainMapper_Impl.hxx | 1 writerfilter/source/dmapper/FontTable.cxx | 1 writerfilter/source/dmapper/GraphicImport.cxx | 1 writerfilter/source/dmapper/MeasureHandler.cxx | 1 writerfilter/source/dmapper/NumberingManager.cxx | 1 writerfilter/source/dmapper/OLEHandler.cxx | 1 writerfilter/source/dmapper/SectionColumnHandler.cxx | 1 writerfilter/source/dmapper/SettingsTable.cxx | 1 writerfilter/source/dmapper/StyleSheetTable.cxx | 20 --- writerfilter/source/dmapper/TDefTableHandler.cxx | 1 writerfilter/source/dmapper/TablePositionHandler.cxx | 93 +++++++------- writerfilter/source/dmapper/TablePositionHandler.hxx | 80 ++++++------ writerfilter/source/dmapper/ThemeTable.cxx | 1 writerfilter/source/doctok/qnametostr.xsl | 33 ----- writerfilter/source/doctok/resourceids.xsl | 104 ---------------- writerfilter/source/doctok/resources.xmi | 114 ------------------ writerfilter/source/doctok/resourcetools.xsl | 10 - writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 1 writerfilter/source/ooxml/factoryimpl.xsl | 1 writerfilter/source/ooxml/factoryimpl_ns.xsl | 1 writerfilter/source/resourcemodel/analyzerheader | 1 writerfilter/source/resourcemodel/qnametostrcore.cxx | 1 writerfilter/source/resourcemodel/sprmcodetostrheader | 1 writerfilter/source/rtftok/rtfdocumentimpl.cxx | 1 writerfilter/source/rtftok/rtfsprm.cxx | 1 33 files changed, 88 insertions(+), 422 deletions(-)
New commits: commit f72947d5f651216f1ee004bee7f271c9e21c22dc Author: Miklos Vajna <[email protected]> Date: Sat Jan 25 12:26:03 2014 +0100 writerfilter: whitespace fixes in TablePositionHandler Change-Id: I0d4a624ee75e701966a2694642d71483c6ec572f diff --git a/writerfilter/source/dmapper/TablePositionHandler.cxx b/writerfilter/source/dmapper/TablePositionHandler.cxx index 8201095..4c08bc9 100644 --- a/writerfilter/source/dmapper/TablePositionHandler.cxx +++ b/writerfilter/source/dmapper/TablePositionHandler.cxx @@ -16,19 +16,21 @@ #include <com/sun/star/text/RelOrientation.hpp> #include "dmapperLoggers.hxx" -namespace writerfilter { -namespace dmapper { +namespace writerfilter +{ +namespace dmapper +{ using namespace ::com::sun::star; TablePositionHandler::TablePositionHandler() : LoggedProperties(dmapper_logger, "TablePositionHandler"), - m_aVertAnchor( "margin" ), - m_aYSpec( ), - m_aHorzAnchor( "text" ), - m_aXSpec( ), - m_nY( 0 ), - m_nX( 0 ), + m_aVertAnchor("margin"), + m_aYSpec(), + m_aHorzAnchor("text"), + m_aXSpec(), + m_nY(0), + m_nX(0), m_nLeftFromText(0), m_nRightFromText(0), m_nTopFromText(0), @@ -45,41 +47,41 @@ void TablePositionHandler::lcl_attribute(Id rName, Value& rVal) { switch (rName) { - case NS_ooxml::LN_CT_TblPPr_vertAnchor: - m_aVertAnchor = rVal.getString(); + case NS_ooxml::LN_CT_TblPPr_vertAnchor: + m_aVertAnchor = rVal.getString(); break; - case NS_ooxml::LN_CT_TblPPr_tblpYSpec: - m_aYSpec = rVal.getString(); + case NS_ooxml::LN_CT_TblPPr_tblpYSpec: + m_aYSpec = rVal.getString(); break; - case NS_ooxml::LN_CT_TblPPr_horzAnchor: - m_aHorzAnchor = rVal.getString(); + case NS_ooxml::LN_CT_TblPPr_horzAnchor: + m_aHorzAnchor = rVal.getString(); break; - case NS_ooxml::LN_CT_TblPPr_tblpXSpec: - m_aXSpec = rVal.getString(); + case NS_ooxml::LN_CT_TblPPr_tblpXSpec: + m_aXSpec = rVal.getString(); break; - case NS_ooxml::LN_CT_TblPPr_tblpY: - m_nY = rVal.getInt(); + case NS_ooxml::LN_CT_TblPPr_tblpY: + m_nY = rVal.getInt(); break; - case NS_ooxml::LN_CT_TblPPr_tblpX: - m_nX = rVal.getInt(); + case NS_ooxml::LN_CT_TblPPr_tblpX: + m_nX = rVal.getInt(); break; - case NS_ooxml::LN_CT_TblPPr_leftFromText: - m_nLeftFromText = rVal.getInt(); + case NS_ooxml::LN_CT_TblPPr_leftFromText: + m_nLeftFromText = rVal.getInt(); break; - case NS_ooxml::LN_CT_TblPPr_rightFromText: - m_nRightFromText = rVal.getInt(); + case NS_ooxml::LN_CT_TblPPr_rightFromText: + m_nRightFromText = rVal.getInt(); break; - case NS_ooxml::LN_CT_TblPPr_topFromText: - m_nTopFromText = rVal.getInt(); + case NS_ooxml::LN_CT_TblPPr_topFromText: + m_nTopFromText = rVal.getInt(); break; - case NS_ooxml::LN_CT_TblPPr_bottomFromText: - m_nBottomFromText = rVal.getInt(); + case NS_ooxml::LN_CT_TblPPr_bottomFromText: + m_nBottomFromText = rVal.getInt(); break; - default: + default: #ifdef DEBUG_DOMAINMAPPER - dmapper_logger->element("unhandled"); + dmapper_logger->element("unhandled"); #endif - break; + break; } } @@ -124,23 +126,23 @@ uno::Sequence<beans::PropertyValue> TablePositionHandler::getTablePosition() con // Horizontal positioning sal_Int16 nHoriOrient = text::HoriOrientation::NONE; - if ( m_aXSpec == "center" ) + if (m_aXSpec == "center") nHoriOrient = text::HoriOrientation::CENTER; - else if ( m_aXSpec == "inside" ) + else if (m_aXSpec == "inside") nHoriOrient = text::HoriOrientation::INSIDE; - else if ( m_aXSpec == "left" ) + else if (m_aXSpec == "left") nHoriOrient = text::HoriOrientation::LEFT; - else if ( m_aXSpec == "outside" ) + else if (m_aXSpec == "outside") nHoriOrient = text::HoriOrientation::OUTSIDE; - else if ( m_aXSpec == "right" ) + else if (m_aXSpec == "right") nHoriOrient = text::HoriOrientation::RIGHT; sal_Int16 nHoriOrientRelation; - if ( m_aHorzAnchor == "margin" ) + if (m_aHorzAnchor == "margin") nHoriOrientRelation = text::RelOrientation::PAGE_PRINT_AREA; - else if ( m_aHorzAnchor == "page" ) + else if (m_aHorzAnchor == "page") nHoriOrientRelation = text::RelOrientation::PAGE_FRAME; - else if ( m_aHorzAnchor == "text" ) + else if (m_aHorzAnchor == "text") nHoriOrientRelation = text::RelOrientation::FRAME; pFrameProperties[12].Name = "HoriOrient"; @@ -153,21 +155,21 @@ uno::Sequence<beans::PropertyValue> TablePositionHandler::getTablePosition() con // Vertical positioning sal_Int16 nVertOrient = text::VertOrientation::NONE; - if ( m_aYSpec == "bottom" ) + if (m_aYSpec == "bottom") nVertOrient = text::VertOrientation::BOTTOM; - else if ( m_aYSpec == "center" ) + else if (m_aYSpec == "center") nVertOrient = text::VertOrientation::CENTER; - else if ( m_aYSpec == "top" ) + else if (m_aYSpec == "top") nVertOrient = text::VertOrientation::TOP; // TODO There are a few cases we can't map ATM. sal_Int16 nVertOrientRelation; - if ( m_aVertAnchor == "margin" ) + if (m_aVertAnchor == "margin") nVertOrientRelation = text::RelOrientation::PAGE_PRINT_AREA; - else if ( m_aVertAnchor == "page" ) + else if (m_aVertAnchor == "page") nVertOrientRelation = text::RelOrientation::PAGE_FRAME; - else if ( m_aVertAnchor == "text" ) + else if (m_aVertAnchor == "text") nVertOrientRelation = text::RelOrientation::FRAME; pFrameProperties[15].Name = "VertOrient"; diff --git a/writerfilter/source/dmapper/TablePositionHandler.hxx b/writerfilter/source/dmapper/TablePositionHandler.hxx index a264dff..bfd636e 100644 --- a/writerfilter/source/dmapper/TablePositionHandler.hxx +++ b/writerfilter/source/dmapper/TablePositionHandler.hxx @@ -14,45 +14,47 @@ #include <boost/shared_ptr.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -namespace writerfilter { - namespace dmapper { - - /// Handler for floating table positioning - class WRITERFILTER_DLLPRIVATE TablePositionHandler - : public LoggedProperties - { - OUString m_aVertAnchor; - OUString m_aYSpec; - OUString m_aHorzAnchor; - OUString m_aXSpec; - sal_Int32 m_nY; - sal_Int32 m_nX; - sal_Int32 m_nLeftFromText; - sal_Int32 m_nRightFromText; - sal_Int32 m_nTopFromText; - sal_Int32 m_nBottomFromText; - - // Properties - virtual void lcl_attribute(Id Name, Value & val); - virtual void lcl_sprm(Sprm & sprm); - - public: - TablePositionHandler(); - virtual ~TablePositionHandler(); - - /** Compute the UNO properties for the frame containing the table based - on the received tokens. - - Note that the properties will need to be adjusted with the table - properties before actually using them. - */ - com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> getTablePosition() const; - - bool operator== (const TablePositionHandler& rHandler) const; - }; - - typedef boost::shared_ptr<TablePositionHandler> TablePositionHandlerPtr; - } // namespace dmapper +namespace writerfilter +{ +namespace dmapper +{ + +/// Handler for floating table positioning +class WRITERFILTER_DLLPRIVATE TablePositionHandler + : public LoggedProperties +{ + OUString m_aVertAnchor; + OUString m_aYSpec; + OUString m_aHorzAnchor; + OUString m_aXSpec; + sal_Int32 m_nY; + sal_Int32 m_nX; + sal_Int32 m_nLeftFromText; + sal_Int32 m_nRightFromText; + sal_Int32 m_nTopFromText; + sal_Int32 m_nBottomFromText; + + // Properties + virtual void lcl_attribute(Id Name, Value& val); + virtual void lcl_sprm(Sprm& sprm); + +public: + TablePositionHandler(); + virtual ~TablePositionHandler(); + + /** Compute the UNO properties for the frame containing the table based + on the received tokens. + + Note that the properties will need to be adjusted with the table + properties before actually using them. + */ + com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> getTablePosition() const; + + bool operator== (const TablePositionHandler& rHandler) const; +}; + +typedef boost::shared_ptr<TablePositionHandler> TablePositionHandlerPtr; +} // namespace dmapper } // namespace writerfilter #endif commit 6de362e954ba2767d2970223add0173c8909483f Author: Miklos Vajna <[email protected]> Date: Sat Jan 25 12:10:59 2014 +0100 writerfilter: remove no longer needed generated qnametostr.cxx in doctok Change-Id: I47607894a5903266052cef012a55c9655cc90e89 diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk index ec5fb97..367928e 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 63bd1a5..9c88b38 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 dab7776..08da083 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 7af9441..0000000 --- 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="u rn: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 7ab6e84..c00dc9c 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 e43150a..81ba68e 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(); } commit da52cd209e4ce77ae5dc06866039fd0f0a28e778 Author: Miklos Vajna <[email protected]> Date: Sat Jan 25 12:05:01 2014 +0100 writerfilter: remove no longer needed generated resourceids.hxx in doctok Change-Id: I5777e4846daccfbd78fa8a4f47c313a225d7aed2 diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk index 2b4a7e7..ec5fb97 100644 --- a/writerfilter/CustomTarget_source.mk +++ b/writerfilter/CustomTarget_source.mk @@ -42,7 +42,6 @@ writerfilter_OOXMLNAMESPACES= \ wml writerfilter_ALL = \ - $(writerfilter_GEN_doctok_ResourceIds_hxx) \ $(writerfilter_GEN_doctok_QNameToStr_cxx) \ $(writerfilter_GEN_doctok_SprmIds_hxx) \ $(writerfilter_GEN_model_SprmCodeToStr_cxx) \ @@ -61,7 +60,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_ResourceIds_hxx=$(writerfilter_WORK)/doctok/resourceids.hxx 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 @@ -83,7 +81,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_QNameToStr_xsl=$(writerfilter_SRC)/doctok/qnametostr.xsl -writerfilter_SRC_doctok_ResourceIds_xsl=$(writerfilter_SRC)/doctok/resourceids.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 @@ -104,10 +101,6 @@ $(writerfilter_GEN_doctok_QNameToStr_cxx): $(writerfilter_SRC_doctok_QNameToStr_ $(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_ResourceIds_hxx) : $(writerfilter_SRC_doctok_Model) $(writerfilter_SRC_doctok_ResourceIds_xsl) | $(writerfilter_WORK)/doctok/.dir - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1) - $(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_doctok_ResourceIds_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/inc/pch/precompiled_writerfilter.hxx b/writerfilter/inc/pch/precompiled_writerfilter.hxx index 5d5af7d..651506d 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/resourceids.hxx> #include <doctok/sprmids.hxx> #include <editeng/borderline.hxx> #include <filter/msfilter/escherex.hxx> diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/writerfilter/source/dmapper/BorderHandler.cxx index c9280d5..876e743 100644 --- a/writerfilter/source/dmapper/BorderHandler.cxx +++ b/writerfilter/source/dmapper/BorderHandler.cxx @@ -20,7 +20,6 @@ #include <TDefTableHandler.hxx> #include <PropertyMap.hxx> #include <resourcemodel/QNameToString.hxx> -#include <doctok/resourceids.hxx> #include <ConversionHelper.hxx> #include <com/sun/star/table/BorderLine2.hpp> #include <ooxml/resourceids.hxx> diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx index ebd38b6..e4507a1 100644 --- a/writerfilter/source/dmapper/CellColorHandler.cxx +++ b/writerfilter/source/dmapper/CellColorHandler.cxx @@ -18,7 +18,6 @@ */ #include <CellColorHandler.hxx> #include <PropertyMap.hxx> -#include <doctok/resourceids.hxx> #include <ConversionHelper.hxx> #include <TDefTableHandler.hxx> #include <ooxml/resourceids.hxx> diff --git a/writerfilter/source/dmapper/CellMarginHandler.cxx b/writerfilter/source/dmapper/CellMarginHandler.cxx index a74e02b..eed5eaf 100644 --- a/writerfilter/source/dmapper/CellMarginHandler.cxx +++ b/writerfilter/source/dmapper/CellMarginHandler.cxx @@ -18,7 +18,6 @@ */ #include <CellMarginHandler.hxx> #include <PropertyMap.hxx> -#include <doctok/resourceids.hxx> #include <ConversionHelper.hxx> #include <ooxml/resourceids.hxx> #include "dmapperLoggers.hxx" diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index 11fa2e4..f5f1e97 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -32,7 +32,6 @@ #include <boost/optional.hpp> #ifndef INCLUDED_RESOURCESIDS -#include <doctok/resourceids.hxx> #include <ooxml/resourceids.hxx> #endif #include <dmapper/DomainMapper.hxx> diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx index f40c478..0ed3f3a 100644 --- a/writerfilter/source/dmapper/FontTable.cxx +++ b/writerfilter/source/dmapper/FontTable.cxx @@ -18,7 +18,6 @@ */ #include <FontTable.hxx> -#include <doctok/resourceids.hxx> #include <ooxml/resourceids.hxx> #include <vector> #include <osl/file.hxx> diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 6df518d..4fffad5 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -45,7 +45,6 @@ #include <rtl/ustrbuf.hxx> #include <dmapper/DomainMapper.hxx> -#include <doctok/resourceids.hxx> #include <ooxml/resourceids.hxx> #include <resourcemodel/ResourceModelHelper.hxx> diff --git a/writerfilter/source/dmapper/MeasureHandler.cxx b/writerfilter/source/dmapper/MeasureHandler.cxx index 329f5f1..11dc82b 100644 --- a/writerfilter/source/dmapper/MeasureHandler.cxx +++ b/writerfilter/source/dmapper/MeasureHandler.cxx @@ -18,7 +18,6 @@ */ #include <MeasureHandler.hxx> #include <PropertyMap.hxx> -#include <doctok/resourceids.hxx> #include <ConversionHelper.hxx> #include <ooxml/resourceids.hxx> #include <com/sun/star/text/SizeType.hpp> diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 5d2d573..60582c8 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/resourceids.hxx> #include <doctok/sprmids.hxx> #include <ooxml/resourceids.hxx> diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx index 44e4f4b..f9487e2 100644 --- a/writerfilter/source/dmapper/OLEHandler.cxx +++ b/writerfilter/source/dmapper/OLEHandler.cxx @@ -20,7 +20,6 @@ #include <PropertyMap.hxx> #include "GraphicHelpers.hxx" -#include <doctok/resourceids.hxx> #include <ooxml/resourceids.hxx> #include <rtl/ustring.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/writerfilter/source/dmapper/SectionColumnHandler.cxx b/writerfilter/source/dmapper/SectionColumnHandler.cxx index 28eca82..fce0b16 100644 --- a/writerfilter/source/dmapper/SectionColumnHandler.cxx +++ b/writerfilter/source/dmapper/SectionColumnHandler.cxx @@ -18,7 +18,6 @@ */ #include <SectionColumnHandler.hxx> #include <PropertyMap.hxx> -#include <doctok/resourceids.hxx> #include <ConversionHelper.hxx> #include <ooxml/resourceids.hxx> diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx index 3bbe5ef..f66a2c2 100644 --- a/writerfilter/source/dmapper/SettingsTable.cxx +++ b/writerfilter/source/dmapper/SettingsTable.cxx @@ -22,7 +22,6 @@ #include <resourcemodel/ResourceModelHelper.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <SettingsTable.hxx> -#include <doctok/resourceids.hxx> #include <ooxml/resourceids.hxx> #include <ConversionHelper.hxx> diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index f3c6f28..be6fbc0 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -24,7 +24,6 @@ #include <TblStylePrHandler.hxx> #include <BorderHandler.hxx> #include <LatentStyleHandler.hxx> -#include <doctok/resourceids.hxx> #include <ooxml/resourceids.hxx> #include <vector> #include <com/sun/star/beans/XMultiPropertySet.hpp> diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/writerfilter/source/dmapper/TDefTableHandler.cxx index fb40235..6f26d27 100644 --- a/writerfilter/source/dmapper/TDefTableHandler.cxx +++ b/writerfilter/source/dmapper/TDefTableHandler.cxx @@ -20,7 +20,6 @@ #include <PropertyMap.hxx> #include <ConversionHelper.hxx> #include <ooxml/resourceids.hxx> -#include <doctok/resourceids.hxx> #include <filter/msfilter/util.hxx> #include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/text/TableColumnSeparator.hpp> diff --git a/writerfilter/source/dmapper/TablePositionHandler.cxx b/writerfilter/source/dmapper/TablePositionHandler.cxx index e584a2e..8201095 100644 --- a/writerfilter/source/dmapper/TablePositionHandler.cxx +++ b/writerfilter/source/dmapper/TablePositionHandler.cxx @@ -9,7 +9,6 @@ #include <TablePositionHandler.hxx> #include <DomainMapperTableHandler.hxx> #include <PropertyMap.hxx> -#include <doctok/resourceids.hxx> #include <ConversionHelper.hxx> #include <ooxml/resourceids.hxx> #include <com/sun/star/text/HoriOrientation.hpp> diff --git a/writerfilter/source/dmapper/ThemeTable.cxx b/writerfilter/source/dmapper/ThemeTable.cxx index 5aa0ea0..52be4c2 100644 --- a/writerfilter/source/dmapper/ThemeTable.cxx +++ b/writerfilter/source/dmapper/ThemeTable.cxx @@ -18,7 +18,6 @@ */ #include <ThemeTable.hxx> -#include <doctok/resourceids.hxx> #include <ooxml/resourceids.hxx> #include "dmapperLoggers.hxx" diff --git a/writerfilter/source/doctok/qnametostr.xsl b/writerfilter/source/doctok/qnametostr.xsl index a101fb3..7af9441 100644 --- a/writerfilter/source/doctok/qnametostr.xsl +++ b/writerfilter/source/doctok/qnametostr.xsl @@ -22,7 +22,6 @@ <xsl:include href="resourcetools.xsl"/> <xsl:template match="/"> -#include "doctok/resourceids.hxx" #include "resourcemodel/QNameToString.hxx" namespace writerfilter diff --git a/writerfilter/source/doctok/resourceids.xsl b/writerfilter/source/doctok/resourceids.xsl deleted file mode 100644 index 6c00a77..0000000 --- a/writerfilter/source/doctok/resourceids.xsl +++ /dev/null @@ -1,104 +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="u rn: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" /> - - <!-- Key all attributes with the same name and same value --> - <xsl:key name="same-valued-tagged-data" - match="UML:TaggedValue.dataValue" use="." /> - - <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_RESOURCESIDS -#define INCLUDED_RESOURCESIDS - -#include <sal/types.h> -#include <resourcemodel/WW8ResourceModel.hxx> - -namespace writerfilter { - -namespace NS_rtf { - -/* Attributes */</xsl:text> -<xsl:for-each select='.//UML:Attribute[@name!="reserved"][count(.//UML:Stereotype[@xmi.idref="noqname"]) = 0]'> - <xsl:variable name="pos" select="position()"/> - <xsl:for-each select='.//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref="attrid"]'> - <xsl:choose> - <xsl:when test='generate-id(UML:TaggedValue.dataValue) != generate-id(key("same-valued-tagged-data", UML:TaggedValue.dataValue)[1])'/> - <!-- <xsl:when test='.//UML:TaggedValue.dataValue = preceding::*//UML:TaggedValue.dataValue'/>--> - <xsl:otherwise> - <xsl:text> -const Id </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:variable name="id" select="10000 + $pos"/> - <xsl:value-of select='$id'/> - <xsl:text>; // 0x</xsl:text> - <xsl:call-template name="dectohex"> - <xsl:with-param name="number" select="$id"/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:for-each> -</xsl:for-each> -<xsl:text> -} -} - -#endif // INCLUDED_RESOURCESIDS
</xsl:text></out> -</xsl:template> - -<xsl:template name='idtoqname'> - <xsl:param name='id'/>LN_<xsl:value-of select='substring-after($id, ":")'/> -</xsl:template> - -<xsl:template name='dectohex'> - <xsl:param name="number"/> - <xsl:if test="$number > 16"> - <xsl:call-template name="dectohex"> - <xsl:with-param name="number" select="floor($number div 16)"/> - </xsl:call-template> - </xsl:if> - <xsl:value-of select="substring('0123456789abcdef', $number mod 16 + 1, 1)"/> -</xsl:template> - -</xsl:stylesheet> diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx index 1993378..4b90d11 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx @@ -22,7 +22,6 @@ #include <com/sun/star/xml/sax/SAXException.hpp> #include <com/sun/star/xml/dom/DocumentBuilder.hpp> #include <com/sun/star/embed/XHierarchicalStorageAccess.hpp> -#include <doctok/resourceids.hxx> #include <ooxml/resourceids.hxx> #include "OOXMLStreamImpl.hxx" #include "OOXMLDocumentImpl.hxx" diff --git a/writerfilter/source/ooxml/factoryimpl.xsl b/writerfilter/source/ooxml/factoryimpl.xsl index c6a7b36..0ac9e56 100644 --- a/writerfilter/source/ooxml/factoryimpl.xsl +++ b/writerfilter/source/ooxml/factoryimpl.xsl @@ -346,7 +346,6 @@ uno::Reference < xml::sax::XFastParser > OOXMLStreamImpl::getFastParser() #include "ooxml/OOXMLFastHelper.hxx" #include "ooxml/OOXMLStreamImpl.hxx" #include "doctok/sprmids.hxx" -#include "doctok/resourceids.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 e92fda1..7105901 100644 --- a/writerfilter/source/ooxml/factoryimpl_ns.xsl +++ b/writerfilter/source/ooxml/factoryimpl_ns.xsl @@ -896,7 +896,6 @@ string </xsl:text> <xsl:variable name="ns" select="substring-before(substring-after($file, 'OOXMLFactory_'), '.cxx')"/> <xsl:text> #include "doctok/sprmids.hxx" -#include "doctok/resourceids.hxx" #include "ooxml/resourceids.hxx" #include "OOXMLFactory_values.hxx" #include "OOXMLFactory_</xsl:text> diff --git a/writerfilter/source/resourcemodel/analyzerheader b/writerfilter/source/resourcemodel/analyzerheader index e444811..ed14f50 100644 --- a/writerfilter/source/resourcemodel/analyzerheader +++ b/writerfilter/source/resourcemodel/analyzerheader @@ -16,7 +16,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <doctok/resourceids.hxx> #include <ooxml/resourceids.hxx> #include <resourcemodel/QNameToString.hxx> diff --git a/writerfilter/source/resourcemodel/sprmcodetostrheader b/writerfilter/source/resourcemodel/sprmcodetostrheader index 2086f39..70d7b80 100644 --- a/writerfilter/source/resourcemodel/sprmcodetostrheader +++ b/writerfilter/source/resourcemodel/sprmcodetostrheader @@ -16,7 +16,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <doctok/resourceids.hxx> #include <ooxml/resourceids.hxx> #include <resourcemodel/QNameToString.hxx> #include <doctok/sprmids.hxx> diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 0c6c8d5..9653a21 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -41,7 +41,6 @@ #include <oox/mathml/import.hxx> #include <doctok/sprmids.hxx> -#include <doctok/resourceids.hxx> #include <ooxml/resourceids.hxx> #include <ooxml/OOXMLFastTokens.hxx> #include <oox/token/namespaces.hxx> diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx index e9fc3ab..5bea3dd 100644 --- a/writerfilter/source/rtftok/rtfsprm.cxx +++ b/writerfilter/source/rtftok/rtfsprm.cxx @@ -11,7 +11,6 @@ #include <rtl/strbuf.hxx> #include <resourcemodel/QNameToString.hxx> -#include <doctok/resourceids.hxx> namespace writerfilter { commit da3cefa79472d14bea997fea14a85271dda4dccd Author: Miklos Vajna <[email protected]> Date: Sat Jan 25 11:52:30 2014 +0100 writerfilter: remove last unneeded resource class in doctok Change-Id: I66148f6bcce48418da598d843bdd1685190c15c6 diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 7b4d782..d095df8 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -191,24 +191,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) break; case NS_ooxml::LN_CT_AbstractNum_tmpl: break; - case NS_rtf::LN_STI: - break; - case NS_rtf::LN_FSCRATCH: - break; - case NS_rtf::LN_FINVALHEIGHT: - break; - case NS_rtf::LN_FHASUPE: - break; - case NS_rtf::LN_FMASSCOPY: - break; - case NS_rtf::LN_CUPX: - break; - case NS_rtf::LN_BCHUPE: - break; - case NS_rtf::LN_FAUTOREDEF: - break; - case NS_rtf::LN_FHIDDEN: - break; case NS_ooxml::LN_CT_Border_sz: break; case NS_ooxml::LN_CT_Border_val: diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index f698951..f3c6f28 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -419,25 +419,6 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val) } switch(Name) { - case NS_rtf::LN_STI: - { - OUString tempStyleIdentifier = GetStyleIdFromIndex(static_cast<sal_uInt32>(nIntValue)); - if (!tempStyleIdentifier.isEmpty()) - m_pImpl->m_pCurrentEntry->sStyleIdentifierI = tempStyleIdentifier; - if (nIntValue == 0 || nIntValue == 65) - m_pImpl->m_pCurrentEntry->bIsDefaultStyle = true; - } - break; - case NS_rtf::LN_FSCRATCH: - case NS_rtf::LN_FINVALHEIGHT: - case NS_rtf::LN_FHASUPE: - case NS_rtf::LN_FMASSCOPY: - case NS_rtf::LN_CUPX: - case NS_rtf::LN_BCHUPE: - case NS_rtf::LN_FAUTOREDEF: - case NS_rtf::LN_FHIDDEN: - //noone seems to care about it - break; case NS_ooxml::LN_CT_Style_type: { SAL_WARN_IF( m_pImpl->m_pCurrentEntry->nStyleTypeCode != STYLE_TYPE_UNKNOWN, diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index 434e984..343f8d7 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -162,120 +162,6 @@ </UML:ModelElement.stereotype> </UML:Class> <!--Resources--> - <!--WW8 resources--> - <!--Class Style--> - <UML:Class xmi.id="Style" name="Style"> - <UML:Classifier.feature> - <UML:Attribute name="sti"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:STI</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="attrid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Attribute> - </UML:Classifier.feature> - <UML:Classifier.feature> - <UML:Attribute name="fScratch"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:FSCRATCH</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="attrid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Attribute> - </UML:Classifier.feature> - <UML:Classifier.feature> - <UML:Attribute name="fInvalHeight"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:FINVALHEIGHT</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="attrid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Attribute> - </UML:Classifier.feature> - <UML:Classifier.feature> - <UML:Attribute name="fHasUpe"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:FHASUPE</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="attrid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Attribute> - </UML:Classifier.feature> - <UML:Classifier.feature> - <UML:Attribute name="fMassCopy"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:FMASSCOPY</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="attrid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Attribute> - </UML:Classifier.feature> - <UML:Classifier.feature> - <UML:Attribute name="cupx"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:CUPX</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="attrid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Attribute> - </UML:Classifier.feature> - <UML:Classifier.feature> - <UML:Attribute name="bchUpe"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:BCHUPE</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="attrid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Attribute> - </UML:Classifier.feature> - <UML:Classifier.feature> - <UML:Attribute name="fAutoRedef"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:FAUTOREDEF</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="attrid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Attribute> - </UML:Classifier.feature> - <UML:Classifier.feature> - <UML:Attribute name="fHidden"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:FHIDDEN</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="attrid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <!--Class Style--> - <!--WW8 resources--> <!--SPRMS--> <!--SPRM sprmPContextualSpacing--> <UML:Class xmi.id="sprmPContextualSpacing" name="sprmPContextualSpacing"> _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
