Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1708
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/08/1708/1
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
---
M sc/source/ui/condformat/condformatdlgentry.cxx
M sc/source/ui/inc/condformatdlgentry.hxx
M sc/source/ui/src/condformatdlg.src
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx
b/sc/source/ui/condformat/condformatdlgentry.cxx
index 12e804a..fb4a30a 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -1299,11 +1299,13 @@
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 @@
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 @@
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 885443d..0723aa6 100644
--- a/sc/source/ui/inc/condformatdlgentry.hxx
+++ b/sc/source/ui/inc/condformatdlgentry.hxx
@@ -261,7 +261,7 @@
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 ae5fc86..53df59c 100644
--- a/sc/source/ui/src/condformatdlg.src
+++ b/sc/source/ui/src/condformatdlg.src
@@ -382,7 +382,7 @@
{
Pos = MAP_APPFONT( 40, 0 );
Size = MAP_APPFONT(40, 14);
- Text [en-US] = " <= ";
+ Text [en-US] = " >= ";
};
Edit ED_ICON_SET_ENTRY_VALUE
{
--
To view, visit https://gerrit.libreoffice.org/1708
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I67c03d93c5c6051054b90f6e8200206c3616d49b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard <markus.mohrhard@googlemail.com>
Context
- [PATCH] Change in core[libreoffice-4-0]: create correct icon set information, fdo#58610 · Markus Mohrhard (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.