[Libreoffice-commits] core.git: oox/source

[Johnny_M (via logerrit)]

 oox/source/drawingml/customshapegeometry.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 49da80b9620953a0895d11d3d8629b982ebe6a0a
Author:     Johnny_M <klasse at partyheld.de>
AuthorDate: Fri Mar 13 12:56:44 2020 +0100
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Mon Mar 23 14:00:59 2020 +0100

    Fix spelling of variable
    
    Formular -> Formula
    
    (Found when working on variable translation in
    c212e295c589695c9da0c21914fb30b6af5909d6.)
    
    Change-Id: I9409598670eabdd6ebb1ea1cb0ccc4d9d6292f8e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90464
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index c24f35abd4e9..5f21bd12c39d 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -40,7 +40,7 @@ namespace oox::drawingml {
 
 namespace {
 
-enum FormularCommand
+enum FormulaCommand
 {
     FC_MULDIV = 0,
     FC_PLUSMINUS,
@@ -62,15 +62,15 @@ enum FormularCommand
     FC_VAL
 };
 
-struct FormularCommandNameTable
+struct FormulaCommandNameTable
 {
     const char*     pS;
-    FormularCommand pE;
+    FormulaCommand pE;
 };
 
 }
 
-static const FormularCommandNameTable pFormularCommandNameTable[] =
+static const FormulaCommandNameTable pFormulaCommandNameTable[] =
 {
     { "*/",     FC_MULDIV },
     { "+-",     FC_PLUSMINUS },
@@ -92,7 +92,7 @@ static const FormularCommandNameTable pFormularCommandNameTable[] =
     { "val",    FC_VAL }
 
 };
-typedef std::unordered_map< OUString, FormularCommand > FormulaCommandHMap;
+typedef std::unordered_map< OUString, FormulaCommand > FormulaCommandHMap;
 
 static const FormulaCommandHMap* pCommandHashMap;
 
@@ -454,7 +454,7 @@ static OUString convertToOOEquation( CustomShapeProperties& rCustomShapeProperti
     if ( !pCommandHashMap )
     {
         FormulaCommandHMap* pHM = new FormulaCommandHMap;
-        for(const FormularCommandNameTable& i : pFormularCommandNameTable)
+        for(const FormulaCommandNameTable& i : pFormulaCommandNameTable)
             (*pHM)[ OUString::createFromAscii( i.pS ) ] =  i.pE;
         pCommandHashMap = pHM;
     }