diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-06-17 21:01:05 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-18 15:13:51 +0100 |
commit | 06e2005ed83567452783003e3113ad6a92190c2d (patch) | |
tree | bb3a92154bb0bbaeda1e6d548f467229206dd49d /sc | |
parent | 8e01e881451333eadb8e23f619e2b4014de1442a (diff) |
convert LocaleDataWrapper to OUString
Change-Id: Icb5f5adf9139d1c0f0e86d8128ea6742ce20b138
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/core/data/dpcache.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/compiler.cxx | 4 | ||||
-rw-r--r-- | sc/source/filter/excel/excimp8.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xcl97/xcl97rec.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/cctrl/editfield.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/solveroptions.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/view/cellsh2.cxx | 4 |
7 files changed, 13 insertions, 13 deletions
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx index 6908163a215f..742b6eb7a654 100644 --- a/sc/source/core/data/dpcache.cxx +++ b/sc/source/core/data/dpcache.cxx @@ -1006,7 +1006,7 @@ rtl::OUString ScDPCache::GetFormattedString(long nDim, const ScDPItemData& rItem if (!p) return rItem.GetString(); - sal_Unicode cDecSep = ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0); + sal_Unicode cDecSep = ScGlobal::pLocaleData->getNumDecimalSep()[0]; return ScDPUtil::getNumGroupName(fVal, p->maInfo, cDecSep, mpDoc->GetFormatTable()); } diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 7833786b6c17..97ae77012619 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -1867,7 +1867,7 @@ xub_StrLen ScCompiler::NextSymbol(bool bInArray) sal_Unicode cArrayColSep = mxSymbols->getSymbol( ocArrayColSep).GetChar(0); sal_Unicode cArrayRowSep = mxSymbols->getSymbol( ocArrayRowSep).GetChar(0); sal_Unicode cDecSep = (mxSymbols->isEnglish() ? '.' : - ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0)); + ScGlobal::pLocaleData->getNumDecimalSep()[0]); // special symbols specific to address convention used sal_Unicode cSheetPrefix = pConv->getSpecialSymbol(ScCompiler::Convention::ABS_SHEET_PREFIX); @@ -2786,7 +2786,7 @@ bool ScCompiler::IsReference( const String& rName ) // Has to be called before IsValue sal_Unicode ch1 = rName.GetChar(0); sal_Unicode cDecSep = ( mxSymbols->isEnglish() ? '.' : - ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0) ); + ScGlobal::pLocaleData->getNumDecimalSep()[0] ); if ( ch1 == cDecSep ) return false; // Who was that imbecile introducing '.' as the sheet name separator!?! diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 91d5a018cee8..3dbc3cf5aede 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -500,7 +500,7 @@ void XclImpAutoFilterData::CreateFromDouble( rtl::OUString& rStr, double fVal ) { rStr += ::rtl::math::doubleToUString(fVal, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, - ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0), true); + ScGlobal::pLocaleData->getNumDecimalSep()[0], true); } void XclImpAutoFilterData::SetCellAttribs() diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index f1f8a4053afe..4e7e4af970c9 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -1244,7 +1244,7 @@ ExcEScenario::ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab ) sText = ::rtl::math::doubleToUString( fVal, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, - ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0), + ScGlobal::pLocaleData->getNumDecimalSep()[0], sal_True ); } else diff --git a/sc/source/ui/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxx index 51147e5cd2cb..3ee77c71edec 100644 --- a/sc/source/ui/cctrl/editfield.cxx +++ b/sc/source/ui/cctrl/editfield.cxx @@ -42,12 +42,12 @@ namespace { sal_Unicode lclGetDecSep() { - return ScGlobal::GetpLocaleData()->getNumDecimalSep().GetChar( 0 ); + return ScGlobal::GetpLocaleData()->getNumDecimalSep()[0]; } sal_Unicode lclGetGroupSep() { - return ScGlobal::GetpLocaleData()->getNumThousandSep().GetChar( 0 ); + return ScGlobal::GetpLocaleData()->getNumThousandSep()[0]; } } // namespace diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 232cb1a52950..cd73cf841a02 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -105,7 +105,7 @@ void ScSolverOptionsString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, if ( mbIsDouble ) sTxt += (String)rtl::math::doubleToUString( mfDoubleValue, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, - ScGlobal::GetpLocaleData()->getNumDecimalSep().GetChar(0), true ); + ScGlobal::GetpLocaleData()->getNumDecimalSep()[0], true ); else sTxt += String::CreateFromInt32( mnIntValue ); rDev.SetFont( aFont ); @@ -470,7 +470,7 @@ void ScSolverValueDialog::SetValue( double fValue ) { maEdValue.SetText( rtl::math::doubleToUString( fValue, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, - ScGlobal::GetpLocaleData()->getNumDecimalSep().GetChar(0), true ) ); + ScGlobal::GetpLocaleData()->getNumDecimalSep()[0], true ) ); } double ScSolverValueDialog::GetValue() const @@ -480,8 +480,8 @@ double ScSolverValueDialog::GetValue() const const LocaleDataWrapper* pLocaleData = ScGlobal::GetpLocaleData(); rtl_math_ConversionStatus eStatus = rtl_math_ConversionStatus_Ok; double fValue = rtl::math::stringToDouble( aInput, - pLocaleData->getNumDecimalSep().GetChar(0), - pLocaleData->getNumThousandSep().GetChar(0), + pLocaleData->getNumDecimalSep()[0], + pLocaleData->getNumThousandSep()[0], &eStatus, NULL ); return fValue; } diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 9cf1834b1a06..65f89f834310 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -842,7 +842,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) if (pDoc->GetFormatTable()->IsNumberFormat(aTemp1, nNumIndex, nVal)) aExpr1 =String( ::rtl::math::doubleToUString( nVal, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, - ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0), sal_True)); + ScGlobal::pLocaleData->getNumDecimalSep()[0], sal_True)); else aExpr1 = aTemp1; } @@ -859,7 +859,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) if (pDoc->GetFormatTable()->IsNumberFormat(aTemp2, nNumIndex, nVal)) aExpr2 =String( ::rtl::math::doubleToUString( nVal, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, - ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0), sal_True)); + ScGlobal::pLocaleData->getNumDecimalSep()[0], sal_True)); else aExpr2 = aTemp2; } |