Kaydet (Commit) 6cac123a authored tarafından Miklos Vajna's avatar Miklos Vajna

fdo#45183 import RTF_SHPFBLWTXT

üst 09b08d4a
...@@ -793,11 +793,15 @@ int RTFDocumentImpl::resolvePict(bool bInline) ...@@ -793,11 +793,15 @@ int RTFDocumentImpl::resolvePict(bool bInline)
{ {
// wrap sprm // wrap sprm
RTFSprms aAnchorWrapAttributes; RTFSprms aAnchorWrapAttributes;
RTFSprms aAnchorAttributes;
for (RTFSprms::Iterator_t i = m_aStates.top().aCharacterAttributes.begin(); i != m_aStates.top().aCharacterAttributes.end(); ++i) for (RTFSprms::Iterator_t i = m_aStates.top().aCharacterAttributes.begin(); i != m_aStates.top().aCharacterAttributes.end(); ++i)
{
if (i->first == NS_ooxml::LN_CT_WrapSquare_wrapText) if (i->first == NS_ooxml::LN_CT_WrapSquare_wrapText)
aAnchorWrapAttributes.set(i->first, i->second); aAnchorWrapAttributes.set(i->first, i->second);
else if (i->first == NS_rtf::LN_WR)
aAnchorAttributes.set(i->first, i->second);
}
RTFValue::Pointer_t pAnchorWrapValue(new RTFValue(aAnchorWrapAttributes)); RTFValue::Pointer_t pAnchorWrapValue(new RTFValue(aAnchorWrapAttributes));
RTFSprms aAnchorAttributes;
RTFSprms aAnchorSprms; RTFSprms aAnchorSprms;
aAnchorSprms.set(NS_ooxml::LN_CT_Anchor_extent, pExtentValue); aAnchorSprms.set(NS_ooxml::LN_CT_Anchor_extent, pExtentValue);
if (aAnchorWrapAttributes.size()) if (aAnchorWrapAttributes.size())
...@@ -3316,6 +3320,14 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) ...@@ -3316,6 +3320,14 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
} }
} }
break; break;
case RTF_SHPFBLWTXT:
if (nParam == 1)
{
// Shape is below text -> send it to the background.
m_aStates.top().aCharacterAttributes.erase(NS_ooxml::LN_CT_WrapSquare_wrapText);
m_aStates.top().aCharacterAttributes.set(NS_rtf::LN_WR, RTFValue::Pointer_t(new RTFValue(3)));
}
break;
default: default:
SAL_INFO("writerfilter", OSL_THIS_FUNC << ": TODO handle value '" << lcl_RtfToString(nKeyword) << "'"); SAL_INFO("writerfilter", OSL_THIS_FUNC << ": TODO handle value '" << lcl_RtfToString(nKeyword) << "'");
aSkip.setParsed(false); aSkip.setParsed(false);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment