Kaydet (Commit) a767f73f authored tarafından Oliver Bolte's avatar Oliver Bolte

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 :-)
üst 232e9841
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: svdmodel.cxx,v $ * $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 Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -1310,7 +1310,7 @@ void SdrModel::TakeMetricStr(long nVal, XubString& rStr, FASTBOOL bNoUnitChars, ...@@ -1310,7 +1310,7 @@ void SdrModel::TakeMetricStr(long nVal, XubString& rStr, FASTBOOL bNoUnitChars,
if(nKomma > nNumDigits) if(nKomma > nNumDigits)
{ {
const sal_Int32 nDiff(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; fLocalValue /= fFactor;
nKomma = nNumDigits; nKomma = nNumDigits;
...@@ -1318,7 +1318,7 @@ void SdrModel::TakeMetricStr(long nVal, XubString& rStr, FASTBOOL bNoUnitChars, ...@@ -1318,7 +1318,7 @@ void SdrModel::TakeMetricStr(long nVal, XubString& rStr, FASTBOOL bNoUnitChars,
else if(nKomma < nNumDigits) else if(nKomma < nNumDigits)
{ {
const sal_Int32 nDiff(nNumDigits - nKomma); const sal_Int32 nDiff(nNumDigits - nKomma);
const double fFactor(pow(10.0, nDiff)); const double fFactor(pow(10.0, (int)nDiff));
fLocalValue *= fFactor; fLocalValue *= fFactor;
nKomma = nNumDigits; nKomma = nNumDigits;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment