Move StackVarEnumToString to <formula/token.hxx> and use in a SAL_INFO

Once StackVarEnum has been changed to a scoped enum, we should
probably add an operator<< for it, too.

Is 'std::string FooToString(Foo e)' a good return type, signature, and
naming pattern for functions to turn enums into strings? Would return
type OUString be better? Is there some consistent existing convention?
For use only in SAL_INFO and friends, probably just an operator<< is
enough?

Change-Id: I89abbcb37ba2ab925b0a9d7fc6294d8f9ee5aebd

2 files changed, 1 insertions, 33 deletions

diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index bf91fcd995c1..a1112e499dbc 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -97,38 +97,6 @@ namespace sc { namespace opencl {
 
 namespace {
 
-std::string StackVarEnumToString(StackVar const e)
-{
-    switch (e)
-    {
-        case svByte:              return "Byte";
-        case svDouble:            return "Double";
-        case svString:            return "String";
-        case svSingleRef:         return "SingleRef";
-        case svDoubleRef:         return "DoubleRef";
-        case svMatrix:            return "Matrix";
-        case svIndex:             return "Index";
-        case svJump:              return "Jump";
-        case svExternal:          return "External";
-        case svFAP:               return "FAP";
-        case svJumpMatrix:        return "JumpMatrix";
-        case svRefList:           return "RefList";
-        case svEmptyCell:         return "EmptyCell";
-        case svMatrixCell:        return "MatrixCell";
-        case svHybridCell:        return "HybridCell";
-        case svExternalSingleRef: return "ExternalSingleRef";
-        case svExternalDoubleRef: return "ExternalDoubleRef";
-        case svExternalName:      return "ExternalName";
-        case svSingleVectorRef:   return "SingleVectorRef";
-        case svDoubleVectorRef:   return "DoubleVectorRef";
-        case svError:             return "Error";
-        case svMissing:           return "Missing";
-        case svSep:               return "Sep";
-        case svUnknown:           return "Unknown";
-    }
-    return std::to_string(static_cast<int>(e));
-}
-
 std::string linenumberify(const std::string& s)
 {
     std::stringstream ss;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 957bdcd3313f..36928d20a6a1 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1572,7 +1572,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
             case svSep:
             case svUnknown:
                 // We don't support vectorization on these.
-                SAL_INFO("sc.opencl", "opcode ocPush: variable type disables vectorisation for formula group");
+                SAL_INFO("sc.opencl", "opcode ocPush: variable type " << StackVarEnumToString(r.GetType()) << " disables vectorisation for formula group");
                 meVectorState = FormulaVectorDisabled;
             break;
             default: