summaryrefslogtreecommitdiff
path: root/sc/source/ui/optdlg
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-05-10 15:04:25 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-05-10 15:04:25 +0000
commit559f43c1e5e89a39efc78eb6ba12a94584a077fc (patch)
treec69155059e8065a423253125056ffb8fc7a01ead /sc/source/ui/optdlg
parent31bd3953baa2b31dca5ee0fd895f459c210d5506 (diff)
INTEGRATION: CWS dialogdiet01 (1.10.30); FILE MERGED
2004/04/23 07:45:45 mwu 1.10.30.1: dialogdiet01 m33 sd 20040422
Diffstat (limited to 'sc/source/ui/optdlg')
-rw-r--r--sc/source/ui/optdlg/tpcalc.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index 97258c398241..e918c1d3760d 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.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: hr $ $Date: 2004-02-04 14:28:26 $
+ * last change: $Author: hr $ $Date: 2004-05-10 16:04:25 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -131,7 +131,7 @@ ScTpCalcOptions::ScTpCalcOptions( Window* pParent,
aEdPrec ( this, ScResId( ED_PREC ) ),
aSeparatorFL ( this, ScResId( FL_SEPARATOR ) ),
aHSeparatorFL ( this, ScResId( FL_H_SEPARATOR ) ),
- aDecSep ( ScGlobal::pLocaleData->getNumDecimalSep() ),
+ aDecSep ( GetScGlobalpLocaleData()->getNumDecimalSep() ),//CHINA001 aDecSep ( ScGlobal::pLocaleData->getNumDecimalSep() ),
nWhichCalc ( GetWhich( SID_SCDOCOPTIONS ) ),
pOldOptions ( new ScDocOptions(
((const ScTpCalcItem&)rCoreAttrs.Get(
@@ -270,8 +270,8 @@ BOOL ScTpCalcOptions::GetEps( double& rEps )
sal_Unicode const * pBegin = aStr.GetBuffer();
sal_Unicode const * pEnd;
rEps = rtl_math_uStringToDouble( pBegin, pBegin + aStr.Len(),
- ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0),
- ScGlobal::pLocaleData->getNumThousandSep().GetChar(0),
+ GetScGlobalpLocaleData()->getNumDecimalSep().GetChar(0),//CHINA001 ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0),
+ GetScGlobalpLocaleData()->getNumThousandSep().GetChar(0),//CHINA001 ScGlobal::pLocaleData->getNumThousandSep().GetChar(0),
&eStatus, &pEnd );
BOOL bOk = ( eStatus == rtl_math_ConversionStatus_Ok && *pEnd == '\0' && rEps > 0.0 );