writerfilter/source/dmapper/BorderHandler.cxx | 13 writerfilter/source/dmapper/CellColorHandler.cxx | 6 writerfilter/source/dmapper/DomainMapper.cxx | 29 - writerfilter/source/dmapper/GraphicImport.cxx | 20 writerfilter/source/dmapper/StyleSheetTable.cxx | 5 writerfilter/source/dmapper/TDefTableHandler.cxx | 17 writerfilter/source/doctok/resourceids.xsl | 25 - writerfilter/source/doctok/resources.xmi | 507 ----------------------- writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 2 writerfilter/source/ooxml/model.xml | 1 writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 11 files changed, 5 insertions(+), 622 deletions(-)
New commits: commit fb30c9ed78e12493de9b50eac85db7ff490a8670 Author: Miklos Vajna <[email protected]> Date: Sat Jan 4 15:10:27 2014 +0100 writerfilter: remove unused operations section from doctok/resourceids.hxx Change-Id: I82d552757fa89c43dbce6df2637e703db436565f diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 233ffc4..55e512e 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -251,7 +251,6 @@ public: bool bSizeProtected; bool bPositionProtected; - bool bInShapeOptionMode; sal_Int32 nShapeOptionType; OUString sName; @@ -311,7 +310,6 @@ public: ,bVertFlip(false) ,bSizeProtected(false) ,bPositionProtected(false) - ,bInShapeOptionMode(false) {} void setXSize(sal_Int32 _nXSize) @@ -457,7 +455,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val) case NS_rtf::LN_LCB: break;//byte count case NS_rtf::LN_CBHEADER: break;//ignored case NS_rtf::LN_MFP: //MetafilePict - case NS_rtf::LN_shpopt: //shape options case NS_rtf::LN_shpfbse: //BLIP store entry case NS_rtf::LN_BRCTOP: //top border case NS_rtf::LN_BRCLEFT: //left border @@ -479,9 +476,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val) case NS_rtf::LN_BRCRIGHT: //right border m_pImpl->nCurrentBorderLine = BORDER_RIGHT; break; - case NS_rtf::LN_shpopt: - m_pImpl->bInShapeOptionMode = true; - break; default:; } writerfilter::Reference<Properties>::Pointer_t pProperties = val.getProperties(); @@ -489,13 +483,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val) { pProperties->resolve(*this); } - switch(nName) - { - case NS_rtf::LN_shpopt: - m_pImpl->bInShapeOptionMode = false; - break; - default:; - } } break; case NS_rtf::LN_payload : diff --git a/writerfilter/source/doctok/resourceids.xsl b/writerfilter/source/doctok/resourceids.xsl index 435cbce..6c00a77 100644 --- a/writerfilter/source/doctok/resourceids.xsl +++ b/writerfilter/source/doctok/resourceids.xsl @@ -81,31 +81,6 @@ const Id </xsl:text> </xsl:for-each> </xsl:for-each> <xsl:text> - -/* Operations */</xsl:text> -<xsl:for-each select='.//UML:Operation[@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="opid"]'> - <xsl:choose> - <xsl:when test='generate-id(UML:TaggedValue.dataValue) != generate-id(key("same-valued-tagged-data", UML:TaggedValue.dataValue)[1])'/> - <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="20000 + $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> } } diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index 62bb341..cde5930 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -38339,71 +38339,6 @@ </UML:Generalization.parent> </UML:Generalization> <!--DFF FSPGR--> - <!--DFF OPT--> - <UML:Class xmi.id="OPT" name="OPT"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>0xf00b</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="dffid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:Classifier.feature> - <UML:Operation name="property"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:shpopt</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="opid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:BehavioralFeature.parameter> - <UML:Parameter kind="return" name="return"> - <UML:Parameter.type> - <UML:Class xmi.idref="FOPTE"/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="array"/> - </UML:ModelElement.stereotype> - </UML:Operation> - <UML:Operation name="extraoffset"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:shpoptextraoffset</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="opid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:BehavioralFeature.parameter> - <UML:Parameter kind="return" name="return"> - <UML:Parameter.type> - <UML:Class xmi.idref="U32"/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="array"/> - </UML:ModelElement.stereotype> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="noresolve"/> - </UML:ModelElement.stereotype> - </UML:Operation> - </UML:Classifier.feature> - </UML:Class> - <UML:Generalization isSpecification="false" xmi.id="OPT-Properties"> - <UML:Generalization.child> - <UML:Class xmi.idref="OPT"/> - </UML:Generalization.child> - <UML:Generalization.parent> - <UML:Class xmi.idref="Properties"/> - </UML:Generalization.parent> - </UML:Generalization> - <!--DFF OPT--> <!--DFF FSP--> <UML:Class xmi.id="FSP" name="FSP"> <UML:ModelElement.taggedValue> commit 24096f480206888610cba0e6dde8ceb86a6b141e Author: Miklos Vajna <[email protected]> Date: Sat Jan 4 15:01:58 2014 +0100 writerfilter: move LN_blip to the NS_ooxml namespace It was confusing, this token is only produced by the ooxml tokenizer, still the token was in the rtf namespace. Change-Id: I1aeea8f4943bbb91a07daec5ddbe01d364f6fb11 diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 5e49e38..c143c8c 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -1172,7 +1172,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) case NS_ooxml::LN_CT_TblBorders_bottom: // 92379; //todo: handle cell mar break; - case NS_rtf::LN_blip: // contains the binary graphic + case NS_ooxml::LN_blip: // contains the binary graphic case NS_ooxml::LN_shape: { //looks a bit like a hack - and it is. The graphic import is split into the inline_inline part and diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index f9a6cfd..233ffc4 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -463,7 +463,7 @@ void GraphicImport::lcl_attribute(Id nName, Value & val) case NS_rtf::LN_BRCLEFT: //left border case NS_rtf::LN_BRCBOTTOM: //bottom border case NS_rtf::LN_BRCRIGHT: //right border - case NS_rtf::LN_blip: //the binary graphic data in a shape + case NS_ooxml::LN_blip: //the binary graphic data in a shape { switch(nName) { diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index f27a1b5..62bb341 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -39586,48 +39586,6 @@ </UML:Generalization.parent> </UML:Generalization> <!--DFF BlipDib--> - <!--DFF SpContainer--> - <UML:Class xmi.id="SpContainer" name="SpContainer"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>0xf004</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="dffid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:Classifier.feature> - <UML:Operation name="blip"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:blip</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="opid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:BehavioralFeature.parameter> - <UML:Parameter kind="return" name="return"> - <UML:Parameter.type> - <UML:Class xmi.idref="BSE"/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="attribute"/> - </UML:ModelElement.stereotype> - </UML:Operation> - </UML:Classifier.feature> - </UML:Class> - <UML:Generalization isSpecification="false" xmi.id="SpContainer-Properties"> - <UML:Generalization.child> - <UML:Class xmi.idref="SpContainer"/> - </UML:Generalization.child> - <UML:Generalization.parent> - <UML:Class xmi.idref="Properties"/> - </UML:Generalization.parent> - </UML:Generalization> - <!--DFF SpContainer--> <!--DFF Dg--> <UML:Class xmi.id="Dg" name="Dg"> <UML:ModelElement.taggedValue> diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx index a5847ea..cf4de5c 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx @@ -345,7 +345,7 @@ OOXMLPropertySet * OOXMLDocumentImpl::getPicturePropSet OOXMLValue::Pointer_t pBlipValue(new OOXMLPropertySetValue(pBlipSet)); OOXMLProperty::Pointer_t pBlipProperty - (new OOXMLPropertyImpl(NS_rtf::LN_blip, pBlipValue, + (new OOXMLPropertyImpl(NS_ooxml::LN_blip, pBlipValue, OOXMLPropertyImpl::ATTRIBUTE)); OOXMLPropertySet * pProps = new OOXMLPropertySetImpl(); diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index a7fbee9..a2ad47f 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -45,6 +45,7 @@ <token tokenid="ooxml:tblEnd"/> <token tokenid="ooxml:ffdata"/> <token tokenid="ooxml:starmath"/> + <token tokenid="ooxml:blip"/> <namespace name="dml-stylesheet" url="http://schemas.openxmlformats.org/drawingml/2006/main"; file="dml-stylesheet.rng"> <start name="theme"/> <start name="themeOverride"/> commit d4048a83443900a4b54271489a145ef0b6d7bf1d Author: Miklos Vajna <[email protected]> Date: Sat Jan 4 14:52:50 2014 +0100 writerfilter: stop producing NS_rtf::LN_XSTZNAME1 in rtftok The already existing NS_ooxml::LN_CT_Style_name token does what we need as well, remove unnecessary duplication. Change-Id: I348001925dba126f8f3dc7fef01e9bd503288b69 diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 699dea5..5e49e38 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -732,8 +732,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) m_pImpl->AddBookmark( sLocalBookmarkName, sStringValue ); sLocalBookmarkName = OUString(); break; - case NS_rtf::LN_XSTZNAME1: - break; case NS_rtf::LN_TLC: //tab leading characters - for decimal tabs case NS_rtf::LN_JC: diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 97a1ade..f55d804 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -455,11 +455,6 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val) case NS_rtf::LN_UNUSED8_3: //noone seems to care about it break; - case NS_rtf::LN_XSTZNAME1: - m_pImpl->m_pCurrentEntry->sStyleName = sValue; - if (!m_pImpl->m_pCurrentEntry->sStyleIdentifierI.isEmpty()) - m_pImpl->m_pCurrentEntry->sStyleIdentifierI = sValue; - 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 9f49d22..f27a1b5 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -3365,18 +3365,6 @@ </UML:ModelElement.taggedValue> </UML:Attribute> </UML:Classifier.feature> - <UML:Classifier.feature> - <UML:Operation name="xstzName1"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:XSTZNAME1</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="opid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Operation> - </UML:Classifier.feature> </UML:Class> <!--Class Style--> <!--Class Fib--> diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index c229edc..b8506c5 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -1057,7 +1057,7 @@ void RTFDocumentImpl::text(OUString& rString) if (m_aStates.top().aTableAttributes.find(NS_rtf::LN_SGC)) { RTFValue::Pointer_t pValue(new RTFValue(m_aStates.top().aDestinationText.makeStringAndClear())); - m_aStates.top().aTableAttributes.set(NS_rtf::LN_XSTZNAME1, pValue); + m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Style_name, pValue); writerfilter::Reference<Properties>::Pointer_t const pProp( new RTFReferenceProperties(mergeAttributes(), mergeSprms()) commit 660127241f23bf1d665b1a3b64e0f16155488d9b Author: Miklos Vajna <[email protected]> Date: Sat Jan 4 13:50:28 2014 +0100 writerfilter: unused rtf{cellLeftColor,cellRightColor,shpblipbname,shptypename} Change-Id: I9210c756d47afa5c7a79fab7bfbcd32c7fe95798 diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx index ab4b847..ebd38b6 100644 --- a/writerfilter/source/dmapper/CellColorHandler.cxx +++ b/writerfilter/source/dmapper/CellColorHandler.cxx @@ -102,10 +102,6 @@ void CellColorHandler::lcl_attribute(Id rName, Value & rVal) sal_Int32 nIntValue = rVal.getInt(); switch( rName ) { - case NS_rtf::LN_cellLeftColor: - case NS_rtf::LN_cellRightColor: - // nIntValue contains the color, directly - break; case NS_ooxml::LN_CT_Shd_val: { createGrabBag("val", lcl_ConvertShd(nIntValue)); diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 668fe4b..699dea5 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -743,11 +743,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) case NS_rtf::LN_UNUSED0_6: // really unused break; - case NS_rtf::LN_cellLeftColor: - case NS_rtf::LN_cellRightColor: - OSL_FAIL("handled by DomainMapperTableManager"); - break; - case NS_ooxml::LN_NUMBERING: break; case NS_ooxml::LN_FONTTABLE: diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 39f1977e..f9a6cfd 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -624,8 +624,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val) break;// Background shape case NS_rtf::LN_shpfHaveSpt: break;// Shape has a shape type property - case NS_rtf::LN_shptypename: - break;// shape type name case NS_rtf::LN_shpfBid: break; //ignored case NS_rtf::LN_shpfComplex: @@ -656,9 +654,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val) break; //border properties - case NS_rtf::LN_shpblipbname : - break; - case NS_ooxml::LN_CT_Border_sz: m_pImpl->aBorders[m_pImpl->nCurrentBorderLine].nLineWidth = nIntValue; break; diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index 4ec3e23..9f49d22 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -34951,36 +34951,6 @@ </UML:TaggedValue.type> </UML:TaggedValue> </UML:ModelElement.taggedValue> - <UML:Classifier.feature> - <UML:Operation name="cellLeftColor"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:cellLeftColor</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="opid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:BehavioralFeature.parameter> - <UML:Parameter kind="return" name="return"> - <UML:Parameter.type> - <UML:Class xmi.idref="U32"/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="array"/> - </UML:ModelElement.stereotype> - </UML:Operation> - </UML:Classifier.feature> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>table</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="kind"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> </UML:Class> <UML:Generalization isSpecification="false" xmi.id="sprmTCellLeftColor-Properties"> <UML:Generalization.child> @@ -35043,36 +35013,6 @@ </UML:TaggedValue.type> </UML:TaggedValue> </UML:ModelElement.taggedValue> - <UML:Classifier.feature> - <UML:Operation name="cellRightColor"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:cellRightColor</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="opid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:BehavioralFeature.parameter> - <UML:Parameter kind="return" name="return"> - <UML:Parameter.type> - <UML:Class xmi.idref="U32"/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="array"/> - </UML:ModelElement.stereotype> - </UML:Operation> - </UML:Classifier.feature> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>table</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="kind"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> </UML:Class> <UML:Generalization isSpecification="false" xmi.id="sprmTCellRightColor-Properties"> <UML:Generalization.child> @@ -35614,36 +35554,6 @@ </UML:TaggedValue.type> </UML:TaggedValue> </UML:ModelElement.taggedValue> - <UML:Classifier.feature> - <UML:Operation name="cellShadow"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:CELLSHADOW</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="opid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:BehavioralFeature.parameter> - <UML:Parameter kind="return" name="return"> - <UML:Parameter.type> - <UML:Class xmi.idref="CellShd"/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="array"/> - </UML:ModelElement.stereotype> - </UML:Operation> - </UML:Classifier.feature> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>table</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="kind"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> </UML:Class> <UML:Generalization isSpecification="false" xmi.id="sprmTCellShadow-Properties"> <UML:Generalization.child> @@ -38575,28 +38485,6 @@ </UML:Attribute> </UML:Classifier.feature> <UML:Classifier.feature> - <UML:Operation name="shptypename"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:shptypename</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="opid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:BehavioralFeature.parameter> - <UML:Parameter kind="return" name="return"> - <UML:Parameter.type> - <UML:Class xmi.idref="String"/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="attribute"/> - </UML:ModelElement.stereotype> - </UML:Operation> - </UML:Classifier.feature> - <UML:Classifier.feature> <UML:Attribute name="shpid"> <UML:ModelElement.taggedValue> <UML:TaggedValue> @@ -39586,52 +39474,6 @@ </UML:ModelElement.stereotype> </UML:Attribute> </UML:Classifier.feature> - <UML:Classifier.feature> - <UML:Operation name="blipname"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:shpblipbname</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="opid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:BehavioralFeature.parameter> - <UML:Parameter kind="return" name="return"> - <UML:Parameter.type> - <UML:Class xmi.idref="String"/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="attribute"/> - </UML:ModelElement.stereotype> - </UML:Operation> - </UML:Classifier.feature> - <!-- - <UML:Classifier.feature> - <UML:Operation name="binary"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:binary</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="opid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:BehavioralFeature.parameter> - <UML:Parameter kind="return" name="return"> - <UML:Parameter.type> - <UML:Class xmi.idref="Binary"/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="binary"/> - </UML:ModelElement.stereotype> - </UML:Operation> - </UML:Classifier.feature> - --> </UML:Class> <UML:Generalization isSpecification="false" xmi.id="BSE-Properties"> <UML:Generalization.child> commit c1e9629ce1565b32df5068bff0625c02394bed10 Author: Miklos Vajna <[email protected]> Date: Sat Jan 4 12:47:33 2014 +0100 writerfilter: drop unused rtf:{shd,cellShd,cellTopColor,cellBottomColor} Change-Id: Idd8449eeb86965f2a684641b3290a7d915b6bc74 diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx index 4204b5b..ab4b847 100644 --- a/writerfilter/source/dmapper/CellColorHandler.cxx +++ b/writerfilter/source/dmapper/CellColorHandler.cxx @@ -102,9 +102,7 @@ void CellColorHandler::lcl_attribute(Id rName, Value & rVal) sal_Int32 nIntValue = rVal.getInt(); switch( rName ) { - case NS_rtf::LN_cellTopColor: case NS_rtf::LN_cellLeftColor: - case NS_rtf::LN_cellBottomColor: case NS_rtf::LN_cellRightColor: // nIntValue contains the color, directly break; diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 67de581..668fe4b 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -743,13 +743,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) case NS_rtf::LN_UNUSED0_6: // really unused break; - case NS_rtf::LN_shd: - break; - case NS_rtf::LN_cellShd: - break; - case NS_rtf::LN_cellTopColor: case NS_rtf::LN_cellLeftColor: - case NS_rtf::LN_cellBottomColor: case NS_rtf::LN_cellRightColor: OSL_FAIL("handled by DomainMapperTableManager"); break; diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index d972815..4ec3e23 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -33642,28 +33642,6 @@ </UML:TaggedValue.type> </UML:TaggedValue> </UML:ModelElement.taggedValue> - <UML:Classifier.feature> - <UML:Operation name="shd"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:shd</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="opid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:BehavioralFeature.parameter> - <UML:Parameter kind="return" name="return"> - <UML:Parameter.type> - <UML:Class xmi.idref="SHD"/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="array"/> - </UML:ModelElement.stereotype> - </UML:Operation> - </UML:Classifier.feature> <UML:ModelElement.taggedValue> <UML:TaggedValue> <UML:TaggedValue.dataValue>table</UML:TaggedValue.dataValue> @@ -33703,36 +33681,6 @@ </UML:TaggedValue.type> </UML:TaggedValue> </UML:ModelElement.taggedValue> - <UML:Classifier.feature> - <UML:Operation name="shd"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:cellShd</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="opid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:BehavioralFeature.parameter> - <UML:Parameter kind="return" name="return"> - <UML:Parameter.type> - <UML:Class xmi.idref="CellShd"/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="array"/> - </UML:ModelElement.stereotype> - </UML:Operation> - </UML:Classifier.feature> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>table</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="kind"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> </UML:Class> <UML:Generalization isSpecification="false" xmi.id="sprmTCelShd-Properties"> <UML:Generalization.child> @@ -34964,28 +34912,6 @@ </UML:TaggedValue.type> </UML:TaggedValue> </UML:ModelElement.taggedValue> - <UML:Classifier.feature> - <UML:Operation name="cellTopColor"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:cellTopColor</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="opid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:BehavioralFeature.parameter> - <UML:Parameter kind="return" name="return"> - <UML:Parameter.type> - <UML:Class xmi.idref="U32"/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="array"/> - </UML:ModelElement.stereotype> - </UML:Operation> - </UML:Classifier.feature> <UML:ModelElement.taggedValue> <UML:TaggedValue> <UML:TaggedValue.dataValue>table</UML:TaggedValue.dataValue> @@ -35086,36 +35012,6 @@ </UML:TaggedValue.type> </UML:TaggedValue> </UML:ModelElement.taggedValue> - <UML:Classifier.feature> - <UML:Operation name="cellBottomColor"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:cellBottomColor</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="opid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:BehavioralFeature.parameter> - <UML:Parameter kind="return" name="return"> - <UML:Parameter.type> - <UML:Class xmi.idref="U32"/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="array"/> - </UML:ModelElement.stereotype> - </UML:Operation> - </UML:Classifier.feature> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>table</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="kind"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> </UML:Class> <UML:Generalization isSpecification="false" xmi.id="sprmTCellBottomColor-Properties"> <UML:Generalization.child> commit cf0c282f03c5b0e86745a1cbec5665fb297e5a9d Author: Miklos Vajna <[email protected]> Date: Sat Jan 4 12:27:33 2014 +0100 writerfilter: drop unused rtf:{tbdAdd,rgbrc,cellx,tc} tokens Change-Id: I269c2ca52f4b7f724138d74ef0ca43ea9360002e diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/writerfilter/source/dmapper/BorderHandler.cxx index 0becb84..8749a7a 100644 --- a/writerfilter/source/dmapper/BorderHandler.cxx +++ b/writerfilter/source/dmapper/BorderHandler.cxx @@ -58,19 +58,6 @@ void BorderHandler::lcl_attribute(Id rName, Value & rVal) sal_Int32 nIntValue = rVal.getInt(); switch( rName ) { - case NS_rtf::LN_rgbrc: - { - writerfilter::Reference<Properties>::Pointer_t pProperties = rVal.getProperties(); - if( pProperties.get()) - { - pProperties->resolve(*this); - ConversionHelper::MakeBorderLine( m_nLineWidth, m_nLineType, m_nLineColor, - m_aBorderLines[m_nCurrentBorderPosition], m_bOOXML ); - OSL_ENSURE(m_nCurrentBorderPosition < BORDER_COUNT, "too many border values"); - ++m_nCurrentBorderPosition; - } - } - break; case NS_ooxml::LN_CT_Border_sz: // width of a single line in 1/8 pt, max of 32 pt -> twip * 5 / 2. m_nLineWidth = nIntValue * 5 / 2; diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 320750e..67de581 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -734,18 +734,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) break; case NS_rtf::LN_XSTZNAME1: break; - case NS_rtf::LN_tbdAdd: - // - { - writerfilter::Reference<Properties>::Pointer_t pProperties = val.getProperties(); - if( pProperties.get()) - { - pProperties->resolve(*this); - //increment to the next tab stop - m_pImpl->NextTabStop(); - } - } - break; case NS_rtf::LN_TLC: //tab leading characters - for decimal tabs case NS_rtf::LN_JC: @@ -755,8 +743,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) case NS_rtf::LN_UNUSED0_6: // really unused break; - case NS_rtf::LN_rgbrc: - break; case NS_rtf::LN_shd: break; case NS_rtf::LN_cellShd: diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/writerfilter/source/dmapper/TDefTableHandler.cxx index d1892f1..9f3b58d 100644 --- a/writerfilter/source/dmapper/TDefTableHandler.cxx +++ b/writerfilter/source/dmapper/TDefTableHandler.cxx @@ -283,23 +283,6 @@ void TDefTableHandler::lcl_attribute(Id rName, Value & rVal) (void)rName; switch( rName ) { - case NS_rtf::LN_cellx: - // nIntValue contains the vert. line position - //TODO: nIntValue is wrong for negative values! - if( nIntValue > 0x7fff ) - nIntValue -= 0xffff; - m_aCellBorderPositions.push_back( ConversionHelper::convertTwipToMM100( nIntValue ) ); - break; - case NS_rtf::LN_tc: - { - writerfilter::Reference<Properties>::Pointer_t pProperties = rVal.getProperties(); - if( pProperties.get()) - { - pProperties->resolve( *this ); - } - } - break; - //from LN_tc case NS_rtf::LN_FFIRSTMERGED: case NS_rtf::LN_FMERGED: case NS_rtf::LN_FVERTICAL: diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index b5655e7..d972815 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -27198,44 +27198,6 @@ </UML:TaggedValue.type> </UML:TaggedValue> </UML:ModelElement.taggedValue> - <UML:Classifier.feature> - <UML:Operation name="tbdAdd"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:tbdAdd</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="opid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>array of tab descriptors corresponding to rgdxaAdd</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="comment"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:BehavioralFeature.parameter> - <UML:Parameter kind="return" name="return"> - <UML:Parameter.type> - <UML:Class xmi.idref="TBD"/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="array"/> - </UML:ModelElement.stereotype> - </UML:Operation> - </UML:Classifier.feature> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>paragraph</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="kind"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> </UML:Class> <!--SPRM sprmPChgTabsPapx--> <!--SPRM sprmPDxaRight--> @@ -33564,45 +33526,7 @@ </UML:TaggedValue.type> </UML:TaggedValue> </UML:ModelElement.taggedValue> - <UML:Classifier.feature> - <UML:Operation name="rgbbrc"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:rgbrc</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="opid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:BehavioralFeature.parameter> - <UML:Parameter kind="return" name="return"> - <UML:Parameter.type> - <UML:Class xmi.idref="BRC"/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="array"/> - </UML:ModelElement.stereotype> - </UML:Operation> - </UML:Classifier.feature> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>table</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="kind"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> </UML:Class> - <UML:Generalization isSpecification="false" xmi.id="sprmTTableBorders-Properties"> - <UML:Generalization.child> - <UML:Class xmi.idref="sprmTTableBorders"/> - </UML:Generalization.child> - <UML:Generalization.parent> - <UML:Class xmi.idref="Properties"/> - </UML:Generalization.parent> - </UML:Generalization> <!--SPRM sprmTTableBorders--> <!--SPRM sprmTDefTable10--> <UML:Class xmi.id="sprmTDefTable10" name="sprmTDefTable10"> @@ -33687,56 +33611,6 @@ </UML:TaggedValue.type> </UML:TaggedValue> </UML:ModelElement.taggedValue> - <UML:Classifier.feature> - <UML:Operation name="cellx"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:cellx</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="opid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:BehavioralFeature.parameter> - <UML:Parameter kind="return" name="return"> - <UML:Parameter.type> - <UML:Class xmi.idref="U16"/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="array"/> - </UML:ModelElement.stereotype> - </UML:Operation> - <UML:Operation name="tc"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:tc</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="opid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:BehavioralFeature.parameter> - <UML:Parameter kind="return" name="return"> - <UML:Parameter.type> - <UML:Class xmi.idref="TC"/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="array"/> - </UML:ModelElement.stereotype> - </UML:Operation> - </UML:Classifier.feature> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>table</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="kind"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> </UML:Class> <UML:Generalization isSpecification="false" xmi.id="sprmTDefTable-Properties"> <UML:Generalization.child> _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
