diff options
| author | Carsten Driesner <cd@openoffice.org> | 2011-01-21 17:18:37 +0100 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2011-01-21 17:18:37 +0100 |
| commit | f163f1264a44ff606e7431c16c86ad2c9ba4acb6 (patch) | |
| tree | 2aa982275dff325d6396024a0dff520dbc374755 /cui | |
| parent | 861b81b87f4ae5f81aaf3c0b8db8f61dab5680c0 (diff) | |
| parent | 143e8326931e0751caf3428eec0d8542229dd063 (diff) | |
removetooltypes01: Rebase to DEV300m98
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/optcolor.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 745a92c3aa73..6105391a72fe 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -945,12 +945,14 @@ 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]) { aColorBoxes[i]->CopyEntries( *aColorBoxes[0] ); - aColorBoxes[i]->SetHelpId( aColorLBHids[i] ); + if( i < sal_Int32(sizeof(aColorLBHids)/sizeof(aColorLBHids[0])) ) + aColorBoxes[i]->SetHelpId( aColorLBHids[i] ); } } } |