diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-23 11:21:38 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-23 11:21:38 +0000 |
| commit | a767f73f878ff0e55d8a99ead1bbdfb8492ccb53 (patch) | |
| tree | 5ee81224136cef1e7b2a920928d3683cf78c74bb /svx | |
| parent | 232e98413823c93faeef50a92359fec86370cff8 (diff) | |
INTEGRATION: CWS fs08 (1.69.8); FILE MERGED
2007/01/03 18:15:55 fridrich_strba 1.69.8.2: RESYNC: (1.69-1.70); FILE MERGED
2006/12/20 10:13:33 fridrich_strba 1.69.8.1: Issue number: 72788
Submitted by: thb
Reviewed by: fridrich_strba
Small unrelated patch to disambiguate the function call and take compiler out of confusion on Solaris 10 :-)
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index f21974f06b59..0507a530f6fb 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -4,9 +4,9 @@ * * $RCSfile: svdmodel.cxx,v $ * - * $Revision: 1.70 $ + * $Revision: 1.71 $ * - * last change: $Author: kz $ $Date: 2006-12-14 14:28:53 $ + * last change: $Author: obo $ $Date: 2007-01-23 12:21:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1310,7 +1310,7 @@ void SdrModel::TakeMetricStr(long nVal, XubString& rStr, FASTBOOL bNoUnitChars, if(nKomma > nNumDigits) { const sal_Int32 nDiff(nKomma - nNumDigits); - const double fFactor(pow(10.0, nDiff)); + const double fFactor(pow(10.0, (int)nDiff)); fLocalValue /= fFactor; nKomma = nNumDigits; @@ -1318,7 +1318,7 @@ void SdrModel::TakeMetricStr(long nVal, XubString& rStr, FASTBOOL bNoUnitChars, else if(nKomma < nNumDigits) { const sal_Int32 nDiff(nNumDigits - nKomma); - const double fFactor(pow(10.0, nDiff)); + const double fFactor(pow(10.0, (int)nDiff)); fLocalValue *= fFactor; nKomma = nNumDigits; |