diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-02 15:48:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-05 08:54:22 +0200 |
| commit | aa1ccde1d2956c95fe44fb111e3a2f835b5c6fc6 (patch) | |
| tree | 9f0cf01c5f31a4f801c97b82a2d458cd9aadcf63 /svx/source/svdraw/svdomeas.cxx | |
| parent | 672aee1285638ed2c544c4aa97c01caca95fb103 (diff) | |
convert include/svx/svdmodel.hxx from String to OUString
Change-Id: If1d472cdc79c593a0e5e87319e064123d8143e67
Diffstat (limited to 'svx/source/svdraw/svdomeas.cxx')
| -rw-r--r-- | svx/source/svdraw/svdomeas.cxx | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index a482dac80549..d3b86b8c3da4 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -80,7 +80,7 @@ SdrMeasureObjGeoData::~SdrMeasureObjGeoData() {} OUString SdrMeasureObj::TakeRepresentation(SdrMeasureFieldKind eMeasureFieldKind) const { - String aStr; + OUString aStr; Fraction aMeasureScale(1, 1); sal_Bool bTextRota90(sal_False); sal_Bool bShowUnit(sal_False); @@ -131,37 +131,36 @@ OUString SdrMeasureObj::TakeRepresentation(SdrMeasureFieldKind eMeasureFieldKind if(!aFact.IsValid()) { - aStr = String(); - aStr += sal_Unicode('?'); + aStr = ""; + aStr += "?"; } sal_Unicode cDec(SvtSysLocale().GetLocaleData().getNumDecimalSep()[0]); - if(aStr.Search(cDec) != STRING_NOTFOUND) + if(aStr.indexOf(cDec) != -1) { - xub_StrLen nLen2(aStr.Len() - 1); + sal_Int32 nLen2(aStr.getLength() - 1); - while(aStr.GetChar(nLen2) == sal_Unicode('0')) + while(aStr[nLen2] == '0') { - aStr.Erase(nLen2); + aStr = aStr.copy(0, nLen2); nLen2--; } - if(aStr.GetChar(nLen2) == cDec) + if(aStr[nLen2] == cDec) { - aStr.Erase(nLen2); + aStr = aStr.copy(0, nLen2); nLen2--; } - if(!aStr.Len()) - aStr += sal_Unicode('0'); + if(aStr.isEmpty()) + aStr += "0"; } } else { // if there's no Model ... (e. g. preview in dialog) - aStr = String(); - aStr.AppendAscii("4711"); + aStr = "4711"; } break; @@ -188,8 +187,7 @@ OUString SdrMeasureObj::TakeRepresentation(SdrMeasureFieldKind eMeasureFieldKind { if(bTextRota90) { - aStr = String(); - aStr += sal_Unicode(' '); + aStr = " "; } break; |