diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 3bee710db5d4..420504d276ef 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -490,41 +490,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
case NS_ooxml::LN_CT_Border_frame: // ignored
break;
- case NS_rtf::LN_SPID:
- break;
- case NS_rtf::LN_XALEFT:
- m_pImpl->nLeftPosition = ConversionHelper::convertTwipToMM100(nIntValue);
- break; //left position
- case NS_rtf::LN_YATOP:
- m_pImpl->nTopPosition = ConversionHelper::convertTwipToMM100(nIntValue);
- break; //top position
- case NS_rtf::LN_XARIGHT:
- m_pImpl->nRightPosition = ConversionHelper::convertTwipToMM100(nIntValue);
- break; //right position
- case NS_rtf::LN_YABOTTOM:
- m_pImpl->nBottomPosition = ConversionHelper::convertTwipToMM100(nIntValue);
- break;//bottom position
- case NS_rtf::LN_BX: //hori orient relation
- switch( nIntValue )
- {
- case 0: m_pImpl->nHoriRelation = text::RelOrientation::PAGE_PRINT_AREA; break;
- case 1: m_pImpl->nHoriRelation = text::RelOrientation::PAGE_FRAME; break;
- case 2: m_pImpl->nHoriRelation = text::RelOrientation::FRAME; break;
- //case :
- default:m_pImpl->nHoriRelation = text::RelOrientation::CHAR;
- }
- break;
- case NS_rtf::LN_BY: //vert orient relation
- switch( nIntValue )
- {
- case 0: m_pImpl->nVertRelation = text::RelOrientation::PAGE_PRINT_AREA; break;
- case 1: m_pImpl->nVertRelation = text::RelOrientation::PAGE_FRAME; break;
- case 2: m_pImpl->nVertRelation = text::RelOrientation::FRAME; break;
- //case :
- default:m_pImpl->nVertRelation = text::RelOrientation::TEXT_LINE;
- }
-
- break;
case NS_rtf::LN_WR: //wrapping
switch( nIntValue )
{
@@ -548,33 +513,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
default:;
}
break;
- case NS_rtf::LN_WRK:
- if( !m_pImpl->bIgnoreWRK )
- switch( nIntValue )
- {
- case 0: //0 like 2, but doesn't require absolute object
- case 2: //2 wrap around absolute object
- m_pImpl->nWrap = text::WrapTextMode_PARALLEL;
- break;
- case 1: //1 no text next to shape
- m_pImpl->nWrap = text::WrapTextMode_NONE;
- break;
- case 3: //3 wrap as if no object present
- m_pImpl->nWrap = text::WrapTextMode_THROUGHT;
- break;
- case 4: //4 wrap tightly around object
- case 5: //5 wrap tightly, but allow holes
- m_pImpl->nWrap = text::WrapTextMode_PARALLEL;
- m_pImpl->bContour = true;
- break;
- default:;
- }
- break;
- case NS_rtf::LN_FRCASIMPLE:
- case NS_rtf::LN_FBELOWTEXT:
- case NS_rtf::LN_FANCHORLOCK:
- case NS_rtf::LN_CTXBX:
- 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 92876002c096..c58b204dfb36 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -1441,427 +1441,6 @@
-
-
-
-
- Shape Identifier. Used in conjunction with the office art data
- (found via fcDggInfo in the FIB) to find the actual
- data for this shape.
-
-
-
-
-
-
-
- 0x0
-
-
-
-
-
-
-
- 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- rtf:SPID
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- xa left of rectangle enclosing shape relative to the origin of
- the shape
-
-
-
-
-
-
-
- 0x4
-
-
-
-
-
-
-
- 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- rtf:XALEFT
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ya top of rectangle enclosing shape relative to the origin of
- the shape
-
-
-
-
-
-
-
- 0x8
-
-
-
-
-
-
-
- 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- rtf:YATOP
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- xa right of rectangle enclosing shape relative to the origin of
- the shape
-
-
-
-
-
-
-
- 0xC
-
-
-
-
-
-
-
- 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- rtf:XARIGHT
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ya bottom of the rectangle enclosing shape relative to the
- origin of the shape
-
-
-
-
-
-
-
- 0x10
-
-
-
-
-
-
-
- 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- rtf:YABOTTOM
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- x position of shape relative to anchor CP
- 0 relative to page margin
- 1 relative to top of page
- 2 relative to text (column for horizontal text; paragraph for
- vertical text)
- 3 reserved for future use
-
-
-
-
-
-
-
- 0x14
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 0006
-
-
-
-
-
-
-
- :2
-
-
-
-
-
-
-
- rtf:BX
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- y position of shape relative to anchor CP
- 0 relative to page margin
- 1 relative to top of page
- 2 relative to text (paragraph for horizontal text; column for
- vertical text)
-
-
-
-
-
-
-
- 0x14
-
-
-
-
-
-
-
- 3
-
-
-
-
-
-
-
- 0018
-
-
-
-
-
-
-
- :2
-
-
-
-
-
-
-
- rtf:BY
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1927,313 +1506,7 @@
-
-
-
-
- text wrapping mode type (valid only for wrapping modes 2 and
- 4
- 0 wrap both sides
- 1 wrap only on left
- 2 wrap only on right
- 3 wrap only on largest side
-
-
-
-
-
-
-
- 0x14
-
-
-
-
-
-
-
- 9
-
-
-
-
-
-
-
- 1E00
-
-
-
-
-
-
-
- :4
-
-
-
-
-
-
-
- rtf:WRK
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- when set, temporarily overrides bx, by, forcing the xaLeft,
- xaRight, yaTop, and yaBottom fields to all be page relative.
-
-
-
-
-
-
-
- 0x14
-
-
-
-
-
-
-
- 13
-
-
-
-
-
-
-
- 2000
-
-
-
-
-
-
-
- :1
-
-
-
-
-
-
-
- rtf:FRCASIMPLE
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1 shape is below text
- 0 shape is above text
-
-
-
-
-
-
-
- 0x14
-
-
-
-
-
-
-
- 14
-
-
-
-
-
-
-
- 4000
-
-
-
-
-
-
-
- :1
-
-
-
-
-
-
-
- rtf:FBELOWTEXT
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1 anchor is locked
- 0 anchor is not locked
-
-
-
-
-
-
-
- 0x14
-
-
-
-
-
-
-
- 15
-
-
-
-
-
-
-
- 8000
-
-
-
-
-
-
-
- :1
-
-
-
-
-
-
-
- rtf:FANCHORLOCK
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- count of textboxes in shape (undo doc only)
-
-
-
-
-
-
-
- 0x16
-
-
-
-
-
-
-
- 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- rtf:CTXBX
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-