diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-08-03 19:58:22 +0200 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-08-04 02:12:32 +0200 |
| commit | c8e3633a352c2fda3aebb9781288a926e7a88c42 (patch) | |
| tree | 68236e614bf64dd3522c0226806b2e4b3386d3e2 /include/oox | |
| parent | 345994dad91765e5356f95786146bf8aca5a4aa3 (diff) | |
Make ActiveX controls import working again (PPTX / XLSX)
It used to work earlier, but there were an issue with the
shape id and so controls were not find. Also in PPTX import
the persistStorage attribute was handled only for parent
controls and not for other kind of controls.
Change-Id: I9784166b65407b79b6dfed8a38087b55b1b69835
Reviewed-on: https://gerrit.libreoffice.org/40751
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'include/oox')
| -rw-r--r-- | include/oox/vml/vmldrawing.hxx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/oox/vml/vmldrawing.hxx b/include/oox/vml/vmldrawing.hxx index e9309f6c8497..032d29494a44 100644 --- a/include/oox/vml/vmldrawing.hxx +++ b/include/oox/vml/vmldrawing.hxx @@ -78,14 +78,10 @@ struct OOX_DLLPUBLIC OleObjectInfo : public ::oox::ole::OleObjectInfo /** Contains information about a form control embedded in a draw page. */ struct OOX_DLLPUBLIC ControlInfo { - OUString maShapeId; ///< Shape identifier for shape lookup. OUString maFragmentPath; ///< Path to the fragment describing the form control properties. OUString maName; ///< Programmatical name of the form control. explicit ControlInfo(); - - /** Sets the string representation of the passed numeric shape identifier. */ - void setShapeId( sal_Int32 nShapeId ); }; |