diff options
Diffstat (limited to 'sw/source/filter/ww8')
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 3 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxsdrexport.cxx | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index e9c09f206d01..0eb2a733ac33 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -30,6 +30,7 @@ #include <fchrfmt.hxx> #include <tgrditem.hxx> #include <fmtruby.hxx> +#include <fmtfollowtextflow.hxx> #include <fmtanchr.hxx> #include <breakit.hxx> #include <redline.hxx> @@ -5345,11 +5346,13 @@ void DocxAttributeOutput::WriteActiveXControl(const SdrObject* pObject, const Sw } else { + SwFormatFollowTextFlow const& rFlow(rFrameFormat.GetFollowTextFlow()); const SwFormatHoriOrient& rHoriOri = rFrameFormat.GetHoriOrient(); const SwFormatVertOrient& rVertOri = rFrameFormat.GetVertOrient(); SwFormatSurround const& rSurround(rFrameFormat.GetSurround()); std::unique_ptr<sax_fastparser::FastAttributeList> pAttrList(docx::SurroundToVMLWrap(rSurround)); sShapeId = m_rExport.VMLExporter().AddSdrObject(*pObject, + rFlow.GetValue(), rHoriOri.GetHoriOrient(), rVertOri.GetVertOrient(), rHoriOri.GetRelationOrient(), rVertOri.GetRelationOrient(), diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index a1f8b7b2f5be..57fa2d708126 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -24,6 +24,7 @@ #include <fmtcntnt.hxx> #include <fmtornt.hxx> #include <fmtfsize.hxx> +#include <fmtfollowtextflow.hxx> #include <frmatr.hxx> #include <fmtwrapinfluenceonobjpos.hxx> #include "docxattributeoutput.hxx" @@ -825,6 +826,7 @@ void DocxSdrExport::writeVMLDrawing(const SdrObject* sdrObj, const SwFrameFormat m_pImpl->getDrawingML()->SetFS(m_pImpl->getSerializer()); // See WinwordAnchoring::SetAnchoring(), these are not part of the SdrObject, have to be passed around manually. + SwFormatFollowTextFlow const& rFlow(rFrameFormat.GetFollowTextFlow()); const SwFormatHoriOrient& rHoriOri = rFrameFormat.GetHoriOrient(); const SwFormatVertOrient& rVertOri = rFrameFormat.GetVertOrient(); SwFormatSurround const& rSurround(rFrameFormat.GetSurround()); @@ -832,8 +834,8 @@ void DocxSdrExport::writeVMLDrawing(const SdrObject* sdrObj, const SwFrameFormat std::unique_ptr<sax_fastparser::FastAttributeList> pAttrList( docx::SurroundToVMLWrap(rSurround)); m_pImpl->getExport().VMLExporter().AddSdrObject( - *sdrObj, rHoriOri.GetHoriOrient(), rVertOri.GetVertOrient(), rHoriOri.GetRelationOrient(), - rVertOri.GetRelationOrient(), std::move(pAttrList), true); + *sdrObj, rFlow.GetValue(), rHoriOri.GetHoriOrient(), rVertOri.GetVertOrient(), + rHoriOri.GetRelationOrient(), rVertOri.GetRelationOrient(), std::move(pAttrList), true); m_pImpl->getSerializer()->endElementNS(XML_w, XML_pict); } |