[Libreoffice-commits] core.git: 4 commits - writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Wed Jan 1 06:53:56 PST 2014
writerfilter/source/dmapper/DomainMapper.cxx | 34
writerfilter/source/dmapper/FontTable.cxx | 6
writerfilter/source/dmapper/FontTable.hxx | 1
writerfilter/source/dmapper/GraphicImport.cxx | 3
writerfilter/source/dmapper/NumberingManager.cxx | 1
writerfilter/source/dmapper/StyleSheetTable.cxx | 16
writerfilter/source/dmapper/StyleSheetTable.hxx | 1
writerfilter/source/doctok/resources.xmi | 1966 ++++-------------------
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2
9 files changed, 364 insertions(+), 1666 deletions(-)
New commits:
commit c48ecfaf2b31f6dd64b6c779ed3a076a7efbc113
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed Jan 1 15:24:19 2014 +0100
writerfilter: drop unused rtf:{ICOFORE,ICOBACK,IPAT,shptxt} tokens
Change-Id: Ib228c985d0d276fccfa77b9c2dac3ba69522a05e
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 3588e55..93f6e6d 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -567,12 +567,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
m_pImpl->GetFIB().SetData( nName, nIntValue );
}
break;
- case NS_rtf::LN_ICOFORE:
- break;
- case NS_rtf::LN_ICOBACK:
- break;
- case NS_rtf::LN_IPAT:
- break;
case NS_rtf::LN_SHDFORECOLOR:
break;
case NS_rtf::LN_SHDBACKCOLOR:
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 52aa764..5d35976 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -811,9 +811,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
case NS_rtf::LN_FANCHORLOCK:
case NS_rtf::LN_CTXBX:
break;
- case NS_rtf::LN_shptxt:
- //todo: text content
- break;
case NS_rtf::LN_dffheader: break;
case NS_ooxml::LN_CT_PositiveSize2D_cx:// 90407;
case NS_ooxml::LN_CT_PositiveSize2D_cy:// 90408;
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index bec560e..8813862 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -20335,254 +20335,6 @@
</UML:Generalization.parent>
</UML:Generalization>
<!--Class BKD-->
- <!--Class SHD-->
- <UML:Class xmi.id="SHD" name="SHD">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>2</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="size"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:Classifier.feature>
- <UML:Attribute name="icoFore">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>foreground color (see chp.ico)</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>001F</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>:5</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:ICOFORE</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="U16"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
- <UML:Attribute name="icoBack">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>background color (see chp.ico)</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>5</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>03E0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>:5</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:ICOBACK</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="U16"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
- <UML:Attribute name="ipat">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>shading pattern (see ipat table below)
- 0 Automatic
- 1 Solid
- 2 5 Percent
- 3 10 Percent
- 4 20 Percent
- 5 25 Percent
- 6 30 Percent
- 7 40 Percent
- 8 50 Percent
- 9 60 Percent
- 10 70 Percent
- 11 75 Percent
- 12 80 Percent
- 13 90 Percent
- 14 Dark Horizontal
- 15 Dark Vertical
- 16 Dark Forward Diagonal
- 17 Dark Backward Diagonal
- 18 Dark Cross
- 19 Dark Diagonal Cross
- 20 Horizontal
- 21 Vertical
- 22 Forward Diagonal
- 23 Backward Diagonal
- 24 Cross
- 25 Diagonal Cross
- 35 2.5 Percent
- 36 7.5 Percent
- 37 12.5 Percent
- 38 15 Percent
- 39 17.5 Percent
- 40 22.5 Percent
- 41 27.5 Percent
- 42 32.5 Percent
- 43 35 Percent
- 44 37.5 Percent
- 45 42.5 Percent
- 46 45 Percent
- 47 47.5 Percent
- 48 52.5 Percent
- 49 55 Percent
- 50 57.5 Percent
- 51 62.5 Percent
- 52 65 Percent
- 53 67.5 Percent
- 54 72.5 Percent
- 55 77.5 Percent
- 56 82.5 Percent
- 57 85 Percent
- 58 87.5 Percent
- 59 92.5 Percent
- 60 95 Percent
- 61 97.5 Percent
- 62 97 Percent</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>10</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>FC00</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>:6</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:IPAT</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="U16"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- </UML:Class>
- <UML:Generalization isSpecification="false" xmi.id="SHD-Properties">
- <UML:Generalization.child>
- <UML:Class xmi.idref="SHD"/>
- </UML:Generalization.child>
- <UML:Generalization.parent>
- <UML:Class xmi.idref="Properties"/>
- </UML:Generalization.parent>
- </UML:Generalization>
- <!--Class SHD-->
<!--Class CellShd-->
<UML:Class xmi.id="CellShd" name="CellShd">
<UML:ModelElement.stereotype>
@@ -22417,511 +22169,16 @@
</UML:Generalization.child>
<UML:Generalization.parent>
<UML:Class xmi.idref="Properties"/>
- </UML:Generalization.parent>
- </UML:Generalization>
- <!--Class TBD-->
- <!--Class METAFILEPICT-->
- <UML:Class xmi.id="METAFILEPICT" name="METAFILEPICT">
- <UML:Classifier.feature>
- <UML:Attribute name="mm">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>Specifies the mapping mode in which the picture is drawn. </UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:MM</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="S16"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
- <UML:Attribute name="xExt">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>Specifies the size of the metafile picture for all modes except
- the MM_ISOTROPIC and MM_ANISOTROPIC modes. (For more information
- about these modes, see the yExt member.) The x-extent specifies the
- width of the rectangle within which the picture is drawn. The
- coordinates are in units that correspond to the mapping mode.</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x2</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:XEXT</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="S16"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
- <UML:Attribute name="yExt">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>Specifies the size of the metafile picture for all modes except
- the MM_ISOTROPIC and MM_ANISOTROPIC modes. The y-extent specifies
- the height of the rectangle within which the picture is drawn. The
- coordinates are in units that correspond to the mapping mode.
- For MM_ISOTROPIC and MM_ANISOTROPIC modes, which can be scaled,
- the xExt and yExt members contain an optional suggested size in
- MM_HIMETRIC units.
- For MM_ANISOTROPIC pictures, xExt and yExt can be zero when no
- suggested size is supplied. For MM_ISOTROPIC pictures, an aspect
- ratio must be supplied even when no suggested size is given. (If a
- suggested size is given, the aspect ratio is implied by the size.)
- To give an aspect ratio without implying a suggested size, set xExt
- and yExt to negative values whose ratio is the appropriate aspect
- ratio. The magnitude of the negative xExt and yExt values is
- ignored; only the ratio is used.
- </UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x4</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:YEXT</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="S16"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
- <UML:Attribute name="hMF">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>Identifies a memory metafile.</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x6</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:HMF</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="S16"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- </UML:Class>
- <UML:Generalization isSpecification="false" xmi.id="METAFILEPICT-Properties">
- <UML:Generalization.child>
- <UML:Class xmi.idref="METAFILEPICT"/>
- </UML:Generalization.child>
- <UML:Generalization.parent>
- <UML:Class xmi.idref="Properties"/>
- </UML:Generalization.parent>
- </UML:Generalization>
- <!--Class METAFILEPICT-->
- <!--Class FFDATA-->
- <UML:Class xmi.id="FFDATA" name="FFDATA">
- <UML:Classifier.feature>
- <UML:Attribute name="unknown">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>unknown</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x4</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>8</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x3</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:unknown</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="U8"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
- <UML:Attribute name="dropdownIndex">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>unknown</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x4</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>8</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0xfc</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>2</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:dropdownIndex</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="U8"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
- <UML:Attribute name="fTooltip">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>tool tip</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x5</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>8</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x1</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:tooltip</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="U8"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
- <UML:Attribute name="fNomark">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>no mark</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x5</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>8</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x2</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>1</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:nomark</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="U8"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
+ </UML:Generalization.parent>
+ </UML:Generalization>
+ <!--Class TBD-->
+ <!--Class METAFILEPICT-->
+ <UML:Class xmi.id="METAFILEPICT" name="METAFILEPICT">
<UML:Classifier.feature>
- <UML:Attribute name="fUseSize">
+ <UML:Attribute name="mm">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>use size</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>Specifies the mapping mode in which the picture is drawn. </UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="comment"/>
</UML:TaggedValue.type>
@@ -22929,7 +22186,7 @@
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x5</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>0x0</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="offset"/>
</UML:TaggedValue.type>
@@ -22937,15 +22194,15 @@
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>8</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>0</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
+ <UML:TagDefinition xmi.idref="shift"/>
</UML:TaggedValue.type>
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x4</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue/>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="mask"/>
</UML:TaggedValue.type>
@@ -22953,22 +22210,22 @@
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>2</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue/>
<UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
+ <UML:TagDefinition xmi.idref="bits"/>
</UML:TaggedValue.type>
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:useSize</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>rtf:MM</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="attrid"/>
</UML:TaggedValue.type>
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
<UML:StructuralFeature.type>
- <UML:DataType xmi.idref="U8"/>
+ <UML:DataType xmi.idref="S16"/>
</UML:StructuralFeature.type>
<UML:ModelElement.stereotype>
<UML:Stereotype xmi.idref="attribute"/>
@@ -22976,10 +22233,14 @@
</UML:Attribute>
</UML:Classifier.feature>
<UML:Classifier.feature>
- <UML:Attribute name="fNumersOnly">
+ <UML:Attribute name="xExt">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>numbers only</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>Specifies the size of the metafile picture for all modes except
+ the MM_ISOTROPIC and MM_ANISOTROPIC modes. (For more information
+ about these modes, see the yExt member.) The x-extent specifies the
+ width of the rectangle within which the picture is drawn. The
+ coordinates are in units that correspond to the mapping mode.</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="comment"/>
</UML:TaggedValue.type>
@@ -22987,7 +22248,7 @@
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x5</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>0x2</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="offset"/>
</UML:TaggedValue.type>
@@ -22995,15 +22256,15 @@
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>8</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>0</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
+ <UML:TagDefinition xmi.idref="shift"/>
</UML:TaggedValue.type>
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x8</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue/>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="mask"/>
</UML:TaggedValue.type>
@@ -23011,22 +22272,22 @@
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>3</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue/>
<UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
+ <UML:TagDefinition xmi.idref="bits"/>
</UML:TaggedValue.type>
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:numbersOnly</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>rtf:XEXT</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="attrid"/>
</UML:TaggedValue.type>
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
<UML:StructuralFeature.type>
- <UML:DataType xmi.idref="U8"/>
+ <UML:DataType xmi.idref="S16"/>
</UML:StructuralFeature.type>
<UML:ModelElement.stereotype>
<UML:Stereotype xmi.idref="attribute"/>
@@ -23034,10 +22295,25 @@
</UML:Attribute>
</UML:Classifier.feature>
<UML:Classifier.feature>
- <UML:Attribute name="fDateOnly">
+ <UML:Attribute name="yExt">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>date only</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>Specifies the size of the metafile picture for all modes except
+ the MM_ISOTROPIC and MM_ANISOTROPIC modes. The y-extent specifies
+ the height of the rectangle within which the picture is drawn. The
+ coordinates are in units that correspond to the mapping mode.
+ For MM_ISOTROPIC and MM_ANISOTROPIC modes, which can be scaled,
+ the xExt and yExt members contain an optional suggested size in
+ MM_HIMETRIC units.
+ For MM_ANISOTROPIC pictures, xExt and yExt can be zero when no
+ suggested size is supplied. For MM_ISOTROPIC pictures, an aspect
+ ratio must be supplied even when no suggested size is given. (If a
+ suggested size is given, the aspect ratio is implied by the size.)
+ To give an aspect ratio without implying a suggested size, set xExt
+ and yExt to negative values whose ratio is the appropriate aspect
+ ratio. The magnitude of the negative xExt and yExt values is
+ ignored; only the ratio is used.
+ </UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="comment"/>
</UML:TaggedValue.type>
@@ -23045,7 +22321,7 @@
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x5</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>0x4</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="offset"/>
</UML:TaggedValue.type>
@@ -23053,15 +22329,15 @@
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>8</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>0</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
+ <UML:TagDefinition xmi.idref="shift"/>
</UML:TaggedValue.type>
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x10</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue/>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="mask"/>
</UML:TaggedValue.type>
@@ -23069,22 +22345,22 @@
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>4</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue/>
<UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
+ <UML:TagDefinition xmi.idref="bits"/>
</UML:TaggedValue.type>
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:dateOnly</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>rtf:YEXT</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="attrid"/>
</UML:TaggedValue.type>
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
<UML:StructuralFeature.type>
- <UML:DataType xmi.idref="U8"/>
+ <UML:DataType xmi.idref="S16"/>
</UML:StructuralFeature.type>
<UML:ModelElement.stereotype>
<UML:Stereotype xmi.idref="attribute"/>
@@ -23092,10 +22368,10 @@
</UML:Attribute>
</UML:Classifier.feature>
<UML:Classifier.feature>
- <UML:Attribute name="fUnused">
+ <UML:Attribute name="hMF">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>unused</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>Identifies a memory metafile.</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="comment"/>
</UML:TaggedValue.type>
@@ -23103,7 +22379,7 @@
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x5</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>0x6</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="offset"/>
</UML:TaggedValue.type>
@@ -23111,15 +22387,15 @@
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>8</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>0</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
+ <UML:TagDefinition xmi.idref="shift"/>
</UML:TaggedValue.type>
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>0xe0</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue/>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="mask"/>
</UML:TaggedValue.type>
@@ -23127,33 +22403,45 @@
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>5</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue/>
<UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
+ <UML:TagDefinition xmi.idref="bits"/>
</UML:TaggedValue.type>
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:unused</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>rtf:HMF</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="attrid"/>
</UML:TaggedValue.type>
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
<UML:StructuralFeature.type>
- <UML:DataType xmi.idref="U8"/>
+ <UML:DataType xmi.idref="S16"/>
</UML:StructuralFeature.type>
<UML:ModelElement.stereotype>
<UML:Stereotype xmi.idref="attribute"/>
</UML:ModelElement.stereotype>
</UML:Attribute>
</UML:Classifier.feature>
+ </UML:Class>
+ <UML:Generalization isSpecification="false" xmi.id="METAFILEPICT-Properties">
+ <UML:Generalization.child>
+ <UML:Class xmi.idref="METAFILEPICT"/>
+ </UML:Generalization.child>
+ <UML:Generalization.parent>
+ <UML:Class xmi.idref="Properties"/>
+ </UML:Generalization.parent>
+ </UML:Generalization>
+ <!--Class METAFILEPICT-->
+ <!--Class FFDATA-->
+ <UML:Class xmi.id="FFDATA" name="FFDATA">
<UML:Classifier.feature>
- <UML:Attribute name="size">
+ <UML:Attribute name="unknown">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>size</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>unknown</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="comment"/>
</UML:TaggedValue.type>
@@ -23161,7 +22449,7 @@
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x6</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>0x4</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="offset"/>
</UML:TaggedValue.type>
@@ -23169,7 +22457,7 @@
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>16</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>8</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="bits"/>
</UML:TaggedValue.type>
@@ -23177,7 +22465,7 @@
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
+ <UML:TaggedValue.dataValue>0x3</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="mask"/>
</UML:TaggedValue.type>
@@ -23193,14 +22481,14 @@
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:size</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>rtf:unknown</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="attrid"/>
</UML:TaggedValue.type>
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
<UML:StructuralFeature.type>
- <UML:DataType xmi.idref="U16"/>
+ <UML:DataType xmi.idref="U8"/>
</UML:StructuralFeature.type>
<UML:ModelElement.stereotype>
<UML:Stereotype xmi.idref="attribute"/>
@@ -23208,10 +22496,10 @@
</UML:Attribute>
</UML:Classifier.feature>
<UML:Classifier.feature>
- <UML:Attribute name="hpsCheckbox">
+ <UML:Attribute name="dropdownIndex">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
+ <UML:TaggedValue.dataValue>unknown</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="comment"/>
</UML:TaggedValue.type>
@@ -23219,7 +22507,7 @@
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x8</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>0x4</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="offset"/>
</UML:TaggedValue.type>
@@ -23227,7 +22515,7 @@
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>16</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>8</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="bits"/>
</UML:TaggedValue.type>
@@ -23235,7 +22523,7 @@
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
+ <UML:TaggedValue.dataValue>0xfc</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="mask"/>
</UML:TaggedValue.type>
@@ -23243,7 +22531,7 @@
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>0</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>2</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="shift"/>
</UML:TaggedValue.type>
@@ -23251,14 +22539,14 @@
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:hpsCheckbox</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>rtf:dropdownIndex</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="attrid"/>
</UML:TaggedValue.type>
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
<UML:StructuralFeature.type>
- <UML:DataType xmi.idref="U16"/>
+ <UML:DataType xmi.idref="U8"/>
</UML:StructuralFeature.type>
<UML:ModelElement.stereotype>
<UML:Stereotype xmi.idref="attribute"/>
@@ -23266,10 +22554,10 @@
</UML:Attribute>
</UML:Classifier.feature>
<UML:Classifier.feature>
- <UML:Attribute name="title">
+ <UML:Attribute name="fTooltip">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>title of the field</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>tool tip</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="comment"/>
</UML:TaggedValue.type>
@@ -23277,7 +22565,7 @@
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>0xa</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>0x5</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="offset"/>
</UML:TaggedValue.type>
@@ -23285,7 +22573,7 @@
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
+ <UML:TaggedValue.dataValue>8</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="bits"/>
</UML:TaggedValue.type>
@@ -23293,7 +22581,7 @@
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
+ <UML:TaggedValue.dataValue>0x1</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="mask"/>
</UML:TaggedValue.type>
@@ -23309,14 +22597,14 @@
</UML:ModelElement.taggedValue>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:fftitle</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>rtf:tooltip</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="attrid"/>
</UML:TaggedValue.type>
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
<UML:StructuralFeature.type>
- <UML:DataType xmi.idref="String"/>
+ <UML:DataType xmi.idref="U8"/>
</UML:StructuralFeature.type>
<UML:ModelElement.stereotype>
<UML:Stereotype xmi.idref="attribute"/>
@@ -23324,136 +22612,62 @@
</UML:Attribute>
</UML:Classifier.feature>
<UML:Classifier.feature>
- <UML:Operation name="FLT">
+ <UML:Attribute name="fNomark">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:FLT</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>no mark</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="opid"/>
+ <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="U32"/>
- </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="default">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:ffdefault</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>0x5</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="opid"/>
+ <UML:TagDefinition xmi.idref="offset"/>
</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="checked">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:ffchecked</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>8</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="opid"/>
+ <UML:TagDefinition xmi.idref="bits"/>
</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="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Operation>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
- <UML:Operation name="formatting">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:ffformatting</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>0x2</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="opid"/>
+ <UML:TagDefinition xmi.idref="mask"/>
</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="help">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:ffhelp</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>1</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="opid"/>
+ <UML:TagDefinition xmi.idref="shift"/>
</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="tooltip">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:fftooltip</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>rtf:nomark</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="opid"/>
+ <UML:TagDefinition xmi.idref="attrid"/>
</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:StructuralFeature.type>
+ <UML:DataType xmi.idref="U8"/>
+ </UML:StructuralFeature.type>
<UML:ModelElement.stereotype>
<UML:Stereotype xmi.idref="attribute"/>
</UML:ModelElement.stereotype>
- </UML:Operation>
+ </UML:Attribute>
</UML:Classifier.feature>
</UML:Class>
<UML:Generalization isSpecification="false" xmi.id="FFDATA-Properties">
@@ -40952,28 +40166,6 @@
</UML:ModelElement.stereotype>
</UML:Operation>
</UML:Classifier.feature>
- <UML:Classifier.feature>
- <UML:Operation name="shptxt">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:shptxt</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="TextboxText"/>
- </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>
commit c280cef2844a41e4c0bd4a4641d0173255f1b777
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed Jan 1 14:58:42 2014 +0100
writerfilter: drop unused rtf:{sed,FCMPR,FNMPR,FCSEPX,FN} tokens
Change-Id: I6ad41627eeced6c24437bbd022b244bf91b162d0
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 242d4e7..3588e55 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -72,7 +72,6 @@ using namespace ::rtl;
namespace writerfilter {
using resourcemodel::resolveSprmProps;
-using resourcemodel::resolveAttributeProperties;
namespace dmapper{
@@ -568,13 +567,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
m_pImpl->GetFIB().SetData( nName, nIntValue );
}
break;
- case NS_rtf::LN_FN:
- case NS_rtf::LN_FCSEPX:
- case NS_rtf::LN_FNMPR:
- case NS_rtf::LN_FCMPR:
-
- //section descriptor, unused or internally used
- break;
case NS_rtf::LN_ICOFORE:
break;
case NS_rtf::LN_ICOBACK:
@@ -748,10 +740,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
break;
case NS_rtf::LN_XSTZNAME1:
break;
- case NS_rtf::LN_sed:
- //section properties
- resolveAttributeProperties(*this, val);
- break;
case NS_rtf::LN_tbdAdd:
//
{
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index 07ace4b..bec560e 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -20335,268 +20335,6 @@
</UML:Generalization.parent>
</UML:Generalization>
<!--Class BKD-->
- <!--Class SED-->
- <UML:Class xmi.id="SED" name="SED">
- <UML:Classifier.feature>
- <UML:Attribute name="fn">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>used internally by Word</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:FN</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="S16"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
- <UML:Attribute name="fcSepx">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>file offset in main stream to beginning of SEPX stored for
- section. If sed.fcSepx == 0xFFFFFFFF, the section properties for
- the section are equal to the standard SEP (see SEP
- definition).</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x2</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:FCSEPX</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="U32"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
- <UML:Attribute name="fnMpr">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>used internally by Word</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x6</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:FNMPR</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="S16"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
- <UML:Attribute name="fcMpr">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>points to offset in FC space of main stream where the Macintosh
- Print Record for a document created on a Mac will be stored</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x8</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:FCMPR</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="U32"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
- <UML:Operation name="sepx">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:sed</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="SEPX"/>
- </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>
- <!--Class SED-->
<!--Class SHD-->
<UML:Class xmi.id="SHD" name="SHD">
<UML:ModelElement.taggedValue>
commit 45460d59d3eed71508f515d4f2b4365c00282f94
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed Jan 1 12:28:13 2014 +0100
writerfilter: drop unused rtf:{ALTFONTNAME,XSZFFN,XSTZNAME,UPXSTART,UPX}
Change-Id: Ie4520c3ab722b639b055fc63bb76c060e6198a27
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index e9c1a8e..242d4e7 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -746,18 +746,8 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
m_pImpl->AddBookmark( sLocalBookmarkName, sStringValue );
sLocalBookmarkName = OUString();
break;
- case NS_rtf::LN_ALTFONTNAME:
- break;
- case NS_rtf::LN_XSZFFN:
- break;
- case NS_rtf::LN_XSTZNAME:
- break;
case NS_rtf::LN_XSTZNAME1:
break;
- case NS_rtf::LN_UPXSTART:
- break;
- case NS_rtf::LN_UPX:
- break;
case NS_rtf::LN_sed:
//section properties
resolveAttributeProperties(*this, val);
diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx
index bb1f8d7..1739bd3 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@@ -89,10 +89,6 @@ void FontTable::lcl_attribute(Id Name, Value & val)
case NS_rtf::LN_FS:
m_pImpl->pCurrentEntry->sFontSignature += sValue;
break;
- case NS_rtf::LN_ALTFONTNAME:
- m_pImpl->pCurrentEntry->sAlternativeFont = sValue;
- break;
- case NS_rtf::LN_XSZFFN:
case NS_ooxml::LN_CT_Font_name:
m_pImpl->pCurrentEntry->sFontName = sValue;
break;
diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx
index 36dec44..305dcbc2 100644
--- a/writerfilter/source/dmapper/FontTable.hxx
+++ b/writerfilter/source/dmapper/FontTable.hxx
@@ -45,7 +45,6 @@ struct FontEntry
sal_Int32 nAltFontIndex;
OUString sPanose;
OUString sFontSignature;
- OUString sAlternativeFont;
FontEntry() :
bTrueType(false),
nPitchRequest( 0 ),
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 666e10a..97a1ade 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -455,19 +455,11 @@ 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_XSTZNAME:
- m_pImpl->m_pCurrentEntry->sStyleName1 = sValue;
- if (!m_pImpl->m_pCurrentEntry->sStyleIdentifierI.isEmpty())
- m_pImpl->m_pCurrentEntry->sStyleIdentifierI = sValue;
- 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_rtf::LN_UPX:
- resolveAttributeProperties(val);
- break;
case NS_ooxml::LN_CT_Style_type:
{
SAL_WARN_IF( m_pImpl->m_pCurrentEntry->nStyleTypeCode != STYLE_TYPE_UNKNOWN,
@@ -1508,14 +1500,6 @@ OUString StyleSheetTable::GetStyleIdFromIndex(const sal_uInt32 sti)
return sRet;
}
-void StyleSheetTable::resolveAttributeProperties(Value & val)
-{
- writerfilter::Reference<Properties>::Pointer_t pProperties = val.getProperties();
- if( pProperties.get())
- pProperties->resolve(*this);
-}
-
-
void StyleSheetTable::applyDefaults(bool bParaProperties)
{
try{
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx
index 0c1699b..e9faba7 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.hxx
@@ -117,7 +117,6 @@ private:
// Table
virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref);
- void resolveAttributeProperties(Value & val);
void applyDefaults(bool bParaProperties);
};
typedef boost::shared_ptr< StyleSheetTable > StyleSheetTablePtr;
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index 6b9c024..07ace4b 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -2544,60 +2544,6 @@
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
<UML:Classifier.feature>
- <UML:Operation name="altName">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:ALTFONTNAME</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:Operation name="xszFfn">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:XSZFFN</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:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>zero terminated string that records name of font. Possibly
- followed by a second xsz which records the name of an alternate
- font to use if the first named font does not exist on this system.
- Maximal size of xszFfn is 65 characters.</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Operation>
<UML:Attribute name="cbFfnM1">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
@@ -3420,16 +3366,6 @@
</UML:Attribute>
</UML:Classifier.feature>
<UML:Classifier.feature>
- <UML:Operation name="xstzName">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:XSTZNAME</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="opid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- </UML:Operation>
<UML:Operation name="xstzName1">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
@@ -3440,26 +3376,6 @@
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
</UML:Operation>
- <UML:Operation name="upxstart">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:UPXSTART</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="opid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- </UML:Operation>
- <UML:Operation name="upx">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:UPX</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-->
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 3b45b93..c229edc 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1036,7 +1036,7 @@ void RTFDocumentImpl::text(OUString& rString)
case DESTINATION_FONTENTRY:
{
RTFValue::Pointer_t pValue(new RTFValue(m_aStates.top().aDestinationText.makeStringAndClear()));
- m_aStates.top().aTableAttributes.set(NS_rtf::LN_XSZFFN, pValue);
+ m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_Font_name, pValue);
writerfilter::Reference<Properties>::Pointer_t const pProp(
new RTFReferenceProperties(m_aStates.top().aTableAttributes, m_aStates.top().aTableSprms)
commit 241b768d0ea08157c8d69dceb59f231dc4050f87
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed Jan 1 12:15:37 2014 +0100
writerfilter: drop unused rtf:{xst,LISTLEVEL,LFOData,F} tokens
Change-Id: I65bcbce63acc7ae510f7ccf4200bf175c11d6604
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 6d16bb0..e9c1a8e 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -746,12 +746,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
m_pImpl->AddBookmark( sLocalBookmarkName, sStringValue );
sLocalBookmarkName = OUString();
break;
- case NS_rtf::LN_LISTLEVEL:
- break;
- case NS_rtf::LN_LFOData:
- break;
- case NS_rtf::LN_F:
- break;
case NS_rtf::LN_ALTFONTNAME:
break;
case NS_rtf::LN_XSZFFN:
diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx
index 8466147..bb1f8d7 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@@ -89,8 +89,6 @@ void FontTable::lcl_attribute(Id Name, Value & val)
case NS_rtf::LN_FS:
m_pImpl->pCurrentEntry->sFontSignature += sValue;
break;
- case NS_rtf::LN_F:
- break;
case NS_rtf::LN_ALTFONTNAME:
m_pImpl->pCurrentEntry->sAlternativeFont = sValue;
break;
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index e26d41a..b4aaea8 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -798,7 +798,6 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal )
m_pCurrentDefinition->SetValue( nName, nIntValue );
break;
case NS_ooxml::LN_CT_NumLvl_ilvl:
- case NS_rtf::LN_LISTLEVEL:
{
//add a new level to the level vector and make it the current one
m_pCurrentDefinition->AddLevel();
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index fe3fd9a..6b9c024 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -1263,28 +1263,6 @@
</UML:ModelElement.stereotype>
</UML:Attribute>
</UML:Classifier.feature>
- <UML:Classifier.feature>
- <UML:Operation name="xst">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:xst</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:Class>
<UML:Generalization isSpecification="false" xmi.id="ListLevel-Properties">
<UML:Generalization.child>
@@ -1306,28 +1284,6 @@
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
<UML:Classifier.feature>
- <UML:Operation name="listlevel">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:LISTLEVEL</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="ListLevel"/>
- </UML:Parameter.type>
- </UML:Parameter>
- </UML:BehavioralFeature.parameter>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="array"/>
- </UML:ModelElement.stereotype>
- </UML:Operation>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list