diff options
author | Kohei Yoshida <kyoshida@novell.com> | 2011-05-23 15:39:06 -0400 |
---|---|---|
committer | Kohei Yoshida <kyoshida@novell.com> | 2011-05-23 15:39:06 -0400 |
commit | 42eb2de7a08c50b36b731f6df67f119e2d5d6fdf (patch) | |
tree | ae461004c3676df741fe89cd96630bb5b3334946 /sc/source/ui/optdlg/opredlin.cxx | |
parent | e0142fade08df22537cd9b03a279ca8f64d401a5 (diff) | |
parent | 551cca5872a7dff96016e964a602c17a516b2ef3 (diff) |
Merge branch 'master' into feature/calc-multiline-input
Diffstat (limited to 'sc/source/ui/optdlg/opredlin.cxx')
-rw-r--r-- | sc/source/ui/optdlg/opredlin.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index 03d966db9..8c88e2298 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -159,8 +159,6 @@ sal_Bool ScRedlineOptionsTabPage::FillItemSet( SfxItemSet& /* rSet */ ) void ScRedlineOptionsTabPage::Reset( const SfxItemSet& /* rSet */ ) { - - XColorTable* pColorTbl = XColorTable::GetStdColorTable(); aContentColorLB.InsertEntry(aAuthorStr); aMoveColorLB.InsertEntry(aAuthorStr); aInsertColorLB.InsertEntry(aAuthorStr); @@ -171,9 +169,10 @@ void ScRedlineOptionsTabPage::Reset( const SfxItemSet& /* rSet */ ) aInsertColorLB.SetUpdateMode( false); aRemoveColorLB.SetUpdateMode( false); - for( sal_uInt16 i = 0; i < pColorTbl->Count(); ++i ) + XColorTable& rColorTbl = XColorTable::GetStdColorTable(); + for( sal_uInt16 i = 0; i < rColorTbl.Count(); ++i ) { - XColorEntry* pEntry = pColorTbl->GetColor( i ); + XColorEntry* pEntry = rColorTbl.GetColor( i ); Color aColor = pEntry->GetColor(); String sName = pEntry->GetName(); |