Kaydet (Commit) 7465f5e6 authored tarafından Takeshi Abe's avatar Takeshi Abe

extract ImpGetIntntlSep() into sbxconv.hxx and reuse it

üst b30c9f7d
......@@ -42,6 +42,8 @@ extern SbxError ImpScan
// with advanced evaluation (International, "TRUE"/"FALSE")
extern sal_Bool ImpConvStringExt( ::rtl::OUString& rSrc, SbxDataType eTargetType );
void ImpGetIntntlSep( sal_Unicode& rcDecimalSep, sal_Unicode& rcThousandSep );
// SBXINT.CXX
double ImpRound( double );
......
......@@ -40,13 +40,10 @@ static rtl::OUString ImpCurrencyToString( const sal_Int64 &rVal )
bool isNeg = ( rVal < 0 );
sal_Int64 absVal = isNeg ? -rVal : rVal;
SvtSysLocale aSysLocale;
sal_Unicode cDecimalSep = '.';
#if MAYBEFUTURE
sal_Unicode cThousandSep = ',';
const LocaleDataWrapper& rData = aSysLocale.GetLocaleData();
cDecimalSep = rData.getNumDecimalSep().GetBuffer()[0];
cThousandSep = rData.getNumThousandSep().GetBuffer()[0];
ImpGetIntntlSep( cDecimalSep, cThousandSep );
#endif
rtl::OUString aAbsStr = rtl::OUString::valueOf( absVal );
......@@ -119,14 +116,12 @@ static sal_Int64 ImpStringToCurrency( const rtl::OUString &rStr )
sal_Int32 nFractDigit = 4;
SvtSysLocale aSysLocale;
sal_Unicode cDeciPnt = sal_Unicode('.');
sal_Unicode c1000Sep = sal_Unicode(',');
#if MAYBEFUTURE
const LocaleDataWrapper& rData = aSysLocale.GetLocaleData();
sal_Unicode cLocaleDeciPnt = rData.getNumDecimalSep().GetBuffer()[0];
sal_Unicode cLocale1000Sep = rData.getNumThousandSep().GetBuffer()[0];
sal_Unicode cLocaleDeciPnt, cLocale1000Sep;
ImpGetIntntlSep( cLocaleDeciPnt, cLocale1000Sep );
// score each set of separators (Locale and Basic) on total number of matches
// if one set has more matches use that set
......
......@@ -201,9 +201,6 @@ void SbxDecimal::setUInt( unsigned int val )
setULong( (sal_uInt32)val );
}
// sbxscan.cxx
void ImpGetIntntlSep( sal_Unicode& rcDecimalSep, sal_Unicode& rcThousandSep );
bool SbxDecimal::setString( ::rtl::OUString* pOUString )
{
static LCID nLANGID = MAKELANGID( LANG_ENGLISH, SUBLANG_ENGLISH_US );
......
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