Commit eb8a7be0 authored by Boris Kocherov's avatar Boris Kocherov Committed by Romain Courteaud

[erp5_only_office][erp5_officejs_ooffice] move cubefunction witch uses xmla in...

[erp5_only_office][erp5_officejs_ooffice] move cubefunction witch uses xmla in cubeFunctions.xmla.js file

it is couse by license conflict
parent f7e2adfe
......@@ -732,6 +732,7 @@ onlyoffice/sdkjs/cell/model/DrawingObjects/GlobalCounters.js\n
onlyoffice/sdkjs/cell/model/DrawingObjects/Graphics.js\n
onlyoffice/sdkjs/cell/model/DrawingObjects/ShapeDrawer.js\n
onlyoffice/sdkjs/cell/model/FormulaObjects/cubeFunctions.js\n
onlyoffice/sdkjs/cell/model/FormulaObjects/cubeFunctions.xmla.js\n
onlyoffice/sdkjs/cell/model/FormulaObjects/databaseFunctions.js\n
onlyoffice/sdkjs/cell/model/FormulaObjects/dateandtimeFunctions.js\n
onlyoffice/sdkjs/cell/model/FormulaObjects/engineeringFunctions.js\n
......@@ -1358,7 +1359,7 @@ NETWORK:\n
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>vincent</string> </value>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
......@@ -1372,7 +1373,7 @@ NETWORK:\n
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>964.55968.25998.221</string> </value>
<value> <string>965.1014.10748.13687</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -1390,7 +1391,7 @@ NETWORK:\n
</tuple>
<state>
<tuple>
<float>1516112122.46</float>
<float>1517243462.59</float>
<string>UTC</string>
</tuple>
</state>
......
......@@ -732,6 +732,7 @@ onlyoffice/sdkjs/cell/model/DrawingObjects/GlobalCounters.js\n
onlyoffice/sdkjs/cell/model/DrawingObjects/Graphics.js\n
onlyoffice/sdkjs/cell/model/DrawingObjects/ShapeDrawer.js\n
onlyoffice/sdkjs/cell/model/FormulaObjects/cubeFunctions.js\n
onlyoffice/sdkjs/cell/model/FormulaObjects/cubeFunctions.xmla.js\n
onlyoffice/sdkjs/cell/model/FormulaObjects/databaseFunctions.js\n
onlyoffice/sdkjs/cell/model/FormulaObjects/dateandtimeFunctions.js\n
onlyoffice/sdkjs/cell/model/FormulaObjects/engineeringFunctions.js\n
......@@ -1358,7 +1359,7 @@ NETWORK:\n
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>vincent</string> </value>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
......@@ -1372,7 +1373,7 @@ NETWORK:\n
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>964.55968.49879.36266</string> </value>
<value> <string>965.1012.19255.29354</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -1390,7 +1391,7 @@ NETWORK:\n
</tuple>
<state>
<tuple>
<float>1516112135.45</float>
<float>1517243409.91</float>
<string>UTC</string>
</tuple>
</state>
......
......@@ -732,6 +732,7 @@ onlyoffice/sdkjs/cell/model/DrawingObjects/GlobalCounters.js\n
onlyoffice/sdkjs/cell/model/DrawingObjects/Graphics.js\n
onlyoffice/sdkjs/cell/model/DrawingObjects/ShapeDrawer.js\n
onlyoffice/sdkjs/cell/model/FormulaObjects/cubeFunctions.js\n
onlyoffice/sdkjs/cell/model/FormulaObjects/cubeFunctions.xmla.js\n
onlyoffice/sdkjs/cell/model/FormulaObjects/databaseFunctions.js\n
onlyoffice/sdkjs/cell/model/FormulaObjects/dateandtimeFunctions.js\n
onlyoffice/sdkjs/cell/model/FormulaObjects/engineeringFunctions.js\n
......@@ -1358,7 +1359,7 @@ NETWORK:\n
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>vincent</string> </value>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
......@@ -1372,7 +1373,7 @@ NETWORK:\n
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>964.55968.37475.41574</string> </value>
<value> <string>965.1007.59634.37529</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -1390,7 +1391,7 @@ NETWORK:\n
</tuple>
<state>
<tuple>
<float>1516112091.51</float>
<float>1517243378.3</float>
<string>UTC</string>
</tuple>
</state>
......
......@@ -517,6 +517,7 @@ onlyoffice/sdkjs/cell/model/DrawingObjects/GlobalCounters.js
onlyoffice/sdkjs/cell/model/DrawingObjects/Graphics.js
onlyoffice/sdkjs/cell/model/DrawingObjects/ShapeDrawer.js
onlyoffice/sdkjs/cell/model/FormulaObjects/cubeFunctions.js
onlyoffice/sdkjs/cell/model/FormulaObjects/cubeFunctions.xmla.js
onlyoffice/sdkjs/cell/model/FormulaObjects/databaseFunctions.js
onlyoffice/sdkjs/cell/model/FormulaObjects/dateandtimeFunctions.js
onlyoffice/sdkjs/cell/model/FormulaObjects/engineeringFunctions.js
......
......@@ -105,7 +105,7 @@
"../cell/model/FormulaObjects/xlfnFunctions.js",
"../cell/model/FormulaObjects/dateandtimeFunctions.js",
"../cell/model/FormulaObjects/engineeringFunctions.js",
"../cell/model/FormulaObjects/cubeFunctions.js",
"../cell/model/FormulaObjects/cubeFunctions.xmla.js",
"../cell/model/FormulaObjects/databaseFunctions.js",
"../cell/model/FormulaObjects/textanddataFunctions.js",
"../cell/model/FormulaObjects/statisticalFunctions.js",
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="File" module="OFS.Image"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Cacheable__manager_id</string> </key>
<value> <string>http_cache</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
<value> <string>cubeFunctions.xmla.js</string> </value>
</item>
<item>
<key> <string>content_type</string> </key>
<value> <string>text/javascript</string> </value>
</item>
<item>
<key> <string>precondition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment