diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-08-09 05:59:44 +0200 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-08-09 19:07:22 +0200 |
| commit | 286c27e805c4501451857abff19c23b3719146a3 (patch) | |
| tree | bf0d544fe59674b76427830b18f9a44bcc341b5e /include | |
| parent | f394b313ad9eac459e4765a639410ebd9278351a (diff) | |
tdf#111548: Better fix for PPTX / XLSX import of ActiveX controls
Follow up fix for:
c8e3633a352c2fda3aebb9781288a926e7a88c42
Revert part of it and fix the real issue: shapid was
messed up.
Change-Id: I1fb87a7eae4d9054fe19c203af4aeead7db35898
Reviewed-on: https://gerrit.libreoffice.org/40929
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/vml/vmldrawing.hxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/oox/vml/vmldrawing.hxx b/include/oox/vml/vmldrawing.hxx index 032d29494a44..e9309f6c8497 100644 --- a/include/oox/vml/vmldrawing.hxx +++ b/include/oox/vml/vmldrawing.hxx @@ -78,10 +78,14 @@ 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 ); }; |