diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-01-15 16:00:38 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-01-15 19:11:55 +0100 |
| commit | e6ec7b16f2fda4d6624b06506ccfa2a4c5bc4cbb (patch) | |
| tree | 145c10aedb6a431ff27074d94ecfcc0271609048 /sc/source/ui/condformat | |
| parent | d81787416087827200ee12a8fbd25747fbfc3959 (diff) | |
create correct icon set information, fdo#58610
The old code was mixing two different concepts. In the UI we used that a
ScColorScaleEntry means <= this value while in the filter and the render
information generation it meant >= the value.
Now everything follows the >= pattern.
Change-Id: I67c03d93c5c6051054b90f6e8200206c3616d49b
Diffstat (limited to 'sc/source/ui/condformat')
| -rw-r--r-- | sc/source/ui/condformat/condformatdlgentry.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 487842a3b41d..994d6725085b 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -1297,11 +1297,13 @@ ScColorScaleEntry* ScIconSetFrmtEntry::ScIconSetFrmtDataEntry::CreateEntry(ScDoc return pEntry; } -void ScIconSetFrmtEntry::ScIconSetFrmtDataEntry::SetLastEntry() +void ScIconSetFrmtEntry::ScIconSetFrmtDataEntry::SetFirstEntry() { maEdEntry.Hide(); maLbEntryType.Hide(); maFtEntry.Hide(); + maEdEntry.SetText(OUString("0")); + maLbEntryType.SelectEntryPos(1); } ScIconSetFrmtEntry::ScIconSetFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScIconSetFormat* pFormat ): @@ -1328,7 +1330,7 @@ ScIconSetFrmtEntry::ScIconSetFrmtEntry( Window* pParent, ScDocument* pDoc, const aPos.Y() += maEntries[0].GetSizePixel().Height() * i * 1.2; maEntries[i].SetPosPixel( aPos ); } - maEntries.back().SetLastEntry(); + maEntries.begin()->SetFirstEntry(); } else IconSetTypeHdl(NULL); @@ -1359,7 +1361,7 @@ IMPL_LINK_NOARG( ScIconSetFrmtEntry, IconSetTypeHdl ) maEntries[i].SetPosPixel( aPos ); maEntries[i].Show(); } - maEntries.back().SetLastEntry(); + maEntries.begin()->SetFirstEntry(); SetHeight(); static_cast<ScCondFormatList*>(GetParent())->RecalcAll(); |