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 /sc/source | |
| 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 'sc/source')
| -rw-r--r-- | sc/source/filter/oox/worksheetfragment.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx index b5d593a46ec4..703593747c22 100644 --- a/sc/source/filter/oox/worksheetfragment.cxx +++ b/sc/source/filter/oox/worksheetfragment.cxx @@ -752,6 +752,7 @@ void WorksheetFragment::importOleObject( const AttributeList& rAttribs ) void WorksheetFragment::importControl( const AttributeList& rAttribs ) { ::oox::vml::ControlInfo aInfo; + aInfo.setShapeId( rAttribs.getInteger( XML_shapeId, 0 ) ); aInfo.maFragmentPath = getFragmentPathFromRelId( rAttribs.getString( R_TOKEN( id ), OUString() ) ); aInfo.maName = rAttribs.getString( XML_name, OUString() ); getVmlDrawing().registerControl( aInfo ); @@ -888,6 +889,7 @@ void WorksheetFragment::importOleObject( SequenceInputStream& rStrm ) void WorksheetFragment::importControl( SequenceInputStream& rStrm ) { ::oox::vml::ControlInfo aInfo; + aInfo.setShapeId( rStrm.readInt32() ); aInfo.maFragmentPath = getFragmentPathFromRelId( BiffHelper::readString( rStrm ) ); rStrm >> aInfo.maName; getVmlDrawing().registerControl( aInfo ); |