writerfilter/source/dmapper/GraphicImport.cxx | 20 --------------------
1 file changed, 20 deletions(-)
New commits:
commit b2605e7a206af0b7d9c0a6f6d0f94ac3faf12f8d
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sun Apr 19 11:23:52 2015 +0200
writerfilter: remove remaining doctok bits in GraphicImport
Change-Id: I399b389d4bd54357c6578417d2983017a60f0f51
Reviewed-on: https://gerrit.libreoffice.org/15383
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index d098daa..7f4f0cb 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -992,11 +992,6 @@ void GraphicImport::lcl_sprm(Sprm& rSprm)
switch(nSprmId)
{
- case 0xf004: //dff record
- case 0xf00a: //part of 0xf004 - shape properties
- case 0xf00b: //part of 0xf004
- case 0xf007:
- case 0xf122: //udefprop
case NS_ooxml::LN_CT_Inline_extent: // 90911;
case NS_ooxml::LN_CT_Inline_effectExtent: // 90912;
case NS_ooxml::LN_CT_Inline_docPr: // 90913;
@@ -1109,17 +1104,6 @@ void GraphicImport::lcl_sprm(Sprm& rSprm)
}
}
break;
- case 0x271b:
- case 0x271c:
- {
- if( nSprmId != 0x271c || m_pImpl->nDffType == 0xf01f ||
m_pImpl->nDffType == 0xf01e )
- {
- writerfilter::Reference<BinaryObj>::Pointer_t pPictureData =
rSprm.getBinary();
- if( pPictureData.get())
- pPictureData->resolve(*this);
- }
- }
- break;
case NS_ooxml::LN_EG_WrapType_wrapNone: // 90944; - doesn't contain
attributes
//depending on the behindDoc attribute text wraps through behind
or in fron of the object
m_pImpl->nWrap = text::WrapTextMode_THROUGHT;
@@ -1127,10 +1111,6 @@ void GraphicImport::lcl_sprm(Sprm& rSprm)
case NS_ooxml::LN_EG_WrapType_wrapTopAndBottom: // 90948;
m_pImpl->nWrap = text::WrapTextMode_NONE;
break;
- case 0xf010:
- case 0xf011:
- //ignore - doesn't contain useful members
- break;
case NS_ooxml::LN_CT_GraphicalObject_graphicData:// 90660;
{
m_pImpl->bIsGraphic = true;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
