diff options
| author | Justin Luth <justin.luth@collabora.com> | 2023-01-12 11:18:55 -0500 |
|---|---|---|
| committer | Justin Luth <jluth@mail.com> | 2023-01-15 02:09:06 +0000 |
| commit | d50eca2a30bdabdc1735c590d6ec1913c6dd22fd (patch) | |
| tree | f8d8a738c60fa0c69954a9fbf684a2e7640d8740 /sc | |
| parent | 37e3455a13ab5741104bf41d05a80e60a4612682 (diff) | |
tdf#117266 sc oox: export vml button with a correct name
Without a correctly formatted ID, LO was unable to import
the shape into the spreadsheet. Now at least the button
shows up and can be pressed.
MS Word already showed the button before the patch,
so nothing there has changed. That suggests that our
problem may be more during import.
This code path is also followed by DOC and DOCX formats,
but they do completely different things with the results.
This is super nasty code...
Change-Id: I383736a7de9c3e94b427d5747e5949c0348dcecd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145509
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/xeescher.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index 0a139e820dca..00b1b53a76a1 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -1187,9 +1187,11 @@ void XclExpTbxControlObj::SaveVml(XclExpXmlStream& rStrm) lcl_GetFromTo(mrRoot, pObj->GetLogicRect(), GetTab(), aAreaFrom, aAreaTo); VmlFormControlExporter aFormControlExporter(rStrm.GetCurrentStream(), GetObjType(), aAreaFrom, aAreaTo, msLabel, GetMacroName()); + aFormControlExporter.SetSkipwzName(true); // use XML_id for legacyid, not XML_ID + aFormControlExporter.OverrideShapeIDGen(true, "_x0000_s"); aFormControlExporter.AddSdrObject(*pObj, /*bIsFollowingTextFlow=*/false, /*eHOri=*/-1, /*eVOri=*/-1, /*eHRel=*/-1, /*eVRel=*/-1, - /*pWrapAttrList=*/nullptr, /*bOOxmlExport=*/true); + /*pWrapAttrList=*/nullptr, /*bOOxmlExport=*/true, mnShapeId); } // save into xl\drawings\drawing1.xml |