diff options
| author | Mathias Bauer <mbauer@apache.org> | 2011-09-18 20:12:59 +0000 |
|---|---|---|
| committer | Mathias Bauer <mbauer@apache.org> | 2011-09-18 20:12:59 +0000 |
| commit | e4965369ef2107097337d7d2a4c8d7b5a6915f50 (patch) | |
| tree | 6cf50d62216c689e425b40605469097cd0220402 /cui/source/options | |
| parent | 4b3a844e451d80f351814bfeeeaea630bb42571d (diff) | |
cws mba34issues01: #i117722#: fix help ids for color listboxes
Diffstat (limited to 'cui/source/options')
| -rw-r--r-- | cui/source/options/optcolor.cxx | 23 |
1 files changed, 18 insertions, 5 deletions
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]) |