sc/source/core/data/colorscale.cxx | 1 - sc/source/ui/condformat/condformatdlgentry.cxx | 2 ++ vcl/source/window/split.cxx | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)
New commits: commit 0f6adf7a8cbccdb0a2697176a6e0e8cf58edd5fe Author: Markus Mohrhard <[email protected]> Date: Sat Jan 12 07:22:31 2013 +0100 fix icon set rendering information creation, fdo#58610 Change-Id: Iad5dec601b54893ed809ab908671698919779ddb diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index f5d23c1..073fbdc 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -894,7 +894,6 @@ ScIconSetInfo* ScIconSetFormat::GetIconSetInfo(const ScAddress& rAddr) const sal_Int32 nIndex = 0; const_iterator itr = begin(); - ++itr; double nValMax = CalcValue(nMin, nMax, itr); ++itr; diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 487842a..59ddfb3 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -1302,6 +1302,8 @@ void ScIconSetFrmtEntry::ScIconSetFrmtDataEntry::SetLastEntry() maEdEntry.Hide(); maLbEntryType.Hide(); maFtEntry.Hide(); + maLbEntryType.SelectEntryPos(1); + maEdEntry.SetText(OUString("100")); } ScIconSetFrmtEntry::ScIconSetFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScIconSetFormat* pFormat ): commit c6f919c7288a7b59e9bad51d1452afba9a93c241 Author: Markus Mohrhard <[email protected]> Date: Sat Jan 12 06:03:22 2013 +0100 we don't need to cast here Change-Id: I260c7a050c5998e5dca634ea5d5f43742bf604fe diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index 9e79c8f..f174696 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -729,7 +729,7 @@ void Splitter::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); if( rDCEvt.GetType() == DATACHANGED_SETTINGS ) { - AllSettings* pOldSettings = static_cast<AllSettings*>(rDCEvt.GetData()); + const AllSettings* pOldSettings = rDCEvt.GetOldSettings(); if(!pOldSettings) return; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
