mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DOCX import: initial support for wp14:sizeRelH/V relativeFrom

Browse Source 
For now just warn on unexpected values, and ignore margin, what is the
only value supported by Writer.

Change-Id: Ia4fc7293839610c1bbe2dceda2320a5ba2d3a15b
This commit is contained in:
Miklos Vajna
2014-01-28 14:28:08 +01:00
parent 1eb516f5a5
commit 3dda94c22f
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
writerfilter/source/dmapper/GraphicImport.cxx
View File

@@ -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");