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

implement wzDescription property for shapes

Browse source
This commit is contained in:
Miklos Vajna 2011-06-16 15:56:52 +02:00
parent 5a4ec333d3
commit 0b15358916
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
writerfilter/source/rtftok/rtfdocumentimpl.cxx
View file

@ -231,7 +231,7 @@ int RTFDocumentImpl::resolvePict(char ch, bool bInline)
// inline docpr sprm
RTFSprms_t aInlineDocprAttributes;
for (RTFSprms_t::iterator i = m_aStates.top().aCharacterAttributes.begin(); i != m_aStates.top().aCharacterAttributes.end(); ++i)
if (i->first == NS_ooxml::LN_CT_NonVisualDrawingProps_name)
if (i->first == NS_ooxml::LN_CT_NonVisualDrawingProps_name || i->first == NS_ooxml::LN_CT_NonVisualDrawingProps_descr)
aInlineDocprAttributes.push_back(make_pair(i->first, i->second));
RTFValue::Pointer_t pInlineDocprValue(new RTFValue(aInlineDocprAttributes));
RTFSprms_t aInlineAttributes;
@ -260,7 +260,7 @@ int RTFDocumentImpl::resolvePict(char ch, bool bInline)
// anchor docpr sprm
RTFSprms_t aAnchorDocprAttributes;
for (RTFSprms_t::iterator i = m_aStates.top().aCharacterAttributes.begin(); i != m_aStates.top().aCharacterAttributes.end(); ++i)
if (i->first == NS_ooxml::LN_CT_NonVisualDrawingProps_name)
if (i->first == NS_ooxml::LN_CT_NonVisualDrawingProps_name || i->first == NS_ooxml::LN_CT_NonVisualDrawingProps_descr)
aAnchorDocprAttributes.push_back(make_pair(i->first, i->second));
RTFValue::Pointer_t pAnchorDocprValue(new RTFValue(aAnchorDocprAttributes));
RTFSprms_t aAnchorAttributes;
@ -1616,6 +1616,12 @@ void RTFDocumentImpl::resolveShapeProperties(std::vector<std::pair<rtl::OUString
RTFValue::Pointer_t pValue(new RTFValue(i->second));
m_aStates.top().aCharacterAttributes.push_back(make_pair(NS_ooxml::LN_CT_NonVisualDrawingProps_name, pValue));
}
else if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("wzDescription")))
{
RTFValue::Pointer_t pValue(new RTFValue(i->second));
m_aStates.top().aCharacterAttributes.push_back(make_pair(NS_ooxml::LN_CT_NonVisualDrawingProps_descr, pValue));
OSL_TRACE("debug, adding wzDescription");
}
else
OSL_TRACE("%s: TODO handle shape property '%s':'%s'", OSL_THIS_FUNC,
OUStringToOString( i->first, RTL_TEXTENCODING_UTF8 ).getStr(),