Attachment #80231 for issue #114430

View | Details | Raw Unified | Return to issue 114430
Collapse All | Expand All




 */
double SAL_CALL rtl_math_pow10Exp(double fValue, int nExp) SAL_THROW_EXTERN_C();

/** Similar to pow() with stricter exception handling for indeterminate values.

    powr is part of the IEEE 754 2008 Floating Point Standard.

    @param fValue
    The value to be raised.

    @param Exp
    The exponent.

    @return
    powr(fValue, Exp)
 */
double SAL_CALL rtl_math_powr(double fValue, int nExp) SAL_THROW_EXTERN_C();

/** Rounds value to 15 significant decimal digits.

    @param fValue

Lines 186-191 Link Here

(-)sal/inc/rtl/math.hxx (+7 lines)
186	return rtl_math_pow10Exp(fValue, nExp);	186	return rtl_math_pow10Exp(fValue, nExp);
187	}	187	}
188		188
		189	/** A wrapper around rtl_math_powr.
		190	*/
		191	inline double powr(double fValue, int fExp)
		192	{
		193	return rtl_math_powr(fValue, fExp);
		194	}
		195
189	/** A wrapper around rtl_math_approxValue.	196	/** A wrapper around rtl_math_approxValue.
190	*/	197	*/
191	inline double approxValue(double fValue)	198	inline double approxValue(double fValue)




    return (fe-1.0) * fValue / log(fe);
}

double SAL_CALL rtl_math_powr( double fValue,  double fExp ) SAL_THROW_EXTERN_C()
{
    if ((fValue == 0.0  && fExp == 0.0) ||
	(rtl::math::isInf( fExp ) && !rtl::math::isSignBitSet( fExp )) ||
	(rtl::math::isInf( fValue ) && !rtl::math::isSignBitSet( fValue )))
    {
        double fResult;
        ::rtl::math::setNan( &fResult );
        return fResult;
    }
    return pow(fValue, fExp);
}


double SAL_CALL rtl_math_log1p( double fValue ) SAL_THROW_EXTERN_C()
{
    // Use volatile because a compiler may be too smart "optimizing" the

Lines 629-634 Link Here

(-)sal/util/sal.map (+2 lines)
629	global:	629	global:
630	osl_loadAsciiModule;	630	osl_loadAsciiModule;
631	osl_loadAsciiModuleRelative;	631	osl_loadAsciiModuleRelative;
		632
		633	rtl_math_powr;
632	} UDK_3.11;	634	} UDK_3.11;
633		635
634	PRIVATE_1.0 {	636	PRIVATE_1.0 {




void ScGetTime();
void ScGetDiffDate();
void ScGetDiffDate360();
void ScPower();
void ScAmpersand();
void ScAdd();
void ScSub();
void ScMul();
void ScDiv();
void ScPow();
void ScCurrent();
void ScStyle();
void ScDde();

double ScGetGCD(double fx, double fy);
void ScGCD();
void ScLCM();
void ScPower();
void ScAmpersand();
void ScAdd();
void ScSub();
void ScMul();
void ScDiv();
void ScPow();
//-------------------------- Matrixfunktionen ---------------------------------

void ScMatValue();




            if (bFlag)
            {   for ( SCSIZE i = 0; i < nCount; i++ )
                    if (pMat->IsValue(i))
                        pResMat->PutDouble(::rtl::math::powr(fVal,pMat->GetDouble(i)), i);
                    else
                        pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i);
            }
            else
            {   for ( SCSIZE i = 0; i < nCount; i++ )
                    if (pMat->IsValue(i))
                        pResMat->PutDouble(::rtl::math::powr(pMat->GetDouble(i),fVal), i);
                    else
                        pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i);
            }

            PushIllegalArgument();
    }
    else
        PushDouble(::rtl::math::powr(fVal1,fVal2));
}

void ScInterpreter::ScSumProduct()

Return to issue 114430

Lines 396-401 Link Here

(-)sal/inc/rtl/math.h (+15 lines)
396	*/	396	*/
397	double SAL_CALL rtl_math_pow10Exp(double fValue, int nExp) SAL_THROW_EXTERN_C();	397	double SAL_CALL rtl_math_pow10Exp(double fValue, int nExp) SAL_THROW_EXTERN_C();
398		398
		399	/** Similar to pow() with stricter exception handling for indeterminate values.
		400
		401	powr is part of the IEEE 754 2008 Floating Point Standard.
		402
		403	@param fValue
		404	The value to be raised.
		405
		406	@param Exp
		407	The exponent.
		408
		409	@return
		410	powr(fValue, Exp)
		411	*/
		412	double SAL_CALL rtl_math_powr(double fValue, int nExp) SAL_THROW_EXTERN_C();
		413
399	/** Rounds value to 15 significant decimal digits.	414	/** Rounds value to 15 significant decimal digits.
400		415
401	@param fValue	416	@param fValue

Lines 1113-1119 Link Here

(-)sal/rtl/source/math.cxx (+13 lines)
1113	return (fe-1.0) * fValue / log(fe);	1113	return (fe-1.0) * fValue / log(fe);
1114	}	1114	}
1115		1115
		1116	double SAL_CALL rtl_math_powr( double fValue, double fExp ) SAL_THROW_EXTERN_C()
		1117	{
		1118	if ((fValue == 0.0 && fExp == 0.0) \|\|
		1119	(rtl::math::isInf( fExp ) && !rtl::math::isSignBitSet( fExp )) \|\|
		1120	(rtl::math::isInf( fValue ) && !rtl::math::isSignBitSet( fValue )))
		1121	{
		1122	double fResult;
		1123	::rtl::math::setNan( &fResult );
		1124	return fResult;
		1125	}
		1126	return pow(fValue, fExp);
		1127	}
1116		1128
		1129
1117	double SAL_CALL rtl_math_log1p( double fValue ) SAL_THROW_EXTERN_C()	1130	double SAL_CALL rtl_math_log1p( double fValue ) SAL_THROW_EXTERN_C()
1118	{	1131	{
1119	// Use volatile because a compiler may be too smart "optimizing" the	1132	// Use volatile because a compiler may be too smart "optimizing" the

Lines 609-621 Link Here

(-)sc/source/core/inc/interpre.hxx (-7 / +7 lines)
609	void ScGetTime();	609	void ScGetTime();
610	void ScGetDiffDate();	610	void ScGetDiffDate();
611	void ScGetDiffDate360();	611	void ScGetDiffDate360();
612	void ScPower();
613	void ScAmpersand();
614	void ScAdd();
615	void ScSub();
616	void ScMul();
617	void ScDiv();
618	void ScPow();
619	void ScCurrent();	612	void ScCurrent();
620	void ScStyle();	613	void ScStyle();
621	void ScDde();	614	void ScDde();
Lines 669-674 Link Here
669	double ScGetGCD(double fx, double fy);	662	double ScGetGCD(double fx, double fy);
670	void ScGCD();	663	void ScGCD();
671	void ScLCM();	664	void ScLCM();
		665	void ScPower();
		666	void ScAmpersand();
		667	void ScAdd();
		668	void ScSub();
		669	void ScMul();
		670	void ScDiv();
		671	void ScPow();
672	//-------------------------- Matrixfunktionen ---------------------------------	672	//-------------------------- Matrixfunktionen ---------------------------------
673		673
674	void ScMatValue();	674	void ScMatValue();

Lines 1611-1624 Link Here

(-)sc/source/core/tool/interpr5.cxx (-3 / +3 lines)
1611	if (bFlag)	1611	if (bFlag)
1612	{ for ( SCSIZE i = 0; i < nCount; i++ )	1612	{ for ( SCSIZE i = 0; i < nCount; i++ )
1613	if (pMat->IsValue(i))	1613	if (pMat->IsValue(i))
1614	pResMat->PutDouble(pow(fVal,pMat->GetDouble(i)), i);	1614	pResMat->PutDouble(::rtl::math::powr(fVal,pMat->GetDouble(i)), i);
1615	else	1615	else
1616	pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i);	1616	pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i);
1617	}	1617	}
1618	else	1618	else
1619	{ for ( SCSIZE i = 0; i < nCount; i++ )	1619	{ for ( SCSIZE i = 0; i < nCount; i++ )
1620	if (pMat->IsValue(i))	1620	if (pMat->IsValue(i))
1621	pResMat->PutDouble(pow(pMat->GetDouble(i),fVal), i);	1621	pResMat->PutDouble(::rtl::math::powr(pMat->GetDouble(i),fVal), i);
1622	else	1622	else
1623	pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i);	1623	pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i);
1624	}	1624	}
Lines 1628-1634 Link Here
1628	PushIllegalArgument();	1628	PushIllegalArgument();
1629	}	1629	}
1630	else	1630	else
1631	PushDouble(pow(fVal1,fVal2));	1631	PushDouble(::rtl::math::powr(fVal1,fVal2));
1632	}	1632	}
1633		1633
1634	void ScInterpreter::ScSumProduct()	1634	void ScInterpreter::ScSumProduct()