diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-01-15 16:00:38 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@suse.com> | 2013-01-16 09:30:51 +0000 |
| commit | 072fc07107e9849ed7050d18575b42049db9657e (patch) | |
| tree | dbf676f296b9b55dbd79c8f4c61275df4cf7f83f | |
| parent | f3cf01ba35e836ecbef03e8140b8afcbb11fdd44 (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
Reviewed-on: https://gerrit.libreoffice.org/1708
Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>
| -rw-r--r-- | sc/source/ui/condformat/condformatdlgentry.cxx | 8 | ||||
| -rw-r--r-- | sc/source/ui/inc/condformatdlgentry.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/src/condformatdlg.src | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 12e804ac05f4..fb4a30a005d1 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -1299,11 +1299,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 ): @@ -1330,7 +1332,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); @@ -1361,7 +1363,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(); diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index 885443d4b04a..0723aa6d6bf3 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -261,7 +261,7 @@ class ScIconSetFrmtEntry : public ScCondFrmtEntry ScColorScaleEntry* CreateEntry(ScDocument* pDoc, const ScAddress& rPos) const; - void SetLastEntry(); + void SetFirstEntry(); }; typedef boost::ptr_vector<ScIconSetFrmtDataEntry> ScIconSetFrmtDateEntriesType; ScIconSetFrmtDateEntriesType maEntries; diff --git a/sc/source/ui/src/condformatdlg.src b/sc/source/ui/src/condformatdlg.src index ae5fc864ea97..53df59c280b7 100644 --- a/sc/source/ui/src/condformatdlg.src +++ b/sc/source/ui/src/condformatdlg.src @@ -382,7 +382,7 @@ Control RID_ICON_SET_ENTRY { Pos = MAP_APPFONT( 40, 0 ); Size = MAP_APPFONT(40, 14); - Text [en-US] = " <= "; + Text [en-US] = " >= "; }; Edit ED_ICON_SET_ENTRY_VALUE { |