diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-09-01 16:58:15 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2018-09-27 22:44:16 +0200 |
| commit | e4ff750db6d186ac55c27db226d249e47dfa65a1 (patch) | |
| tree | e244839b99b953548c652213606926cf13efb87b | |
| parent | 26e76ada0cb87550e5bac56006da851cf1279a02 (diff) | |
UND->AND; ODER->OR
Change-Id: I921db377c257dc50e3f39fe04f0ad093f3db6a81
Reviewed-on: https://gerrit.libreoffice.org/59896
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>
| -rw-r--r-- | sc/inc/globstr.hrc | 4 | ||||
| -rw-r--r-- | sc/source/core/data/table3.cxx | 4 | ||||
| -rw-r--r-- | sc/source/core/tool/doubleref.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index 09caaf80423c..186ef461f8ab 100644 --- a/sc/inc/globstr.hrc +++ b/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!") diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index 910e66f20117..1717525e6b4d 100644 --- a/sc/source/core/data/table3.cxx +++ b/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; diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx index 539cd35b1fe2..3efab692c92f 100644 --- a/sc/source/core/tool/doubleref.cxx +++ b/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; |