[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source

Eike Rathke erack at redhat.com
Fri Aug 7 05:25:19 PDT 2015


 sc/source/core/tool/parclass.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fc47e7bb752a60297327de2740fbcde63332522f
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Jul 21 16:09:34 2015 +0200

    MATCH, HLOOKUP and VLOOKUP have a ReferenceOrForceArray parameter
    
    tdf#91278 related
    
    Change-Id: Iab4728b07649bcbb1beb372e68369f3762b13a5c
    (cherry picked from commit 01eea7fe40c939311bf1920b6e8b4391a93c2e82)
    Reviewed-on: https://gerrit.libreoffice.org/17264
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index 8afc2b0..61c79cc 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -114,7 +114,7 @@ const ScParameterClassification::RawData ScParameterClassification::pRawData[] =
     { ocGreaterEqual,    {{ Array, Array                                         }, 0 }},
     { ocGrowth,          {{ Reference, Reference, Reference, Value               }, 0 }},
     { ocHarMean,         {{ Reference                                            }, 1 }},
-    { ocHLookup,         {{ Value, Reference, Value, Value                       }, 0 }},
+    { ocHLookup,         {{ Value, ReferenceOrForceArray, Value, Value           }, 0 }},
     { ocIRR,             {{ Reference, Value                                     }, 0 }},
     { ocIndex,           {{ Reference, Value, Value, Value                       }, 0 }},
     { ocIntercept,       {{ ForceArray, ForceArray                               }, 0 }},
@@ -126,7 +126,7 @@ const ScParameterClassification::RawData ScParameterClassification::pRawData[] =
     { ocLess,            {{ Array, Array                                         }, 0 }},
     { ocLessEqual,       {{ Array, Array                                         }, 0 }},
     { ocLookup,          {{ Value, ReferenceOrForceArray, ReferenceOrForceArray  }, 0 }},
-    { ocMatch,           {{ Value, Reference, Reference                          }, 0 }},
+    { ocMatch,           {{ Value, ReferenceOrForceArray, Value                  }, 0 }},
     { ocMatDet,          {{ ForceArray                                           }, 0 }},
     { ocMatInv,          {{ ForceArray                                           }, 0 }},
     { ocMatMult,         {{ ForceArray, ForceArray                               }, 0 }},
@@ -204,7 +204,7 @@ const ScParameterClassification::RawData ScParameterClassification::pRawData[] =
     { ocVarPA,           {{ Reference                                            }, 1 }},
     { ocVarP_MS,         {{ Reference                                            }, 1 }},
     { ocVarS,            {{ Reference                                            }, 1 }},
-    { ocVLookup,         {{ Value, Reference, Value, Value                       }, 0 }},
+    { ocVLookup,         {{ Value, ReferenceOrForceArray, Value, Value           }, 0 }},
     { ocXor,             {{ Reference                                            }, 1 }},
     { ocZTest,           {{ Reference, Value, Value                              }, 0 }},
     { ocZTest_MS,        {{ Reference, Value, Value                              }, 0 }},


More information about the Libreoffice-commits mailing list