writerfilter/source/dmapper/GraphicImport.cxx | 17 --
writerfilter/source/doctok/resources.xmi | 194 --------------------------
2 files changed, 211 deletions(-)
New commits:
commit c0b2debe6c82cddd681d7874b95237f0669cd36c
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sun Dec 29 20:56:20 2013 +0100
writerfilter: unused NS_rtf::LN_shpvalue
Change-Id: I908ab52770aaabc3e2049e2b6d3ab7f7acf25643
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index c7b1272..501a6be 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -633,12 +633,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
break;
case NS_rtf::LN_shpname:
break;
- case NS_rtf::LN_shpvalue:
- {
- if( NS_dff::LN_shpwzDescription ==
sal::static_int_cast<Id>(m_pImpl->nShapeOptionType) )
- ProcessShapeOptions( val );
- }
- break;
//BLIP store entry
case NS_rtf::LN_shpbtWin32:
diff --git a/writerfilter/source/doctok/resources.xmi
b/writerfilter/source/doctok/resources.xmi
index 555a244..c2a2610 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -26368,28 +26368,6 @@
</UML:Operation>
</UML:Classifier.feature>
<UML:Classifier.feature>
- <UML:Operation name="value">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
-
<UML:TaggedValue.dataValue>rtf:shpvalue</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="Value"/>
- </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="stringValue">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
commit 7f5494f3c4bf14209a119c6b21c02e10075503ae
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sun Dec 29 20:54:12 2013 +0100
writerfilter: unused NS_rtf::LN_shppid
Change-Id: Idf63d7a4659a96bb6e2050194ba595a321696313
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index 6fa2eef..c7b1272 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -627,9 +627,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
break;// Shape has a shape type property
case NS_rtf::LN_shptypename:
break;// shape type name
- case NS_rtf::LN_shppid:
- m_pImpl->nShapeOptionType = nIntValue;
- break; //type of shape option
case NS_rtf::LN_shpfBid:
break; //ignored
case NS_rtf::LN_shpfComplex:
diff --git a/writerfilter/source/doctok/resources.xmi
b/writerfilter/source/doctok/resources.xmi
index e62f7c5..555a244 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -26230,64 +26230,6 @@
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
<UML:Classifier.feature>
- <UML:Attribute name="pid">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>Property
ID</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>14</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>0x3fff</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:shppid</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="fBid">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
commit 7d1f0555f83bf117f4771041550c99b29efdb833
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sun Dec 29 20:50:44 2013 +0100
writerfilter: unused NS_rtf::LN_shpop
Change-Id: I83ff7a646ab2ae8e06996115500c02730c867b8f
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index f90d411..6fa2eef 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -634,12 +634,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
break; //ignored
case NS_rtf::LN_shpfComplex:
break;
- case NS_rtf::LN_shpop:
- {
- if(NS_dff::LN_shpwzDescription !=
sal::static_int_cast<Id>(m_pImpl->nShapeOptionType) )
- ProcessShapeOptions( val );
- }
- break;
case NS_rtf::LN_shpname:
break;
case NS_rtf::LN_shpvalue:
diff --git a/writerfilter/source/doctok/resources.xmi
b/writerfilter/source/doctok/resources.xmi
index 157f10d..e62f7c5 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -26404,64 +26404,6 @@
</UML:Attribute>
</UML:Classifier.feature>
<UML:Classifier.feature>
- <UML:Attribute name="op">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>Value</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>32</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/>
- <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:shpop</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="name">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
commit 91bb53928b9a00b1dbfa734baf60c9f0a19dc6ad
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sun Dec 29 20:46:35 2013 +0100
writerfilter: unused NS_dff::LN_shpfPrint
Change-Id: I919e44db53dde4869bfb7d1e41dabb6573667c7a
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index e293b0c..f90d411 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1256,8 +1256,6 @@ void GraphicImport::ProcessShapeOptions(Value& val)
//todo: changes have to be applied depending on the orientation,
see SwWW8ImplReader::AdjustULWrapForWordMargins()
m_pImpl->nBottomMargin = nIntValue / 360;
break;
- case NS_dff::LN_shpfPrint /*959*/:
- break; // rtf:shpfPrint
default:
OSL_FAIL( "shape option unsupported?");
}
diff --git a/writerfilter/source/doctok/resources.xmi
b/writerfilter/source/doctok/resources.xmi
index ad50f51..157f10d 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -43667,62 +43667,6 @@
</UML:ModelElement.taggedValue>
</UML:Class>
<!--DFFOPT dyWrapDistBottom-->
- <!--DFFOPT fPrint-->
- <UML:Class xmi.id="fPrint" name="fPrint">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="dffopt"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
-
<UML:TaggedValue.dataValue>dff:shpfPrint</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="optname"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>959</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="fopid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>U8</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="type"/>
- </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="isbool"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>TRUE</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="default"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>Print this
- shape</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- </UML:Class>
- <!--DFFOPT fPrint-->
<!--DFFOPT-->
</UML:Namespace.ownedElement>
</UML:Model>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
