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

handle wp:simplePos properly

Browse source
This commit is contained in:
Luboš Luňák 2011-02-10 17:27:31 +01:00
parent 0a078aa069
commit 5bf8e3ef16
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
writerfilter/source/dmapper/GraphicImport.cxx
View file

@ -903,14 +903,14 @@ void GraphicImport::attribute(Id nName, Value & val)
//enable overlapping - ignored
break;
case NS_ooxml::LN_CT_Point2D_x: // 90405;
m_pImpl->nLeftPosition = ConversionHelper::convertTwipToMM100(nIntValue);
m_pImpl->nHoriRelation = text::RelOrientation::PAGE_FRAME;
m_pImpl->nHoriOrient = text::HoriOrientation::NONE;
break;
case NS_ooxml::LN_CT_Point2D_y: // 90406;
if( m_pImpl->bUseSimplePos )
{
//todo: absolute positioning
NS_ooxml::LN_CT_Point2D_x == nName ? m_pImpl->nLeftPosition = ConversionHelper::convertTwipToMM100(nIntValue) :
m_pImpl->nTopPosition = ConversionHelper::convertTwipToMM100(nIntValue);
}
m_pImpl->nTopPosition = ConversionHelper::convertTwipToMM100(nIntValue);
m_pImpl->nVertRelation = text::RelOrientation::PAGE_FRAME;
m_pImpl->nVertOrient = text::VertOrientation::NONE;
break;
case NS_ooxml::LN_CT_WrapTight_wrapText: // 90934;
m_pImpl->bContour = true;
@ -1271,10 +1271,12 @@ void GraphicImport::sprm(Sprm & rSprm)
if( pProperties.get( ) )
{
pProperties->resolve( *pHandler );
m_pImpl->nHoriRelation = pHandler->m_nRelation;
m_pImpl->nHoriOrient = pHandler->m_nOrient;
m_pImpl->nLeftPosition = pHandler->m_nPosition;
if( !m_pImpl->bUseSimplePos )
{
m_pImpl->nHoriRelation = pHandler->m_nRelation;
m_pImpl->nHoriOrient = pHandler->m_nOrient;
m_pImpl->nLeftPosition = pHandler->m_nPosition;
}
}
}
break;
@ -1286,10 +1288,12 @@ void GraphicImport::sprm(Sprm & rSprm)
if( pProperties.get( ) )
{
pProperties->resolve( *pHandler );
m_pImpl->nVertRelation = pHandler->m_nRelation;
m_pImpl->nVertOrient = pHandler->m_nOrient;
m_pImpl->nTopPosition = pHandler->m_nPosition;
if( !m_pImpl->bUseSimplePos )
{
m_pImpl->nVertRelation = pHandler->m_nRelation;
m_pImpl->nVertOrient = pHandler->m_nOrient;
m_pImpl->nTopPosition = pHandler->m_nPosition;
}
}
}
break;