strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

.docx wrap values mean different things than in LO, map them (bnc#750838)

Browse source 
Change-Id: Ic355ae9993702c37c958ea16d8d97e6ef4892dcd
This commit is contained in:
Luboš Luňák 2012-05-04 20:17:44 +02:00
parent 3badf6154b
commit 20a8768b1c
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
writerfilter/source/dmapper/GraphicHelpers.cxx
View file

@ -184,12 +184,16 @@ void WrapHandler::lcl_sprm( Sprm& )
sal_Int32 WrapHandler::getWrapMode( )
{
sal_Int32 nMode = com::sun::star::text::WrapTextMode_NONE;
// The wrap values do not map directly to our wrap mode,
// e.g. none in .docx actually means through in LO.
sal_Int32 nMode = com::sun::star::text::WrapTextMode_THROUGHT;
switch ( m_nType )
{
case NS_ooxml::LN_Value_vml_wordprocessingDrawing_ST_WrapType_square:
// through and tight are somewhat complicated, approximate
case NS_ooxml::LN_Value_vml_wordprocessingDrawing_ST_WrapType_tight:
case NS_ooxml::LN_Value_vml_wordprocessingDrawing_ST_WrapType_through:
{
switch ( m_nSide )
{
@ -204,13 +208,13 @@ sal_Int32 WrapHandler::getWrapMode( )
}
}
break;
case NS_ooxml::LN_Value_vml_wordprocessingDrawing_ST_WrapType_through:
nMode = com::sun::star::text::WrapTextMode_THROUGHT;
break;
case NS_ooxml::LN_Value_vml_wordprocessingDrawing_ST_WrapType_topAndBottom:
nMode = com::sun::star::text::WrapTextMode_NONE;
break;
case NS_ooxml::LN_Value_vml_wordprocessingDrawing_ST_WrapType_none:
default:
nMode = com::sun::star::text::WrapTextMode_NONE;
nMode = com::sun::star::text::WrapTextMode_THROUGHT;
}
return nMode;