diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2011-01-19 16:36:58 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2011-01-19 16:36:58 +0100 |
| commit | cd5dbe180f7ee417a2766be121b5cb6a8dae7ad7 (patch) | |
| tree | d6adf2f39b958ab2f2295195fe348c35ab8cd2f7 /cui | |
| parent | 58dc7b886639acc1f5b24eaab3da69087e559746 (diff) | |
| parent | 6c8c8f2436dd8f62adc0f19ecc724f3f079778b4 (diff) | |
gnumake3: mergeing changes from DEV300_m97, fixing jars for svl complex test, deliver globlmn.hrc for now, adding component registration for svx libraries, still misses gengal and friends when packing
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 ff10e2744533..bcc4dbf54dcb 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] ); } } } |