diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-26 17:07:02 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-26 17:07:02 +0000 |
| commit | 555d702903fb0857122024e1ab78a72d122d3f16 (patch) | |
| tree | 6c749e09d7b761f4ce353bedcc31627a38529196 /sc/source/ui/optdlg | |
| parent | ff721adbe05f7a6659d9dffcf46c671f8a644da7 (diff) | |
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'sc/source/ui/optdlg')
| -rw-r--r-- | sc/source/ui/optdlg/opredlin.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/optdlg/tpcalc.cxx | 26 |
2 files changed, 15 insertions, 15 deletions
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index 0201248c272c..5cd5d9696e6c 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: opredlin.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:03 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index 3cd8555fb216..6e636b499fbd 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tpcalc.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: er $ $Date: 2001-07-11 16:02:59 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,8 +72,8 @@ #include "scitems.hxx" #include <vcl/msgbox.hxx> -#ifndef _TOOLS_SOLMATH_HXX //autogen wg. SolarMath -#include <tools/solmath.hxx> +#ifndef INCLUDED_RTL_MATH_HXX +#include <rtl/math.hxx> #endif #ifndef _UNOTOOLS_LOCALEDATAWRAPPER_HXX #include <unotools/localedatawrapper.hxx> @@ -182,12 +182,11 @@ SfxTabPage* __EXPORT ScTpCalcOptions::Create( Window* pParent, const SfxItemSet& void __EXPORT ScTpCalcOptions::Reset( const SfxItemSet& rCoreAttrs ) { USHORT d,m,y; - String aStrBuf; *pLocalOptions = *pOldOptions; - SolarMath::DoubleToString( aStrBuf, pLocalOptions->GetIterEps(), - 'G', 6, aDecSep.GetChar(0), TRUE ); + String aStrBuf( ::rtl::math::doubleToUString( pLocalOptions->GetIterEps(), + rtl_math_StringFormat_G, 6, aDecSep.GetChar(0), TRUE)); aBtnCase .Check( !pLocalOptions->IsIgnoreCase() ); aBtnCalc .Check( pLocalOptions->IsCalcAsShown() ); @@ -267,13 +266,14 @@ BOOL ScTpCalcOptions::GetEps( double& rEps ) { String aStr( aEdEps.GetText() ); aStr.EraseTrailingChars( ' ' ); - int nErrno; - const sal_Unicode* pEnd; - rEps = SolarMath::StringToDouble( aStr.GetBuffer(), - ScGlobal::pLocaleData->getNumThousandSep().GetChar(0), + rtl_math_ConversionStatus eStatus; + sal_Unicode const * pBegin = aStr.GetBuffer(); + sal_Unicode const * pEnd; + rEps = rtl_math_uStringToDouble( pBegin, pBegin + aStr.Len(), ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0), - nErrno, &pEnd ); - BOOL bOk = ( nErrno == 0 && *pEnd == '\0' && rEps > 0.0 ); + ScGlobal::pLocaleData->getNumThousandSep().GetChar(0), + &eStatus, &pEnd ); + BOOL bOk = ( eStatus == rtl_math_ConversionStatus_Ok && *pEnd == '\0' && rEps > 0.0 ); if ( bOk ) pLocalOptions->SetIterEps( rEps ); |