diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-08-09 16:06:17 +0200 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-08-09 19:07:33 +0200 |
| commit | 4a764319cbad4e2589cc105145ac27defbf49ff6 (patch) | |
| tree | 9e020cfde1025dea3b1b1fc5839bba27b39ddd8e /oox/source/vml/vmldrawingfragment.cxx | |
| parent | 286c27e805c4501451857abff19c23b3719146a3 (diff) | |
tdf#91384: DOCX: import ActiveX controls
Change-Id: Iebf2ff65fcec3231acfc962fb2f1abc2ed2dc67a
Reviewed-on: https://gerrit.libreoffice.org/40930
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'oox/source/vml/vmldrawingfragment.cxx')
| -rw-r--r-- | oox/source/vml/vmldrawingfragment.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/oox/source/vml/vmldrawingfragment.cxx b/oox/source/vml/vmldrawingfragment.cxx index c1bed09b73fd..5f7c91f24934 100644 --- a/oox/source/vml/vmldrawingfragment.cxx +++ b/oox/source/vml/vmldrawingfragment.cxx @@ -51,7 +51,8 @@ ContextHandlerRef DrawingFragment::onCreateContext( sal_Int32 nElement, const At { // DOCX filter handles plain shape elements with this fragment handler case VMLDRAWING_WORD: - if ( getNamespace( nElement ) == NMSP_vml ) + if ( getNamespace( nElement ) == NMSP_vml + || nElement == W_TOKEN(control) ) // Control shape also defined as a vml shape return ShapeContextBase::createShapeContext( *this, mrDrawing.getShapes(), nElement, rAttribs ); break; |