sc/source/core/tool/interpr2.cxx | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
New commits:
commit d6aa070267f95fbcc6024ca42b8473ef08df81c7
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Thu Jun 28 17:44:42 2018 +0900
sc: Replace DblMin() with std::min()
Change-Id: Ic9ca0e9c1a63519026152f9aa1a038f183de1e4d
Reviewed-on: https://gerrit.libreoffice.org/56581
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 7846d0d162b6..682867b8ef18 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -1781,11 +1781,6 @@ double ScInterpreter::ScInterVDB(double fCost, double
fSalvage, double fLife,
return fVdb;
}
-inline double DblMin( double a, double b )
-{
- return (a < b) ? a : b;
-}
-
void ScInterpreter::ScVDB()
{
nFuncFmtType = SvNumFormatType::CURRENCY;
@@ -1826,7 +1821,7 @@ void ScInterpreter::ScVDB()
//respect partial period in the Beginning/ End:
if ( i == nLoopStart+1 )
- fTerm *= ( DblMin( fEnd, fIntStart + 1.0 ) - fStart );
+ fTerm *= ( std::min( fEnd, fIntStart + 1.0 ) - fStart
);
else if ( i == nLoopEnd )
fTerm *= ( fEnd + 1.0 - fIntEnd );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
