diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-10-28 20:31:11 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-10-28 23:09:32 +0000 |
commit | 0dd085f8f327b08cf5d69c3e1b93ff82016995fb (patch) | |
tree | 0fec0966cd3a88b840621161de72ef5c462bb877 /vcl | |
parent | 8865b7f013bcd9b4ce41dd98be28ba28aeb22e66 (diff) |
UniString->rtl::OUStringBuffer
Change-Id: I9938d7c4ab5594baeb10f405f0aa0964ef84d6c5
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/control/field.cxx | 45 | ||||
-rw-r--r-- | vcl/source/control/longcurr.cxx | 37 |
2 files changed, 40 insertions, 42 deletions
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index f258ffcd6288..93c3a1c2c098 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -103,10 +103,9 @@ static sal_Bool ImplNumericGetValue( const XubString& rStr, double& rValue, { XubString aStr = rStr; XubString aStr1; - XubString aStr2; + rtl::OUStringBuffer aStr2; sal_Bool bNegative = sal_False; xub_StrLen nDecPos; - xub_StrLen i; // react on empty string if ( !rStr.Len() ) @@ -120,7 +119,7 @@ static sal_Bool ImplNumericGetValue( const XubString& rStr, double& rValue, if ( nDecPos != STRING_NOTFOUND ) { aStr1 = aStr.Copy( 0, nDecPos ); - aStr2 = aStr.Copy( nDecPos+1 ); + aStr2.append(aStr.Copy(nDecPos+1)); } else aStr1 = aStr; @@ -132,7 +131,7 @@ static sal_Bool ImplNumericGetValue( const XubString& rStr, double& rValue, bNegative = sal_True; if ( !bNegative ) { - for ( i=0; i < aStr.Len(); i++ ) + for (xub_StrLen i=0; i < aStr.Len(); i++ ) { if ( (aStr.GetChar( i ) >= '0') && (aStr.GetChar( i ) <= '9') ) break; @@ -149,7 +148,7 @@ static sal_Bool ImplNumericGetValue( const XubString& rStr, double& rValue, if ( (nFormat == 3) || (nFormat == 6) || (nFormat == 7) || (nFormat == 10) ) { - for ( i = (xub_StrLen)(aStr.Len()-1); i > 0; i++ ) + for (xub_StrLen i = (xub_StrLen)(aStr.Len()-1); i > 0; i++ ) { if ( (aStr.GetChar( i ) >= '0') && (aStr.GetChar( i ) <= '9') ) break; @@ -169,22 +168,22 @@ static sal_Bool ImplNumericGetValue( const XubString& rStr, double& rValue, } // remove all unwanted charaters - for ( i=0; i < aStr1.Len(); ) + for (xub_StrLen i=0; i < aStr1.Len(); ) { if ( (aStr1.GetChar( i ) >= '0') && (aStr1.GetChar( i ) <= '9') ) i++; else aStr1.Erase( i, 1 ); } - for ( i=0; i < aStr2.Len(); ) + for (sal_Int32 i=0; i < aStr2.getLength(); ) { - if ( (aStr2.GetChar( i ) >= '0') && (aStr2.GetChar( i ) <= '9') ) - i++; + if ((aStr2[i] >= '0') && (aStr2[i] <= '9')) + ++i; else - aStr2.Erase( i, 1 ); + aStr2.remove(i, 1); } - if ( !aStr1.Len() && !aStr2.Len() ) + if ( !aStr1.Len() && !aStr2.getLength() ) return sal_False; if ( !aStr1.Len() ) @@ -193,22 +192,22 @@ static sal_Bool ImplNumericGetValue( const XubString& rStr, double& rValue, aStr1.Insert( '-', 0 ); // prune and round fraction - sal_Bool bRound = sal_False; - if ( aStr2.Len() > nDecDigits ) + bool bRound = false; + if (aStr2.getLength() > nDecDigits) { - if ( aStr2.GetChar( nDecDigits ) >= '5' ) - bRound = sal_True; - aStr2.Erase( nDecDigits ); + if (aStr2[nDecDigits] >= '5') + bRound = true; + string::truncateToLength(aStr2, nDecDigits); } - if ( aStr2.Len() < nDecDigits ) - aStr2.Expand( nDecDigits, '0' ); + if (aStr2.getLength() < nDecDigits) + string::padToLength(aStr2, nDecDigits, '0'); aStr = aStr1; - aStr += aStr2; + aStr += aStr2.makeStringAndClear(); // check range double nValue = rtl::OUString(aStr).toDouble(); - if ( bRound ) + if (bRound) { if ( !bNegative ) nValue++; @@ -950,12 +949,12 @@ namespace sal_Int32 nTextLen; nTextLen = rtl::OUString::valueOf(rFormatter.GetMin()).getLength(); - comphelper::string::padToLength(aBuf, nTextLen, '9'); + string::padToLength(aBuf, nTextLen, '9'); Size aMinTextSize = rSpinField.CalcMinimumSizeForText( rFormatter.CreateFieldText(aBuf.makeStringAndClear().toInt64())); nTextLen = rtl::OUString::valueOf(rFormatter.GetMax()).getLength(); - comphelper::string::padToLength(aBuf, nTextLen, '9'); + string::padToLength(aBuf, nTextLen, '9'); Size aMaxTextSize = rSpinField.CalcMinimumSizeForText( rFormatter.CreateFieldText(aBuf.makeStringAndClear().toInt64())); @@ -967,7 +966,7 @@ namespace if (nDigits) { sBuf.append('.'); - comphelper::string::padToLength(aBuf, aBuf.getLength() + nDigits, '9'); + string::padToLength(aBuf, aBuf.getLength() + nDigits, '9'); } aMaxTextSize = rSpinField.CalcMinimumSizeForText(sBuf.makeStringAndClear()); aRet.Width() = std::min(aRet.Width(), aMaxTextSize.Width()); diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index fa9fe0f71c9a..6e76c299b7bb 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -142,10 +142,9 @@ static sal_Bool ImplNumericGetValue( const XubString& rStr, BigInt& rValue, { XubString aStr = rStr; XubString aStr1; - XubString aStr2; + rtl::OUStringBuffer aStr2; sal_uInt16 nDecPos; sal_Bool bNegative = sal_False; - xub_StrLen i; // Reaktion auf leeren String if ( !rStr.Len() ) @@ -160,7 +159,7 @@ static sal_Bool ImplNumericGetValue( const XubString& rStr, BigInt& rValue, if ( nDecPos != STRING_NOTFOUND ) { aStr1 = aStr.Copy( 0, nDecPos ); - aStr2 = aStr.Copy( nDecPos+1 ); + aStr2.append(aStr.Copy(nDecPos+1)); } else aStr1 = aStr; @@ -172,7 +171,7 @@ static sal_Bool ImplNumericGetValue( const XubString& rStr, BigInt& rValue, bNegative = sal_True; if ( !bNegative ) { - for ( i=0; i < aStr.Len(); i++ ) + for (xub_StrLen i=0; i < aStr.Len(); i++ ) { if ( (aStr.GetChar( i ) >= '0') && (aStr.GetChar( i ) <= '9') ) break; @@ -189,7 +188,7 @@ static sal_Bool ImplNumericGetValue( const XubString& rStr, BigInt& rValue, if ( (nFormat == 3) || (nFormat == 6) || (nFormat == 7) || (nFormat == 10) ) { - for ( i = (sal_uInt16)(aStr.Len()-1); i > 0; i++ ) + for (xub_StrLen i = (sal_uInt16)(aStr.Len()-1); i > 0; i++ ) { if ( (aStr.GetChar( i ) >= '0') && (aStr.GetChar( i ) <= '9') ) break; @@ -209,22 +208,22 @@ static sal_Bool ImplNumericGetValue( const XubString& rStr, BigInt& rValue, } // Alle unerwuenschten Zeichen rauswerfen - for ( i=0; i < aStr1.Len(); ) + for (xub_StrLen i=0; i < aStr1.Len(); ) { if ( (aStr1.GetChar( i ) >= '0') && (aStr1.GetChar( i ) <= '9') ) i++; else aStr1.Erase( i, 1 ); } - for ( i=0; i < aStr2.Len(); ) + for (sal_Int32 i=0; i < aStr2.getLength();) { - if ( (aStr2.GetChar( i ) >= '0') && (aStr2.GetChar( i ) <= '9') ) - i++; + if ((aStr2[i] >= '0') && (aStr2[i] <= '9')) + ++i; else - aStr2.Erase( i, 1 ); + aStr2.remove(i, 1); } - if ( !aStr1.Len() && !aStr2.Len() ) + if (!aStr1.Len() && !aStr2.getLength()) return sal_False; if ( !aStr1.Len() ) @@ -233,18 +232,18 @@ static sal_Bool ImplNumericGetValue( const XubString& rStr, BigInt& rValue, aStr1.Insert( '-', 0 ); // Nachkommateil zurechtstutzen und dabei runden - sal_Bool bRound = sal_False; - if ( aStr2.Len() > nDecDigits ) + bool bRound = false; + if (aStr2.getLength() > nDecDigits) { - if ( aStr2.GetChar( nDecDigits ) >= '5' ) - bRound = sal_True; - aStr2.Erase( nDecDigits ); + if (aStr2[nDecDigits] >= '5') + bRound = true; + string::truncateToLength(aStr2, nDecDigits); } - if ( aStr2.Len() < nDecDigits ) - aStr2.Expand( nDecDigits, '0' ); + if (aStr2.getLength() < nDecDigits) + string::padToLength(aStr2, nDecDigits, '0'); aStr = aStr1; - aStr += aStr2; + aStr += aStr2.makeStringAndClear(); // Bereichsueberpruefung BigInt nValue( aStr ); |