Author: alg
Date: Wed Apr 17 09:24:32 2013
New Revision: 1468810
URL: http://svn.apache.org/r1468810
Log:
i122041 Added WaE patch from Pavel
Modified:
openoffice/trunk/main/svx/source/tbxctrls/SvxColorValueSet.cxx
Modified: openoffice/trunk/main/svx/source/tbxctrls/SvxColorValueSet.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/tbxctrls/SvxColorValueSet.cxx?rev=1468810&r1=1468809&r2=1468810&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/tbxctrls/SvxColorValueSet.cxx (original)
+++ openoffice/trunk/main/svx/source/tbxctrls/SvxColorValueSet.cxx Wed Apr 17
09:24:32 2013
@@ -113,7 +113,6 @@ Size SvxColorValueSet::layoutToGivenHeig
nEntryCount++;
}
- const sal_uInt32 nRowCount(ceil(double(nEntryCount)/getColumnCount()));
const Size aItemSize(getEntryEdgeLength(), getEntryEdgeLength());
const WinBits aWinBits(GetStyle() & ~WB_VSCROLL);
@@ -127,7 +126,7 @@ Size SvxColorValueSet::layoutToGivenHeig
Size aNewSize(CalcWindowSizePixel(aItemSize, getColumnCount()));
// evtl. activate vertical scroll
- const bool bAdaptHeight(aNewSize.Height() > nHeight);
+ const bool bAdaptHeight(static_cast< sal_uInt32 >(aNewSize.Height()) >
nHeight);
if(bAdaptHeight)
{
