From 19723f6a1ffe2bdd656c3a689767c1b0c57a9ddc Mon Sep 17 00:00:00 2001 From: Joel Madero Date: Thu, 14 Jun 2012 22:49:11 -0700 Subject: [PATCH] Change validate "between" and "not between" to "valid/invalid range" Changes Calc validate text from "between" to "valid range" and "not between" to "invalid range". This is to minimize confusion as to inclusion of minimum and maximum values as between implies non inclusive but is in fact inclusive of min and max values. Committer: Joel Madero On branch master Changes to be committed: (use "git reset HEAD ..." to unstage) modified: sc/source/ui/dbgui/validate.cxx modified: sc/source/ui/dbgui/validate.src modified: sc/source/ui/inc/validate.hrc Change-Id: I2259c22da2e976b25c71e11806df13636bdbc757 --- sc/source/ui/dbgui/validate.cxx | 12 ++++++------ sc/source/ui/dbgui/validate.src | 4 ++-- sc/source/ui/inc/validate.hrc | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 0de9c27..494672b 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -230,8 +230,8 @@ sal_uInt16 lclGetPosFromCondMode( ScConditionMode eCondMode ) case SC_COND_EQLESS: nLbPos = SC_VALIDDLG_DATA_EQLESS; break; case SC_COND_EQGREATER: nLbPos = SC_VALIDDLG_DATA_EQGREATER; break; case SC_COND_NOTEQUAL: nLbPos = SC_VALIDDLG_DATA_NOTEQUAL; break; - case SC_COND_BETWEEN: nLbPos = SC_VALIDDLG_DATA_BETWEEN; break; - case SC_COND_NOTBETWEEN: nLbPos = SC_VALIDDLG_DATA_NOTBETWEEN; break; + case SC_COND_BETWEEN: nLbPos = SC_VALIDDLG_DATA_VALIDRANGE; break; + case SC_COND_NOTBETWEEN: nLbPos = SC_VALIDDLG_DATA_INVALIDRANGE; break; default: OSL_FAIL( "lclGetPosFromCondMode - unknown condition mode" ); } return nLbPos; @@ -249,8 +249,8 @@ ScConditionMode lclGetCondModeFromPos( sal_uInt16 nLbPos ) case SC_VALIDDLG_DATA_EQLESS: eCondMode = SC_COND_EQLESS; break; case SC_VALIDDLG_DATA_EQGREATER: eCondMode = SC_COND_EQGREATER; break; case SC_VALIDDLG_DATA_NOTEQUAL: eCondMode = SC_COND_NOTEQUAL; break; - case SC_VALIDDLG_DATA_BETWEEN: eCondMode = SC_COND_BETWEEN; break; - case SC_VALIDDLG_DATA_NOTBETWEEN: eCondMode = SC_COND_NOTBETWEEN; break; + case SC_VALIDDLG_DATA_VALIDRANGE: eCondMode = SC_COND_BETWEEN; break; + case SC_VALIDDLG_DATA_INVALIDRANGE: eCondMode = SC_COND_NOTBETWEEN; break; default: OSL_FAIL( "lclGetCondModeFromPos - invalid list box position" ); } return eCondMode; @@ -637,8 +637,8 @@ IMPL_LINK_NOARG(ScTPValidationValue, SelectHdl) case SC_VALIDDLG_DATA_LESS: case SC_VALIDDLG_DATA_EQLESS: maFtMin.SetText( maStrMax ); break; - case SC_VALIDDLG_DATA_BETWEEN: - case SC_VALIDDLG_DATA_NOTBETWEEN: bShowMax = true; // fall through + case SC_VALIDDLG_DATA_VALIDRANGE: + case SC_VALIDDLG_DATA_INVALIDRANGE: bShowMax = true; // fall through case SC_VALIDDLG_DATA_GREATER: case SC_VALIDDLG_DATA_EQGREATER: maFtMin.SetText( maStrMin ); break; diff --git a/sc/source/ui/dbgui/validate.src b/sc/source/ui/dbgui/validate.src index 4611224..1da97c0 100644 --- a/sc/source/ui/dbgui/validate.src +++ b/sc/source/ui/dbgui/validate.src @@ -122,8 +122,8 @@ TabPage TP_VALIDATION_VALUES < "less than or equal" ; SC_VALIDDLG_DATA_EQLESS ; > ; < "greater than or equal to" ; SC_VALIDDLG_DATA_EQGREATER ; > ; < "not equal" ; SC_VALIDDLG_DATA_NOTEQUAL ; > ; - < "between" ; SC_VALIDDLG_DATA_BETWEEN ; > ; - < "not between" ; SC_VALIDDLG_DATA_NOTBETWEEN ; > ; + < "valid range" ; SC_VALIDDLG_DATA_VALIDRANGE ; > ; + < "invalid range" ; SC_VALIDDLG_DATA_INVALIDRANGE ; > ; }; }; FixedText FT_MIN diff --git a/sc/source/ui/inc/validate.hrc b/sc/source/ui/inc/validate.hrc index bde827c..54900ff 100644 --- a/sc/source/ui/inc/validate.hrc +++ b/sc/source/ui/inc/validate.hrc @@ -81,5 +81,5 @@ #define SC_VALIDDLG_DATA_EQLESS 3 #define SC_VALIDDLG_DATA_EQGREATER 4 #define SC_VALIDDLG_DATA_NOTEQUAL 5 -#define SC_VALIDDLG_DATA_BETWEEN 6 -#define SC_VALIDDLG_DATA_NOTBETWEEN 7 +#define SC_VALIDDLG_DATA_VALIDRANGE 6 +#define SC_VALIDDLG_DATA_INVALIDRANGE 7 -- 1.7.9.5