summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2017-08-23 20:09:35 +0200
committerTamás Zolnai <tamas.zolnai@collabora.com>2017-08-23 22:16:02 +0200
commitb129421764ae78a1422812169fce8eb4914a6b22 (patch)
tree4365061e70fb02dd05d045071f83440aca97600e /oox
parentc66568d6b0bbcce26cbdc5a4e5f6e4c0ae748e45 (diff)
DOCX: Fix an other test case of ActiveX control export
When LO control is anchored to the end of the run, it is exported into a new run. Change-Id: I9269fd1b34924780aad61c452d1e2094dc8e4aad Reviewed-on: https://gerrit.libreoffice.org/41472 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/export/vmlexport.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index f45edde6cc86..c4c3f3679861 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -1311,6 +1311,7 @@ OString VMLExport::AddSdrObject( const SdrObject& rObj, sal_Int16 eHOri, sal_Int
m_eVOri = eVOri;
m_eHRel = eHRel;
m_eVRel = eVRel;
+ m_bInline = false;
EscherEx::AddSdrObject(rObj, bOOxmlExport);
return m_sShapeId;
}
@@ -1318,6 +1319,10 @@ OString VMLExport::AddSdrObject( const SdrObject& rObj, sal_Int16 eHOri, sal_Int
OString VMLExport::AddInlineSdrObject( const SdrObject& rObj, const bool bOOxmlExport )
{
m_pSdrObject = &rObj;
+ m_eHOri = -1;
+ m_eVOri = -1;
+ m_eHRel = -1;
+ m_eVRel = -1;
m_bInline = true;
EscherEx::AddSdrObject(rObj, bOOxmlExport);
return m_sShapeId;