summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.com>2014-03-05 20:21:04 +0100
committerTomaž Vajngerl <tomaz.vajngerl@collabora.com>2014-03-05 20:24:03 +0100
commitce5cca0cdad0a414d7f5a8e007a38755e1ae1b51 (patch)
treec88a9fea52c398605d4511be97117cba8ab5b6f9 /sw
parent25acc2efb9df1090f9bb8f696fa1d43508b7a9b8 (diff)
ooxml export: writer anchorId for "inline" element
Change-Id: I366c329cbdcafdda87feef73802b4d1be991bb4f
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ww8/docxsdrexport.cxx19
1 files changed, 13 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index eeca450d40ac..835892c9f95a 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -405,12 +405,19 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS
}
else
{
- m_pImpl->m_pSerializer->startElementNS(XML_wp, XML_inline,
- XML_distT, OString::number(TwipsToEMU(pULSpaceItem.GetUpper())).getStr(),
- XML_distB, OString::number(TwipsToEMU(pULSpaceItem.GetLower())).getStr(),
- XML_distL, OString::number(TwipsToEMU(pLRSpaceItem.GetLeft())).getStr(),
- XML_distR, OString::number(TwipsToEMU(pLRSpaceItem.GetRight())).getStr(),
- FSEND);
+ sax_fastparser::FastAttributeList* aAttrList = m_pImpl->m_pSerializer->createAttrList();
+ aAttrList->add(XML_distT, OString::number(TwipsToEMU(pULSpaceItem.GetUpper())).getStr());
+ aAttrList->add(XML_distB, OString::number(TwipsToEMU(pULSpaceItem.GetLower())).getStr());
+ aAttrList->add(XML_distL, OString::number(TwipsToEMU(pLRSpaceItem.GetLeft())).getStr());
+ aAttrList->add(XML_distR, OString::number(TwipsToEMU(pLRSpaceItem.GetRight())).getStr());
+ const SdrObject* pObj = pFrmFmt->FindRealSdrObject();
+ if (pObj != NULL)
+ {
+ OUString sAnchorId = lclGetAnchorIdFromGrabBag(pObj);
+ if (!sAnchorId.isEmpty())
+ aAttrList->addNS(XML_wp14, XML_anchorId, OUStringToOString(sAnchorId, RTL_TEXTENCODING_UTF8));
+ }
+ m_pImpl->m_pSerializer->startElementNS(XML_wp, XML_inline, aAttrList);
}
// now the common parts