diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-12-15 17:27:04 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-12-15 17:33:46 +0100 |
| commit | 7a3859fe23aad49ed2e046f1b822bf21add2db5c (patch) | |
| tree | 1984365e8bfc3c4f9051cfcc6c005c6573826c16 /sc | |
| parent | 468edb6ac0cdc145a5b2a43339e5086b9f158b0e (diff) | |
don't overwrite color scale information in dlg if already set, fdo#58337
Change-Id: Iaa9cc441c15acef0d5f0ee6bb230466c358e78c8
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/condformat/condformatdlgentry.cxx | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 78ff04fd60af..36b8ddb92fdf 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -666,6 +666,7 @@ ScColorScale2FrmtEntry::ScColorScale2FrmtEntry( Window* pParent, ScDocument* pDo maLbType.SelectEntryPos(0); maLbColorFormat.SelectEntryPos(0); + Init(); if(pFormat) { ScColorScaleFormat::const_iterator itr = pFormat->begin(); @@ -682,7 +683,8 @@ ScColorScale2FrmtEntry::ScColorScale2FrmtEntry( Window* pParent, ScDocument* pDo maLbColorFormat.SetSelectHdl( LINK( pParent, ScCondFormatList, ColFormatTypeHdl ) ); - Init(); + EntryTypeHdl(&maLbEntryTypeMin); + EntryTypeHdl(&maLbEntryTypeMax); } void ScColorScale2FrmtEntry::Init() @@ -722,9 +724,6 @@ void ScColorScale2FrmtEntry::Init() maLbColMin.SetUpdateMode( sal_True ); maLbColMax.SetUpdateMode( sal_True ); } - - EntryTypeHdl(&maLbEntryTypeMin); - EntryTypeHdl(&maLbEntryTypeMax); } ScFormatEntry* ScColorScale2FrmtEntry::createColorscaleEntry() const @@ -818,6 +817,7 @@ ScColorScale3FrmtEntry::ScColorScale3FrmtEntry( Window* pParent, ScDocument* pDo maLbEntryTypeMiddle.RemoveEntry(0); maLbEntryTypeMax.RemoveEntry(0); + Init(); maLbType.SelectEntryPos(0); if(pFormat) { @@ -840,8 +840,9 @@ ScColorScale3FrmtEntry::ScColorScale3FrmtEntry( Window* pParent, ScDocument* pDo FreeResource(); maLbColorFormat.SetSelectHdl( LINK( pParent, ScCondFormatList, ColFormatTypeHdl ) ); - - Init(); + EntryTypeHdl(&maLbEntryTypeMin); + EntryTypeHdl(&maLbEntryTypeMiddle); + EntryTypeHdl(&maLbEntryTypeMax); } void ScColorScale3FrmtEntry::Init() @@ -887,10 +888,6 @@ void ScColorScale3FrmtEntry::Init() maLbColMiddle.SetUpdateMode( sal_True ); maLbColMax.SetUpdateMode( sal_True ); } - - EntryTypeHdl(&maLbEntryTypeMin); - EntryTypeHdl(&maLbEntryTypeMiddle); - EntryTypeHdl(&maLbEntryTypeMax); } ScFormatEntry* ScColorScale3FrmtEntry::createColorscaleEntry() const |