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 /include/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 'include/oox')
| -rw-r--r-- | include/oox/export/vmlexport.hxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx index 4ee885fba6bd..dd5edc57c208 100644 --- a/include/oox/export/vmlexport.hxx +++ b/include/oox/export/vmlexport.hxx @@ -86,6 +86,7 @@ class OOX_DLLPUBLIC VMLExport : public EscherEx sal_Int16 m_eHOri, m_eVOri, m_eHRel, m_eVRel; rtl::Reference<sax_fastparser::FastAttributeList> m_pWrapAttrList; bool m_bInline; // css::text::TextContentAnchorType_AS_CHARACTER + bool m_IsFollowingTextFlow = false; /// The object we're exporting. const SdrObject* m_pSdrObject; @@ -140,8 +141,9 @@ public: /// Export the sdr object as VML. /// /// Call this when you need to export the object as VML. - OString const & AddSdrObject( const SdrObject& rObj, sal_Int16 eHOri = -1, - sal_Int16 eVOri = -1, sal_Int16 eHRel = -1, + OString const & AddSdrObject( const SdrObject& rObj, + bool const bIsFollowingTextFlow = false, + sal_Int16 eHOri = -1, sal_Int16 eVOri = -1, sal_Int16 eHRel = -1, sal_Int16 eVRel = -1, sax_fastparser::FastAttributeList* pWrapAttrList = nullptr, const bool bOOxmlExport = false ); |