diff options
| author | os <os@openoffice.org> | 2011-01-13 07:55:08 +0100 |
|---|---|---|
| committer | os <os@openoffice.org> | 2011-01-13 07:55:08 +0100 |
| commit | 641980facf14d4ff19a3a79ac125837f8f80dfec (patch) | |
| tree | 363b07ad87fb8ba5680410529b295a9a0385d613 /cui | |
| parent | d2eb8afce775635fb438eca41fd228370db7e150 (diff) | |
| parent | 6c8c8f2436dd8f62adc0f19ecc724f3f079778b4 (diff) | |
m97 merged
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] ); } } } |