diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-13 21:08:20 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-13 21:50:50 +0100 |
| commit | 8891d8c42df288a4f3c631e9c73b24489c6c83a0 (patch) | |
| tree | f7d6591d496a568c69c40bc09a06f58c3d65bc25 /writerfilter | |
| parent | d4dd5c34dbf1344ccedb365a358e771ff91b0713 (diff) | |
writerfilter: move payload from rtf to ooxml namespace
Change-Id: I7f39d0245fe9ad0aec4b8c1dcea8c379124d2d7a
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/GraphicImport.cxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/doctok/resources.xmi | 57 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/model.xml | 1 |
4 files changed, 3 insertions, 59 deletions
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 7415582837bd..d3594d9d7bab 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -483,7 +483,7 @@ void GraphicImport::lcl_attribute(Id nName, Value & val) } } break; - case NS_rtf::LN_payload : + case NS_ooxml::LN_payload : { writerfilter::Reference<BinaryObj>::Pointer_t pPictureData = val.getBinary(); if( pPictureData.get()) diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index f7938317f450..0a39a1712d6f 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -22121,63 +22121,6 @@ </UML:Generalization.parent> </UML:Generalization> <!--DFF FSP--> - <!--DFF BlipPng--> - <UML:Class xmi.id="BlipPng" name="BlipPng"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>0xf01e</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="dffid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:Classifier.feature> - <UML:Attribute name="payload"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>the actual PNG</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>0x19</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>rtf:payload</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="Blob"/> - </UML:StructuralFeature.type> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="attribute"/> - </UML:ModelElement.stereotype> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="attributeremainder"/> - </UML:ModelElement.stereotype> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Generalization isSpecification="false" xmi.id="BlipPng-Properties"> - <UML:Generalization.child> - <UML:Class xmi.idref="BlipPng"/> - </UML:Generalization.child> - <UML:Generalization.parent> - <UML:Class xmi.idref="Properties"/> - </UML:Generalization.parent> - </UML:Generalization> - <!--DFF BlipPng--> <!--DFF BlipDib--> <UML:Class xmi.id="BlipDib" name="BlipDib"> <UML:ModelElement.taggedValue> diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx index 05292a567631..b973db6e6c6d 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx @@ -345,7 +345,7 @@ OOXMLPropertySet * OOXMLDocumentImpl::getPicturePropSet OOXMLValue::Pointer_t pPayloadValue(new OOXMLBinaryValue(pPicture)); OOXMLProperty::Pointer_t pPayloadProperty - (new OOXMLPropertyImpl(NS_rtf::LN_payload, pPayloadValue, + (new OOXMLPropertyImpl(NS_ooxml::LN_payload, pPayloadValue, OOXMLPropertyImpl::ATTRIBUTE)); OOXMLPropertySet::Pointer_t pBlipSet(new OOXMLPropertySetImpl()); diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index a2ad47f55801..67309fe5c290 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -46,6 +46,7 @@ <token tokenid="ooxml:ffdata"/> <token tokenid="ooxml:starmath"/> <token tokenid="ooxml:blip"/> + <token tokenid="ooxml:payload"/> <namespace name="dml-stylesheet" url="http://schemas.openxmlformats.org/drawingml/2006/main" file="dml-stylesheet.rng"> <start name="theme"/> <start name="themeOverride"/> |