replace createFromAscii with OUString literals in SwCalc

Change-Id: I9da38ff8897eeeebdb7d5ff2766414d3d406d53f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167091
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

3 files changed, 47 insertions, 85 deletions

diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index 0e066bae145f..9aa00ec0225c 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -62,41 +62,41 @@ enum SwCalcOper
 };
 
 // Calculate Operations Strings
-extern const char sCalc_Add[];
-extern const char sCalc_Sub[];
-extern const char sCalc_Mul[];
-extern const char sCalc_Div[];
-extern const char sCalc_Phd[];
-extern const char sCalc_Sqrt[];
-extern const char sCalc_Pow[];
-extern const char sCalc_Or[];
-extern const char sCalc_Xor[];
-extern const char sCalc_And[];
-extern const char sCalc_Not[];
-extern const char sCalc_Eq[];
-extern const char sCalc_Neq[];
-extern const char sCalc_Leq[];
-extern const char sCalc_Geq[];
-extern const char sCalc_L[];
-extern const char sCalc_G[];
-extern const char sCalc_Sum[];
-extern const char sCalc_Mean[];
-extern const char sCalc_Average[];
-extern const char sCalc_Product[];
-extern const char sCalc_Count[];
-extern const char sCalc_Min[];
-extern const char sCalc_Max[];
-extern const char sCalc_Sin[];
-extern const char sCalc_Cos[];
-extern const char sCalc_Tan[];
-extern const char sCalc_Asin[];
-extern const char sCalc_Acos[];
-extern const char sCalc_Atan[];
-extern const char sCalc_Round[];
-extern const char sCalc_Date[];
-extern const char sCalc_Sign[];
-extern const char sCalc_Abs[];
-extern const char sCalc_Int[];
+inline constexpr OUString sCalc_Add  = u"add"_ustr;
+inline constexpr OUString sCalc_Sub  = u"sub"_ustr;
+inline constexpr OUString sCalc_Mul  = u"mul"_ustr;
+inline constexpr OUString sCalc_Div  = u"div"_ustr;
+inline constexpr OUString sCalc_Phd  = u"phd"_ustr;
+inline constexpr OUString sCalc_Sqrt = u"sqrt"_ustr;
+inline constexpr OUString sCalc_Pow  = u"pow"_ustr;
+inline constexpr OUString sCalc_Or   = u"or"_ustr;
+inline constexpr OUString sCalc_Xor  = u"xor"_ustr;
+inline constexpr OUString sCalc_And  = u"and"_ustr;
+inline constexpr OUString sCalc_Not  = u"not"_ustr;
+inline constexpr OUString sCalc_Eq   = u"eq"_ustr;
+inline constexpr OUString sCalc_Neq  = u"neq"_ustr;
+inline constexpr OUString sCalc_Leq  = u"leq"_ustr;
+inline constexpr OUString sCalc_Geq  = u"geq"_ustr;
+inline constexpr OUString sCalc_L    = u"l"_ustr;
+inline constexpr OUString sCalc_G    = u"g"_ustr;
+inline constexpr OUString sCalc_Sum  = u"sum"_ustr;
+inline constexpr OUString sCalc_Mean = u"mean"_ustr;
+inline constexpr OUString sCalc_Min  = u"min"_ustr;
+inline constexpr OUString sCalc_Max  = u"max"_ustr;
+inline constexpr OUString sCalc_Sin  = u"sin"_ustr;
+inline constexpr OUString sCalc_Cos  = u"cos"_ustr;
+inline constexpr OUString sCalc_Tan  = u"tan"_ustr;
+inline constexpr OUString sCalc_Asin = u"asin"_ustr;
+inline constexpr OUString sCalc_Acos = u"acos"_ustr;
+inline constexpr OUString sCalc_Atan = u"atan"_ustr;
+inline constexpr OUString sCalc_Round= u"round"_ustr;
+inline constexpr OUString sCalc_Date = u"date"_ustr;
+inline constexpr OUString sCalc_Product = u"product"_ustr;
+inline constexpr OUString sCalc_Average = u"average"_ustr;
+inline constexpr OUString sCalc_Count= u"count"_ustr;
+inline constexpr OUString sCalc_Sign = u"sign"_ustr;
+inline constexpr OUString sCalc_Abs  = u"abs"_ustr;
+inline constexpr OUString sCalc_Int  = u"int"_ustr;
 
 //  Calculate ErrorCodes
 enum class SwCalcError
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 4b793a6ece99..72b8661e5207 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -55,53 +55,15 @@
 
 using namespace ::com::sun::star;
 
-const char sCalc_Add[]  =   "add";
-const char sCalc_Sub[]  =   "sub";
-const char sCalc_Mul[]  =   "mul";
-const char sCalc_Div[]  =   "div";
-const char sCalc_Phd[]  =   "phd";
-const char sCalc_Sqrt[] =   "sqrt";
-const char sCalc_Pow[]  =   "pow";
-const char sCalc_Or[]   =   "or";
-const char sCalc_Xor[]  =   "xor";
-const char sCalc_And[]  =   "and";
-const char sCalc_Not[]  =   "not";
-const char sCalc_Eq[]   =   "eq";
-const char sCalc_Neq[]  =   "neq";
-const char sCalc_Leq[]  =   "leq";
-const char sCalc_Geq[]  =   "geq";
-const char sCalc_L[]    =   "l";
-const char sCalc_G[]    =   "g";
-const char sCalc_Sum[]  =   "sum";
-const char sCalc_Mean[] =   "mean";
-const char sCalc_Min[]  =   "min";
-const char sCalc_Max[]  =   "max";
-const char sCalc_Sin[]  =   "sin";
-const char sCalc_Cos[]  =   "cos";
-const char sCalc_Tan[]  =   "tan";
-const char sCalc_Asin[] =   "asin";
-const char sCalc_Acos[] =   "acos";
-const char sCalc_Atan[] =   "atan";
-const char sCalc_Round[]=   "round";
-const char sCalc_Date[] =   "date";
-const char sCalc_Product[] = "product";
-const char sCalc_Average[] = "average";
-const char sCalc_Count[]=   "count";
-const char sCalc_Sign[] =   "sign";
-const char sCalc_Abs[]  =   "abs";
-const char sCalc_Int[]  =   "int";
 
 // ATTENTION: sorted list of all operators
 struct CalcOp
 {
-    union{
-        const char* pName;
-        const OUString* pUName;
-    };
+    OUString aName;
     SwCalcOper eOp;
 };
 
-CalcOp const aOpTable[] = {
+CalcOp constexpr aOpTable[] = {
 /* ABS */     {{sCalc_Abs},        CALC_ABS},   // Abs (since LibreOffice 7.1)
 /* ACOS */    {{sCalc_Acos},       CALC_ACOS},  // Arc cosine
 /* ADD */     {{sCalc_Add},        CALC_PLUS},  // Addition
@@ -163,20 +125,20 @@ static int OperatorCompare( const void *pFirst, const void *pSecond)
     if( CALC_NAME == static_cast<const CalcOp*>(pFirst)->eOp )
     {
         if( CALC_NAME == static_cast<const CalcOp*>(pSecond)->eOp )
-            nRet = static_cast<const CalcOp*>(pFirst)->pUName->compareTo(
-                   *static_cast<const CalcOp*>(pSecond)->pUName );
+            nRet = static_cast<const CalcOp*>(pFirst)->aName.compareTo(
+                    static_cast<const CalcOp*>(pSecond)->aName );
         else
-            nRet = static_cast<const CalcOp*>(pFirst)->pUName->compareToAscii(
-                   static_cast<const CalcOp*>(pSecond)->pName );
+            nRet = static_cast<const CalcOp*>(pFirst)->aName.compareTo(
+                     static_cast<const CalcOp*>(pSecond)->aName );
     }
     else
     {
         if( CALC_NAME == static_cast<const CalcOp*>(pSecond)->eOp )
-            nRet = -1 * static_cast<const CalcOp*>(pSecond)->pUName->compareToAscii(
-                        static_cast<const CalcOp*>(pFirst)->pName );
+            nRet = -1 * static_cast<const CalcOp*>(pSecond)->aName.compareTo(
+                        static_cast<const CalcOp*>(pFirst)->aName );
         else
-            nRet = strcmp( static_cast<const CalcOp*>(pFirst)->pName,
-                           static_cast<const CalcOp*>(pSecond)->pName );
+            nRet = static_cast<const CalcOp*>(pFirst)->aName.compareTo(
+                     static_cast<const CalcOp*>(pSecond)->aName );
     }
     return nRet;
 }
@@ -185,7 +147,7 @@ static int OperatorCompare( const void *pFirst, const void *pSecond)
 CalcOp* FindOperator( const OUString& rSrch )
 {
     CalcOp aSrch;
-    aSrch.pUName = &rSrch;
+    aSrch.aName = rSrch;
     aSrch.eOp = CALC_NAME;
 
     return static_cast<CalcOp*>(bsearch( static_cast<void*>(&aSrch),
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 7bf0ccc7fa72..7997d12f22f4 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -2494,7 +2494,7 @@ void SwFEShell::GetAutoSum( OUString& rFormula ) const
         }
     }
 
-    rFormula = OUString::createFromAscii( sCalc_Sum );
+    rFormula = sCalc_Sum;
     if (!sFields.isEmpty())
     {
         rFormula += "(" + sFields + ")";