tdf#150868: Add support for HSTACK function

Change-Id: I105ffabc8dd1fa58bf3acec4a81c3217061d3a26
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181100
Reviewed-by: Xisco Fauli <[email protected]>
Tested-by: Jenkins

Author: Xisco Fauli

formula/inc/core_resource.hrc

@@ -285,6 +285,7 @@ const std::pair<const char *, int> RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF[] =
     { "COM.MICROSOFT.CHOOSEROWS" , SC_OPCODE_CHOOSEROWS },
     { "COM.MICROSOFT.DROP" , SC_OPCODE_DROP },
     { "COM.MICROSOFT.EXPAND" , SC_OPCODE_EXPAND },
+    { "COM.MICROSOFT.HSTACK" , SC_OPCODE_HSTACK },
     { "COM.MICROSOFT.TAKE" , SC_OPCODE_TAKE },
     { "COM.MICROSOFT.TOCOL" , SC_OPCODE_TOCOL },
     { "COM.MICROSOFT.TOROW" , SC_OPCODE_TOROW },
@@ -751,6 +752,7 @@ const std::pair<const char *, int> RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML[] =
     { "_xlfn.CHOOSEROWS" , SC_OPCODE_CHOOSEROWS },
     { "_xlfn.DROP" , SC_OPCODE_DROP },
     { "_xlfn.EXPAND" , SC_OPCODE_EXPAND },
+    { "_xlfn.HSTACK" , SC_OPCODE_HSTACK },
     { "_xlfn.TAKE" , SC_OPCODE_TAKE },
     { "_xlfn.TOCOL" , SC_OPCODE_TOCOL },
     { "_xlfn.TOROW" , SC_OPCODE_TOROW },
@@ -1220,6 +1222,7 @@ const std::pair<const char *, int> RID_STRLIST_FUNCTION_NAMES_ENGLISH_PODF[] =
     { "CHOOSEROWS" , SC_OPCODE_CHOOSEROWS },
     { "DROP" , SC_OPCODE_DROP },
     { "EXPAND" , SC_OPCODE_EXPAND },
+    { "HSTACK" , SC_OPCODE_HSTACK },
     { "TAKE" , SC_OPCODE_TAKE },
     { "TOCOL" , SC_OPCODE_TOCOL },
     { "TOROW" , SC_OPCODE_TOROW },
@@ -1689,6 +1692,7 @@ const std::pair<const char *, int> RID_STRLIST_FUNCTION_NAMES_ENGLISH_API[] =
     { "CHOOSEROWS" , SC_OPCODE_CHOOSEROWS },
     { "DROP" , SC_OPCODE_DROP },
     { "EXPAND" , SC_OPCODE_EXPAND },
+    { "HSTACK" , SC_OPCODE_HSTACK },
     { "TAKE" , SC_OPCODE_TAKE },
     { "TOCOL" , SC_OPCODE_TOCOL },
     { "TOROW" , SC_OPCODE_TOROW },
@@ -2156,6 +2160,7 @@ const std::pair<const char *, int> RID_STRLIST_FUNCTION_NAMES_ENGLISH[] =
     { "CHOOSEROWS" , SC_OPCODE_CHOOSEROWS },
     { "DROP" , SC_OPCODE_DROP },
     { "EXPAND" , SC_OPCODE_EXPAND },
+    { "HSTACK" , SC_OPCODE_HSTACK },
     { "TAKE" , SC_OPCODE_TAKE },
     { "TOCOL" , SC_OPCODE_TOCOL },
     { "TOROW" , SC_OPCODE_TOROW },
@@ -2604,6 +2609,7 @@ const std::pair<TranslateId, int> RID_STRLIST_FUNCTION_NAMES[] =
     { NC_("RID_STRLIST_FUNCTION_NAMES", "CHOOSEROWS") , SC_OPCODE_CHOOSEROWS },
     { NC_("RID_STRLIST_FUNCTION_NAMES", "DROP") , SC_OPCODE_DROP },
     { NC_("RID_STRLIST_FUNCTION_NAMES", "EXPAND") , SC_OPCODE_EXPAND },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "HSTACK") , SC_OPCODE_HSTACK },
     { NC_("RID_STRLIST_FUNCTION_NAMES", "TAKE") , SC_OPCODE_TAKE },
     { NC_("RID_STRLIST_FUNCTION_NAMES", "TOCOL") , SC_OPCODE_TOCOL },
     { NC_("RID_STRLIST_FUNCTION_NAMES", "TOROW") , SC_OPCODE_TOROW },

formula/source/core/api/FormulaCompiler.cxx

@@ -1283,6 +1283,7 @@ bool FormulaCompiler::IsMatrixFunction( OpCode eOpCode )
         case ocChooseRows :
         case ocDrop :
         case ocExpand :
+        case ocHStack :
         case ocTake :
         case ocToCol :
         case ocToRow :

include/formula/compiler.hxx

@@ -521,13 +521,14 @@
 #define SC_OPCODE_CHOOSEROWS        506
 #define SC_OPCODE_DROP              507
 #define SC_OPCODE_EXPAND            508
-#define SC_OPCODE_TAKE              509
-#define SC_OPCODE_TOCOL             510
-#define SC_OPCODE_TOROW             511
-#define SC_OPCODE_UNIQUE            512
-#define SC_OPCODE_WRAPCOLS          513
-#define SC_OPCODE_WRAPROWS          514
-#define SC_OPCODE_STOP_2_PAR        515     /* last function with two or more parameters' OpCode + 1 */
+#define SC_OPCODE_HSTACK            509
+#define SC_OPCODE_TAKE              510
+#define SC_OPCODE_TOCOL             511
+#define SC_OPCODE_TOROW             512
+#define SC_OPCODE_UNIQUE            513
+#define SC_OPCODE_WRAPCOLS          514
+#define SC_OPCODE_WRAPROWS          515
+#define SC_OPCODE_STOP_2_PAR        516     /* last function with two or more parameters' OpCode + 1 */
 
 #define SC_OPCODE_STOP_FUNCTION     SC_OPCODE_STOP_2_PAR            /* last function's OpCode + 1 */
 #define SC_OPCODE_LAST_OPCODE_ID    (SC_OPCODE_STOP_FUNCTION - 1)   /* last OpCode */

include/formula/opcode.hxx

@@ -517,6 +517,7 @@ enum OpCode : sal_uInt16
         ocChooseRows        = SC_OPCODE_CHOOSEROWS,
         ocDrop              = SC_OPCODE_DROP,
         ocExpand            = SC_OPCODE_EXPAND,
+        ocHStack            = SC_OPCODE_HSTACK,
         ocTake              = SC_OPCODE_TAKE,
         ocToCol             = SC_OPCODE_TOCOL,
         ocToRow             = SC_OPCODE_TOROW,
@@ -1011,6 +1012,7 @@ inline std::string OpCodeEnumToString(OpCode eCode)
     case ocChooseRows: return "ChooseRows";
     case ocDrop: return "Drop";
     case ocExpand: return "Expand";
+    case ocHStack: return "HStack";
     case ocTake: return "Take";
     case ocToCol: return "ToCol";
     case ocToRow: return "ToRow";

sc/README.md

@@ -59,6 +59,7 @@ https://docs.oasis-open.org/office/OpenDocument/v1.3/os/part4-formula/OpenDocume
   * CHOOSEROWS
   * DROP
   * EXPAND
+  * HSTACK
   * TAKE
   * TOCOL
   * TOROW

sc/inc/helpids.h

@@ -604,6 +604,7 @@ inline constexpr OUString HID_FUNC_CHOOSECOLS_MS = u"SC_HID_FUNC_CHOOSECOLS_MS"_
 inline constexpr OUString HID_FUNC_CHOOSEROWS_MS = u"SC_HID_FUNC_CHOOSEROWS_MS"_ustr;
 inline constexpr OUString HID_FUNC_DROP_MS = u"SC_HID_FUNC_DROP_MS"_ustr;
 inline constexpr OUString HID_FUNC_EXPAND_MS = u"SC_HID_FUNC_EXPAND_MS"_ustr;
+inline constexpr OUString HID_FUNC_HSTACK_MS = u"SC_HID_FUNC_HSTACK_MS"_ustr;
 inline constexpr OUString HID_FUNC_TAKE_MS = u"SC_HID_FUNC_TAKE_MS"_ustr;
 inline constexpr OUString HID_FUNC_TOCOL_MS = u"SC_HID_FUNC_TOCOL_MS"_ustr;
 inline constexpr OUString HID_FUNC_TOROW_MS = u"SC_HID_FUNC_TOROW_MS"_ustr;

sc/inc/scfuncs.hrc

@@ -4301,6 +4301,16 @@ const TranslateId SC_OPCODE_EXPAND_ARY[] =
     NC_("SC_OPCODE_EXPAND", "The value with which to pad. The default is #N/A.")
 };
 
+// -=*# Resource for function HSTACK #*=-
+const TranslateId SC_OPCODE_HSTACK_ARY[] =
+{
+    NC_("SC_OPCODE_HSTACK", "Appends arrays horizontally to create a larger array"),
+    NC_("SC_OPCODE_HSTACK", "Array"),
+    NC_("SC_OPCODE_HSTACK", "The first array to append."),
+    NC_("SC_OPCODE_HSTACK", "Array 2"),
+    NC_("SC_OPCODE_HSTACK", "Array 2, Array 3,... The following arrays to append. if an array has fewer rows, #N/A error will be returned in the additional rows."),
+};
+
 // -=*# Resource for function TAKE #*=-
 const TranslateId SC_OPCODE_TAKE_ARY[] =
 {

sc/qa/extras/scfunctionlistobj.cxx

@@ -77,7 +77,7 @@ class ScFunctionListObj : public UnoApiTest,
 ScFunctionListObj::ScFunctionListObj()
     : UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr)
     , XElementAccess(cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get())
-    , XIndexAccess(413)
+    , XIndexAccess(414)
     , XNameAccess(u"IF"_ustr)
     , XServiceInfo(u"stardiv.StarCalc.ScFunctionListObj"_ustr,
                    u"com.sun.star.sheet.FunctionDescriptions"_ustr)