diff options
| author | Armin Le Grand <alg@apache.org> | 2013-05-02 13:22:17 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-18 15:35:15 +0100 |
| commit | 6ed60d6a9314341bda0afbea7ed6b106f562393d (patch) | |
| tree | 5ea1decacc5aec581540970cd137334641c840b5 /cui/source/options/optchart.cxx | |
| parent | 5ba49392543bae1f6477c65f1887881b48a3143e (diff) | |
Related: #i122120# Ensured Append/Modify methods in LB implementations...
always add a UI graphic preview, corrected diag mirror in bitmap pattern
(cherry picked from commit 36a8574012525fa837df6dfd1839fa65b5a2bc70)
Conflicts:
cui/source/tabpages/tpbitmap.cxx
cui/source/tabpages/tpcolor.cxx
cui/source/tabpages/tpgradnt.cxx
cui/source/tabpages/tplnedef.cxx
cui/source/tabpages/tplneend.cxx
svx/inc/svx/dlgctrl.hxx
svx/inc/svx/xtable.hxx
svx/source/dialog/dlgctrl.cxx
svx/source/xoutdev/xtabbtmp.cxx
svx/source/xoutdev/xtabcolr.cxx
svx/source/xoutdev/xtabdash.cxx
svx/source/xoutdev/xtabgrdt.cxx
svx/source/xoutdev/xtabhtch.cxx
svx/source/xoutdev/xtable.cxx
svx/source/xoutdev/xtablend.cxx
Change-Id: Iff0744061b76d8c608e285f81bcc8e76edeb6a69
Diffstat (limited to 'cui/source/options/optchart.cxx')
| -rw-r--r-- | cui/source/options/optchart.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 06f25ef1ba2f..cf7d025c5e48 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -35,7 +35,7 @@ void ChartColorLB::FillBox( const SvxChartColorTable & rTab ) for( long i = 0; i < nCount; i++ ) { - Append( const_cast< XColorEntry * >( & rTab[ i ] )); + Append( rTab[ i ] ); } SetUpdateMode( sal_True ); } @@ -160,7 +160,7 @@ long SvxDefaultColorOptPage::GetColorIndex( const Color& rCol ) { pColorEntry = pColorList->GetColor( i ); if( pColorEntry && pColorEntry->GetColor() == rCol ) - return pColorList->Get( pColorEntry->GetName() ); + return pColorList->GetIndex( pColorEntry->GetName() ); } } return -1L; @@ -270,10 +270,9 @@ IMPL_LINK_NOARG(SvxDefaultColorOptPage, BoxClickedHdl) sal_uInt16 nIdx = aLbChartColors.GetSelectEntryPos(); if( nIdx != LISTBOX_ENTRY_NOTFOUND ) { - XColorEntry aEntry( aValSetColorBox.GetItemColor( aValSetColorBox.GetSelectItemId() ), - aLbChartColors.GetSelectEntry() ); + const XColorEntry aEntry( aValSetColorBox.GetItemColor( aValSetColorBox.GetSelectItemId() ), aLbChartColors.GetSelectEntry() ); - aLbChartColors.Modify( & aEntry, nIdx ); + aLbChartColors.Modify( aEntry, nIdx ); pColorConfig->ReplaceColorByIndex( nIdx, aEntry ); aLbChartColors.SelectEntryPos( nIdx ); // reselect entry |