summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-06-17 21:01:05 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-06-18 15:13:51 +0100
commit06e2005ed83567452783003e3113ad6a92190c2d (patch)
treebb3a92154bb0bbaeda1e6d548f467229206dd49d /svx
parent8e01e881451333eadb8e23f619e2b4014de1442a (diff)
convert LocaleDataWrapper to OUString
Change-Id: Icb5f5adf9139d1c0f0e86d8128ea6742ce20b138
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/_contdlg.cxx4
-rw-r--r--svx/source/dialog/imapdlg.cxx4
-rw-r--r--svx/source/form/formcontroller.cxx2
-rw-r--r--svx/source/items/chrtitem.cxx2
-rw-r--r--svx/source/stbctrls/pszctrl.cxx2
-rw-r--r--svx/source/svdraw/svdattr.cxx2
-rw-r--r--svx/source/svdraw/svdmodel.cxx4
-rw-r--r--svx/source/svdraw/svdomeas.cxx2
-rw-r--r--svx/source/svdraw/svdtrans.cxx2
9 files changed, 12 insertions, 12 deletions
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 32b962b11c07..50486b8650bf 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -579,7 +579,7 @@ IMPL_LINK( SvxSuperContourDlg, MousePosHdl, ContourWindow*, pWnd )
const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit();
const Point& rMousePos = pWnd->GetMousePos();
LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
- const sal_Unicode cSep = aLocaleWrapper.getNumDecimalSep().GetChar(0);
+ const sal_Unicode cSep = aLocaleWrapper.getNumDecimalSep()[0];
aStr.Assign( GetUnitString( rMousePos.X(), eFieldUnit, cSep ) );
aStr.Append( String::CreateFromAscii( " / " ) );
@@ -596,7 +596,7 @@ IMPL_LINK( SvxSuperContourDlg, GraphSizeHdl, ContourWindow*, pWnd )
const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit();
const Size& rSize = pWnd->GetGraphicSize();
LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
- const sal_Unicode cSep = aLocaleWrapper.getNumDecimalSep().GetChar(0);
+ const sal_Unicode cSep = aLocaleWrapper.getNumDecimalSep()[0];
aStr.Assign( GetUnitString( rSize.Width(), eFieldUnit, cSep ) );
aStr.Append( String::CreateFromAscii( " x " ) );
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index b6a211e017e4..643fe62d20ae 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -676,7 +676,7 @@ IMPL_LINK( SvxIMapDlg, MousePosHdl, IMapWindow*, pWnd )
const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit();
const Point& rMousePos = pWnd->GetMousePos();
LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
- const sal_Unicode cSep = aLocaleWrapper.getNumDecimalSep().GetChar(0);
+ const sal_Unicode cSep = aLocaleWrapper.getNumDecimalSep()[0];
aStr.Assign( GetUnitString( rMousePos.X(), eFieldUnit, cSep ) );
aStr.Append( DEFINE_CONST_UNICODE( " / " ) );
@@ -693,7 +693,7 @@ IMPL_LINK( SvxIMapDlg, GraphSizeHdl, IMapWindow*, pWnd )
const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit();
const Size& rSize = pWnd->GetGraphicSize();
LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
- const sal_Unicode cSep = aLocaleWrapper.getNumDecimalSep().GetChar(0);
+ const sal_Unicode cSep = aLocaleWrapper.getNumDecimalSep()[0];
aStr.Assign( GetUnitString( rSize.Width(), eFieldUnit, cSep ) );
aStr.Append( DEFINE_CONST_UNICODE( " x " ) );
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 374bb29b54d3..8a6758e105c2 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -3256,7 +3256,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
,xFormatter
,xField
,aAppLocale
- ,(sal_Char)aLocaleWrapper.getNumDecimalSep().GetChar(0)
+ ,(sal_Char)aLocaleWrapper.getNumDecimalSep()[0]
,getParseContext());
aRow[(*iter).xText] = sCriteria;
}
diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
index 09eeadc581bc..1d704c5106be 100644
--- a/svx/source/items/chrtitem.cxx
+++ b/svx/source/items/chrtitem.cxx
@@ -268,7 +268,7 @@ SfxItemPresentation SvxDoubleItem::GetPresentation
if ( pIntlWrapper )
{
rText = ::rtl::math::doubleToUString( fVal, rtl_math_StringFormat_E, 4,
- pIntlWrapper->getLocaleData()->getNumDecimalSep().GetChar(0), true );
+ pIntlWrapper->getLocaleData()->getNumDecimalSep()[0], true );
}
else
rText = GetValueText();
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 27811db92f02..8b09cb2cf2a6 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -76,7 +76,7 @@ String SvxPosSizeStatusBarControl::GetMetricStr_Impl( long nVal )
FieldUnit eInUnit = FUNIT_100TH_MM;
String sMetric;
- const sal_Unicode cSep = Application::GetSettings().GetLocaleDataWrapper().getNumDecimalSep().GetChar(0);
+ const sal_Unicode cSep = Application::GetSettings().GetLocaleDataWrapper().getNumDecimalSep()[0];
sal_Int64 nConvVal = MetricField::ConvertValue( nVal * 100, 0L, 0, eInUnit, eOutUnit );
if ( nConvVal < 0 && ( nConvVal / 100 == 0 ) )
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index e953c4cf2aa9..8b2b15202614 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -898,7 +898,7 @@ SfxItemPresentation SdrAngleItem::GetPresentation(
else
{
sal_Unicode cDec =
- pIntlWrapper->getLocaleData()->getNumDecimalSep().GetChar(0);
+ pIntlWrapper->getLocaleData()->getNumDecimalSep()[0];
rText.Insert(cDec, nLen-2);
if(bNull1)
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index eeed2c54740f..2d194bb2d115 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1299,7 +1299,7 @@ void SdrModel::TakeMetricStr(long nVal, rtl::OUString& rStr, bool bNoUnitChars,
aBuf.insert(0, sal_Unicode('0'));
}
- sal_Unicode cDec( rLoc.getNumDecimalSep().GetChar(0) );
+ sal_Unicode cDec( rLoc.getNumDecimalSep()[0] );
// insert KommaChar (decimal point character)
sal_Int32 nVorKomma = aBuf.getLength() - nKomma;
@@ -1369,7 +1369,7 @@ void SdrModel::TakeWinkStr(long nWink, rtl::OUString& rStr, bool bNoDegChar) con
while(aBuf.getLength() < nAnz)
aBuf.insert(0, sal_Unicode('0'));
- aBuf.insert(aBuf.getLength()-2, rLoc.getNumDecimalSep().GetChar(0));
+ aBuf.insert(aBuf.getLength()-2, rLoc.getNumDecimalSep()[0]);
if(bNeg)
aBuf.insert(0, sal_Unicode('-'));
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 2e7cd0546c29..439bfba81f8e 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -131,7 +131,7 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMe
rStr += sal_Unicode('?');
}
- sal_Unicode cDec(SvtSysLocale().GetLocaleData().getNumDecimalSep().GetChar(0));
+ sal_Unicode cDec(SvtSysLocale().GetLocaleData().getNumDecimalSep()[0]);
if(rStr.Search(cDec) != STRING_NOTFOUND)
{
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index a9c585366b6e..333582a64ef5 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -914,7 +914,7 @@ void SdrFormatter::TakeStr(long nVal, XubString& rStr) const
if(nK > 0)
{
// do we still have decimal places?
- sal_Unicode cDec(rLoc.getNumDecimalSep().GetChar(0));
+ sal_Unicode cDec(rLoc.getNumDecimalSep()[0]);
aStr.Insert(cDec, nVorKomma);
}
}