UND->AND; ODER->OR

Change-Id: I921db377c257dc50e3f39fe04f0ad093f3db6a81
Reviewed-on: https://gerrit.libreoffice.org/59896
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>

sc/inc/globstr.hrc

@@ -141,8 +141,8 @@
 #define STR_TABLE_GRAND                         NC_("STR_TABLE_GRAND", "Grand")
 #define STR_TABLE_ERGEBNIS                      NC_("STR_TABLE_ERGEBNIS", "Result")
 #define STR_UNDO_SPELLING                       NC_("STR_UNDO_SPELLING", "Spellcheck")
-#define STR_TABLE_UND                           NC_("STR_TABLE_UND", "AND")
-#define STR_TABLE_ODER                          NC_("STR_TABLE_ODER", "OR")
+#define STR_TABLE_AND                           NC_("STR_TABLE_AND", "AND")
+#define STR_TABLE_OR                            NC_("STR_TABLE_OR", "OR")
 #define STR_TABLE_DEF                           NC_("STR_TABLE_DEF", "Sheet")
 #define STR_MOVE_TO_END                         NC_("STR_MOVE_TO_END", "- move to end position -")
 #define STR_NO_REF_TABLE                        NC_("STR_NO_REF_TABLE", "#REF!")

sc/source/core/data/table3.cxx

@@ -3267,12 +3267,12 @@ bool ScTable::CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2
         if (nIndex > 0)
         {
             GetUpperCellString(nCol1, nRow, aCellStr);
-            if ( aCellStr == ScResId(STR_TABLE_UND) )
+            if ( aCellStr == ScResId(STR_TABLE_AND) )
             {
                 rEntry.eConnect = SC_AND;
                 bValid = true;
             }
-            else if ( aCellStr == ScResId(STR_TABLE_ODER) )
+            else if ( aCellStr == ScResId(STR_TABLE_OR) )
             {
                 rEntry.eConnect = SC_OR;
                 bValid = true;

sc/source/core/tool/doubleref.cxx

@@ -78,12 +78,12 @@ bool lcl_createStarQuery(
             // For all entries after the first one, check the and/or connector in the first column.
             aCellStr = pQueryRef->getString(0, nRow);
             lcl_uppercase(aCellStr);
-            if ( aCellStr == ScResId(STR_TABLE_UND) )
+            if ( aCellStr == ScResId(STR_TABLE_AND) )
             {
                 rEntry.eConnect = SC_AND;
                 bValid = true;
             }
-            else if ( aCellStr == ScResId(STR_TABLE_ODER) )
+            else if ( aCellStr == ScResId(STR_TABLE_OR) )
             {
                 rEntry.eConnect = SC_OR;
                 bValid = true;