From 3dda94c22f83aa7133f5439d356f505c1831ec84 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 28 Jan 2014 14:28:08 +0100 Subject: [PATCH] DOCX import: initial support for wp14:sizeRelH/V relativeFrom For now just warn on unexpected values, and ignore margin, what is the only value supported by Writer. Change-Id: Ia4fc7293839610c1bbe2dceda2320a5ba2d3a15b --- writerfilter/source/dmapper/GraphicImport.cxx | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 29300cd4116b..7f2079a2d83c 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -733,6 +733,30 @@ void GraphicImport::lcl_attribute(Id nName, Value & val) val.getString(); //TODO: does it need to be handled? break; + case NS_ooxml::LN_CT_SizeRelH_relativeFrom: + { + switch (nIntValue) + { + case NS_ooxml::LN_ST_SizeRelFromH_margin: + break; + default: + SAL_WARN("writerfilter", "GraphicImport::lcl_attribute: unhandled NS_ooxml::LN_CT_SizeRelH_relativeFrom value: " << nIntValue); + break; + } + } + break; + case NS_ooxml::LN_CT_SizeRelV_relativeFrom: + { + switch (nIntValue) + { + case NS_ooxml::LN_ST_SizeRelFromV_margin: + break; + default: + SAL_WARN("writerfilter", "GraphicImport::lcl_attribute: unhandled NS_ooxml::LN_CT_SizeRelV_relativeFrom value: " << nIntValue); + break; + } + } + break; default: #ifdef DEBUG_DMAPPER_GRAPHIC_IMPORT dmapper_logger->element("unhandled");