Blacklist has precedence over whitelist, so order them like that

Change-Id: I0cf00abd582aaaaa4be4d385a6ef4f199c7aa0bc

1 files changed, 7 insertions, 7 deletions

diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 7925158df3e5..5e003dfcb01e 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -30,8 +30,8 @@ typedef enum {
     CALC_OPTION_ENABLE_OPENCL_SUBSET,
     CALC_OPTION_OPENCL_MIN_SIZE,
     CALC_OPTION_OPENCL_SUBSET_OPS,
-    CALC_OPTION_OPENCL_WHITELIST,
     CALC_OPTION_OPENCL_BLACKLIST,
+    CALC_OPTION_OPENCL_WHITELIST,
 } CalcOptionOrder;
 
 class OptionString : public SvLBoxString
@@ -207,12 +207,12 @@ ScCalcOptionsDialog::ScCalcOptionsDialog(vcl::Window* pParent, const ScCalcConfi
     maCaptionOpenCLSubsetOpCodes = get<vcl::Window>("opencl_subset_opcodes")->GetText();
     maDescOpenCLSubsetOpCodes = get<vcl::Window>("opencl_subset_opcodes_desc")->GetText();
 
-    maCaptionOpenCLWhiteList = get<vcl::Window>("opencl_whitelist")->GetText();
-    maDescOpenCLWhiteList = get<vcl::Window>("opencl_whitelist_desc")->GetText();
-
     maCaptionOpenCLBlackList = get<vcl::Window>("opencl_blacklist")->GetText();
     maDescOpenCLBlackList = get<vcl::Window>("opencl_blacklist_desc")->GetText();
 
+    maCaptionOpenCLWhiteList = get<vcl::Window>("opencl_whitelist")->GetText();
+    maDescOpenCLWhiteList = get<vcl::Window>("opencl_whitelist_desc")->GetText();
+
     maSoftware = get<vcl::Window>("software")->GetText();
 
     mpLbSettings->set_height_request(8 * mpLbSettings->GetTextHeight());
@@ -378,8 +378,8 @@ void ScCalcOptionsDialog::FillOptionsList()
     pModel->Insert(createItem(maCaptionOpenCLSubsetEnabled,toString(maConfig.mbOpenCLSubsetOnly)));
     pModel->Insert(createItem(maCaptionOpenCLMinimumFormulaSize,toString(maConfig.mnOpenCLMinimumFormulaGroupSize)));
     pModel->Insert(createItem(maCaptionOpenCLSubsetOpCodes,ScOpCodeSetToSymbolicString(maConfig.maOpenCLSubsetOpCodes)));
-    pModel->Insert(createItem(maCaptionOpenCLWhiteList,""));
     pModel->Insert(createItem(maCaptionOpenCLBlackList,""));
+    pModel->Insert(createItem(maCaptionOpenCLWhiteList,""));
 
     fillOpenCLList();
 
@@ -577,8 +577,8 @@ void ScCalcOptionsDialog::SelectionChanged()
         break;
 
         // string lists
-        case CALC_OPTION_OPENCL_WHITELIST:
         case CALC_OPTION_OPENCL_BLACKLIST:
+        case CALC_OPTION_OPENCL_WHITELIST:
         {
             mpLbOptionEdit->Hide();
             mpBtnTrue->Hide();
@@ -654,8 +654,8 @@ void ScCalcOptionsDialog::ListOptionValueChanged()
         case CALC_OPTION_ENABLE_OPENCL_SUBSET:
         case CALC_OPTION_OPENCL_MIN_SIZE:
         case CALC_OPTION_OPENCL_SUBSET_OPS:
-        case CALC_OPTION_OPENCL_WHITELIST:
         case CALC_OPTION_OPENCL_BLACKLIST:
+        case CALC_OPTION_OPENCL_WHITELIST:
         break;
     }
 }