summaryrefslogtreecommitdiff
path: root/sc/source/filter/inc/xeescher.hxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2021-07-06 14:31:07 +0200
committerMiklos Vajna <vmiklos@collabora.com>2021-07-06 15:50:08 +0200
commit7e7a871bcd4f923b015a7e040969335696b434c6 (patch)
tree9dbae9e89d51343be5454bd0c198095290dae54a /sc/source/filter/inc/xeescher.hxx
parent3d81ae0fbe5a3a8d2b27a2e7b8c4aff2b52ba3c1 (diff)
XLSX export: handle macros on button form controls
This builds on top of commit 1e3263a677b61c718d0fd1be15c066b933f7de18 (XLSX export: handle button form controls, 2021-07-01). The binary XLS export already had code to turn Calc macro names into Excel ones, reuse that for XLSX purposes. Also fix the unwanted named range on export, oox::xls::FormulaParser::importMacroName() mentions how XLSX doesn't have matching named ranges for vba macros (while XLS has), mirror this on the export side as well. Change-Id: I877b6ba2c2e834a2327482da5cadcddf1b4672bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118485 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
Diffstat (limited to 'sc/source/filter/inc/xeescher.hxx')
-rw-r--r--sc/source/filter/inc/xeescher.hxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx
index f775571cac53..6ffc5d3bf1ab 100644
--- a/sc/source/filter/inc/xeescher.hxx
+++ b/sc/source/filter/inc/xeescher.hxx
@@ -194,6 +194,7 @@ protected:
class XclMacroHelper : public XclExpControlHelper
{
XclTokenArrayRef mxMacroLink; /// Token array containing a link to an attached macro.
+ OUString maMacroName;
public:
explicit XclMacroHelper( const XclExpRoot& rRoot );
@@ -207,6 +208,7 @@ public:
/** Sets the name of a macro
@return true = The passed macro name has been found. */
bool SetMacroLink( const OUString& rMacro );
+ OUString GetMacroName() const;
};
class XclExpShapeObj : public XclObjAny, public XclMacroHelper