writerfilter: remove METAFILEPICT class in doctok

Change-Id: Icb124a2f7445ca17f04dc0024dc17cbcc4b0ca6d

writerfilter/source/dmapper/DomainMapper.cxx

@@ -365,14 +365,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
             break;
         case NS_rtf::LN_LINETYPE:
             break;
-        case NS_rtf::LN_MM:
-            break;
-        case NS_rtf::LN_XEXT:
-            break;
-        case NS_rtf::LN_YEXT:
-            break;
-        case NS_rtf::LN_HMF:
-            break;
         case NS_rtf::LN_CBHEADER:
             break;
         case NS_rtf::LN_MFP:

writerfilter/source/dmapper/GraphicImport.cxx

@@ -537,17 +537,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
         case NS_rtf::LN_DYAORIGIN: //vertical offset of hand annotation origin
         break;
         case NS_rtf::LN_CPROPS:break;// unknown - ignored
-        //metafilepict
-        case NS_rtf::LN_MM:
-
-        break; //mapmode
-        case NS_rtf::LN_XEXT:
-            m_pImpl->setXSize(nIntValue);
-            break; // x-size
-        case NS_rtf::LN_YEXT:
-            m_pImpl->setYSize(nIntValue);
-            break; // y-size
-        case NS_rtf::LN_HMF: break; //identifier - ignored
 
         case NS_rtf::LN_shpfBid:
             break; //ignored

writerfilter/source/rtftok/rtfdocumentimpl.cxx

@@ -802,10 +802,10 @@ int RTFDocumentImpl::resolvePict(bool bInline)
         nXExt = (((long)m_aStates.top().aPicture.nScaleX) * ( nXExt - ( m_aStates.top().aPicture.nCropL + m_aStates.top().aPicture.nCropR ))) / 100L;
     if (m_aStates.top().aPicture.nScaleY != 100)
         nYExt = (((long)m_aStates.top().aPicture.nScaleY) * ( nYExt - ( m_aStates.top().aPicture.nCropT + m_aStates.top().aPicture.nCropB ))) / 100L;
-    RTFValue::Pointer_t pXExtValue(new RTFValue(nXExt));
-    RTFValue::Pointer_t pYExtValue(new RTFValue(nYExt));
-    aExtentAttributes.set(NS_rtf::LN_XEXT, pXExtValue);
-    aExtentAttributes.set(NS_rtf::LN_YEXT, pYExtValue);
+    RTFValue::Pointer_t pXExtValue(new RTFValue(MM100_TO_EMU(nXExt)));
+    RTFValue::Pointer_t pYExtValue(new RTFValue(MM100_TO_EMU(nYExt)));
+    aExtentAttributes.set(NS_ooxml::LN_CT_PositiveSize2D_cx, pXExtValue);
+    aExtentAttributes.set(NS_ooxml::LN_CT_PositiveSize2D_cy, pYExtValue);
     RTFValue::Pointer_t pExtentValue(new RTFValue(aExtentAttributes));
     // docpr sprm
     RTFSprms aDocprAttributes;