diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-02-22 14:11:05 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-02-22 19:09:36 +0100 |
| commit | 60b61fdaf85cecea0f972fc435530ee5d7492c98 (patch) | |
| tree | 86ddf20241c11b4c407781362ceb7859bf31b979 /oox | |
| parent | bed8fb89abd980d08c5612f5f100bfad4ef0bca8 (diff) | |
oox: VML export: write o:allowincell attribute on shapes
Apparently the default is "t", which causes a fly that is anchored
at-page with the first content on the page being a table to be wrongly
positioned.
Change-Id: Iba1b961c6e884b2a55928952937187732ef73a5a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111336
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/vmlexport.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx index 07157edc3f85..9c6b89ef7dd7 100644 --- a/oox/source/export/vmlexport.cxx +++ b/oox/source/export/vmlexport.cxx @@ -1400,6 +1400,8 @@ sal_Int32 VMLExport::StartShape() break; } + m_pShapeAttrList->addNS(XML_o, XML_allowincell, m_IsFollowingTextFlow ? "t" : "f"); + // add style m_pShapeAttrList->add( XML_style, m_ShapeStyle.makeStringAndClear() ); @@ -1530,7 +1532,9 @@ void VMLExport::EndShape( sal_Int32 nShapeElement ) m_pSerializer->endElementNS( XML_v, nShapeElement ); } -OString const & VMLExport::AddSdrObject( const SdrObject& rObj, sal_Int16 eHOri, sal_Int16 eVOri, sal_Int16 eHRel, sal_Int16 eVRel, +OString const & VMLExport::AddSdrObject( const SdrObject& rObj, + bool const bIsFollowingTextFlow, + sal_Int16 eHOri, sal_Int16 eVOri, sal_Int16 eHRel, sal_Int16 eVRel, FastAttributeList* pWrapAttrList, const bool bOOxmlExport ) { @@ -1541,6 +1545,7 @@ OString const & VMLExport::AddSdrObject( const SdrObject& rObj, sal_Int16 eHOri, m_eVRel = eVRel; m_pWrapAttrList = pWrapAttrList; m_bInline = false; + m_IsFollowingTextFlow = bIsFollowingTextFlow; EscherEx::AddSdrObject(rObj, bOOxmlExport); return m_sShapeId; } @@ -1554,6 +1559,7 @@ OString const & VMLExport::AddInlineSdrObject( const SdrObject& rObj, const bool m_eVRel = -1; m_pWrapAttrList.clear(); m_bInline = true; + m_IsFollowingTextFlow = true; EscherEx::AddSdrObject(rObj, bOOxmlExport); return m_sShapeId; } |