Skip to Content
Last modified by Yana Oksner on 2025/07/18 12:19
From version 4.1
edited by Yana Oksner
on 2024/12/03 16:51
Change comment: Install extension [com.xwiki.pro:xwiki-pro-macros/1.25.1]
To version 1.1
edited by Yana Oksner
on 2023/11/13 11:24
Change comment: Install extension [com.xwiki.pro:xwiki-pro-macros/1.9.2]

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,1 @@
1 -Legacy Confluence Bridge for Office Excel
1 +Office Excel Macro
Content
... ... @@ -1,5 +3,3 @@
1 -This is a legacy, unprefixed Confluence bridge for the ViewXLS macro. Please use view-file instead.
2 -
3 3  {{code}}
4 4  {{viewxls att--filename="XLSExample.xls"/}}
5 5  {{/code}}
XWiki.WikiMacroClass[0]
Macro code
... ... @@ -1,21 +1,24 @@
1 1  {{velocity output="false"}}
2 2  #macro (executeMacro)
3 - #set ($unescapedFilename = $xcontext.macro.params.get('att--filename'))
4 - #if (!$unescapedFilename)
5 - #set ($unescapedFilename = $xcontext.macro.params.get('name'))
3 + #set ($filename = $xcontext.macro.params.get('att--filename'))
4 + #if (!$filename)
5 + #set ($filename = $xcontext.macro.params.get('name'))
6 6   #end
7 - #set($escapedFilename = $services.rendering.escape($unescapedFilename, $xwiki.currentContentSyntaxId))
8 - {{office reference="$escapedFilename" /}}
7 + {{office reference="$filename" /}}
9 9  #end
10 10  {{/velocity}}
11 11  
11 +{{include reference="Licenses.Code.VelocityMacros"/}}
12 +
12 12  {{velocity}}
13 13  ## We need to check if there is a valid license because the macro is registered even if the user doesn't have view right
14 14  ## on the macro definition page. See XWIKI-14828: Rendering macros defined in wiki pages are available to users that
15 15  ## don't have view right on those pages.
16 -#if ($services.promacrolicensing.hasLicensureForEntity($xcontext.macro.doc.documentReference))
17 +#if ($services.licensing.licensor.hasLicensureForEntity($xcontext.macro.doc.documentReference))
17 17   #executeMacro
18 18  #else
19 - {{missingLicenseMessage extensionName="proMacros.extension.name"/}}
20 + {{error}}
21 + #getMissingLicenseMessage('proMacros.extension.name')
22 + {{/error}}
20 20  #end
21 21  {{/velocity}}
Default categories
... ... @@ -1,1 +1,0 @@
1 -Deprecated
Macro description
... ... @@ -1,1 +1,1 @@
1 -Legacy Confluence bridge for View Office Excel.
1 +View Office Excel documents.
Macro name
... ... @@ -1,1 +1,1 @@
1 -Legacy Confluence bridge for View Office Excel
1 +View Xls
XWiki.WikiMacroParameterClass[0]
Parameter mandatory
... ... @@ -1,1 +1,0 @@
1 -Yes