cws mba34issues01: #i117722#: fix help ids for color listboxes

2 files changed, 36 insertions, 5 deletions

diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index dff73253b086..cc5638ed86be 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -127,6 +127,15 @@
 #define HID_COLORPAGE_BASICOPERATOR_LB "CUI_HID_COLORPAGE_BASICOPERATOR_LB"
 #define HID_COLORPAGE_BASICKEYWORD_LB "CUI_HID_COLORPAGE_BASICKEYWORD_LB"
 #define HID_COLORPAGE_BASICERROR_LB "CUI_HID_COLORPAGE_BASICERROR_LB"
+#define HID_COLORPAGE_SQLIDENTIFIER_LB "CUI_HID_COLORPAGE_SQLIDENTIFIER_LB"
+#define HID_COLORPAGE_SQLNUMBER_LB "CUI_HID_COLORPAGE_SQLNUMBER_LB"
+#define HID_COLORPAGE_SQLSTRING_LB "CUI_HID_COLORPAGE_SQLSTRING_LB"
+#define HID_COLORPAGE_SQLOPERATOR_LB "CUI_HID_COLORPAGE_SQLOPERATOR_LB"
+#define HID_COLORPAGE_SQLKEYWORD_LB "CUI_HID_COLORPAGE_SQLKEYWORD_LB"
+#define HID_COLORPAGE_SQLPARAMETER_LB "CUI_HID_COLORPAGE_SQLPARAMETER_LB"
+#define HID_COLORPAGE_SQLCOMMENT_LB "CUI_HID_COLORPAGE_SQLCOMMENT_LB"
+#define HID_COLORPAGE_SMARTTAGS_LB "CUI_HID_COLORPAGE_SMARTTAGS_LB"
+
 #define HID_COLORPAGE_CHECKBOX_START "CUI_HID_COLORPAGE_CHECKBOX_START"
 #define HID_COLORPAGE_DOCCOLOR_CB "CUI_HID_COLORPAGE_DOCCOLOR_CB"
 #define HID_COLORPAGE_DOCBOUNDARIES_CB "CUI_HID_COLORPAGE_DOCBOUNDARIES_CB"
@@ -168,6 +177,15 @@
 #define HID_COLORPAGE_BASICOPERATOR_CB "CUI_HID_COLORPAGE_BASICOPERATOR_CB"
 #define HID_COLORPAGE_BASICKEYWORD_CB "CUI_HID_COLORPAGE_BASICKEYWORD_CB"
 #define HID_COLORPAGE_BASICERROR_CB "CUI_HID_COLORPAGE_BASICERROR_CB"
+#define HID_COLORPAGE_SQLIDENTIFIER_CB "CUI_HID_COLORPAGE_SQLIDENTIFIER_CB"
+#define HID_COLORPAGE_SQLNUMBER_CB "CUI_HID_COLORPAGE_SQLNUMBER_CB"
+#define HID_COLORPAGE_SQLSTRING_CB "CUI_HID_COLORPAGE_SQLSTRING_CB"
+#define HID_COLORPAGE_SQLOPERATOR_CB "CUI_HID_COLORPAGE_SQLOPERATOR_CB"
+#define HID_COLORPAGE_SQLKEYWORD_CB "CUI_HID_COLORPAGE_SQLKEYWORD_CB"
+#define HID_COLORPAGE_SQLPARAMETER_CB "CUI_HID_COLORPAGE_SQLPARAMETER_CB"
+#define HID_COLORPAGE_SQLCOMMENT_CB "CUI_HID_COLORPAGE_SQLCOMMENT_CB"
+#define HID_COLORPAGE_SMARTTAGS_CB "CUI_HID_COLORPAGE_SMARTTAGS_CB"
+
 #define HID_NUMBERINGOPT_SEL_GRF_FROM_FILE "CUI_HID_NUMBERINGOPT_SEL_GRF_FROM_FILE"
 #define HID_SVX_MACRO_LB_EVENT "CUI_HID_SVX_MACRO_LB_EVENT"
 #define HID_SVX_CONFIG_EVENT "CUI_HID_SVX_CONFIG_EVENT"
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 6105391a72fe..c6cae4bdbb82 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -60,7 +60,7 @@ using namespace ::svtools;
 #define GROUP_BASIC     5
 #define GROUP_SQL       6
 
-const char* aColorLBHids[] =
+const char* aColorLBHids[ColorConfigEntryCount] =
 {
      HID_COLORPAGE_DOCCOLOR_LB,
      HID_COLORPAGE_DOCBOUNDARIES_LB,
@@ -72,11 +72,11 @@ const char* aColorLBHids[] =
      HID_COLORPAGE_LINKSVISITED_LB,
      HID_COLORPAGE_ANCHOR_LB,
      HID_COLORPAGE_SPELL_LB,
+     HID_COLORPAGE_SMARTTAGS_LB,
      HID_COLORPAGE_WRITERTEXTGRID_LB,
      HID_COLORPAGE_WRITERFIELDSHADINGS_LB,
      HID_COLORPAGE_WRITERIDXSHADINGS_LB,
      HID_COLORPAGE_WRITERDIRECTCURSOR_LB,
-     HID_COLORPAGE_WRITERNOTESINDICATOR_LB,
      HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB,
      HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB,
      HID_COLORPAGE_WRITERPAGEBREAKS_LB,
@@ -102,9 +102,16 @@ const char* aColorLBHids[] =
      HID_COLORPAGE_BASICOPERATOR_LB,
      HID_COLORPAGE_BASICKEYWORD_LB,
      HID_COLORPAGE_BASICERROR_LB
+     HID_COLORPAGE_SQLIDENTIFIER_LB,
+     HID_COLORPAGE_SQLNUMBER_LB,
+     HID_COLORPAGE_SQLSTRING_LB,
+     HID_COLORPAGE_SQLOPERATOR_LB,
+     HID_COLORPAGE_SQLKEYWORD_LB,
+     HID_COLORPAGE_SQLPARAMETER_LB,
+     HID_COLORPAGE_SQLCOMMENT_LB
 };
 
-const char* aColorCBHids[] =
+const char* aColorCBHids[ColorConfigEntryCount] =
 {
      HID_COLORPAGE_DOCCOLOR_CB,
      HID_COLORPAGE_DOCBOUNDARIES_CB,
@@ -116,11 +123,11 @@ const char* aColorCBHids[] =
      HID_COLORPAGE_LINKSVISITED_CB,
      HID_COLORPAGE_ANCHOR_CB,
      HID_COLORPAGE_SPELL_CB,
+     HID_COLORPAGE_SMARTTAGS_CB,
      HID_COLORPAGE_WRITERTEXTGRID_CB,
      HID_COLORPAGE_WRITERFIELDSHADINGS_CB,
      HID_COLORPAGE_WRITERIDXSHADINGS_CB,
      HID_COLORPAGE_WRITERDIRECTCURSOR_CB,
-     HID_COLORPAGE_WRITERNOTESINDICATOR_CB,
      HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB,
      HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB,
      HID_COLORPAGE_WRITERPAGEBREAKS_CB,
@@ -146,6 +153,13 @@ const char* aColorCBHids[] =
      HID_COLORPAGE_BASICOPERATOR_CB,
      HID_COLORPAGE_BASICKEYWORD_CB,
      HID_COLORPAGE_BASICERROR_CB
+     HID_COLORPAGE_SQLIDENTIFIER_CB,
+     HID_COLORPAGE_SQLNUMBER_CB,
+     HID_COLORPAGE_SQLSTRING_CB,
+     HID_COLORPAGE_SQLOPERATOR_CB,
+     HID_COLORPAGE_SQLKEYWORD_CB,
+     HID_COLORPAGE_SQLPARAMETER_CB,
+     HID_COLORPAGE_SQLCOMMENT_CB
 };
 
 /* -----------------------------2002/06/26 10:48------------------------------
@@ -945,7 +959,6 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
 
     aColorBoxes[0]->SetHelpId( aColorLBHids[0] );
 
-    OSL_ENSURE( nCount < sal_Int32(sizeof(aColorLBHids)/sizeof(aColorLBHids[0])), "too few helpIDs for color listboxes" );
     for( sal_Int32 i = 1; i < nCount; i++ )
     {
         if(aColorBoxes[i])