diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-06-15 00:19:28 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-06-15 09:07:51 +0100 |
| commit | 057dda42e567c31de0d19bc418e9a248859693f6 (patch) | |
| tree | a44d0c2ddfbcaffd145b6ff18ee2c1be60c913f5 /tools | |
| parent | 998eb403d95a0b2e1ddd64f367c8cc6f8b22eba6 (diff) | |
throw out this ctor
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/inc/tools/bigint.hxx | 5 | ||||
| -rw-r--r-- | tools/source/generic/bigint.cxx | 48 |
2 files changed, 12 insertions, 41 deletions
diff --git a/tools/inc/tools/bigint.hxx b/tools/inc/tools/bigint.hxx index 41b0c0af3fdc..58810fffdd99 100644 --- a/tools/inc/tools/bigint.hxx +++ b/tools/inc/tools/bigint.hxx @@ -83,8 +83,7 @@ public: BigInt( sal_uInt16 nVal ); BigInt( sal_uInt32 nVal ); BigInt( const BigInt& rBigInt ); - BigInt( const ByteString& rString ); - BigInt( const UniString& rString ); + BigInt( const String& rString ); #ifdef _TLBIGINT_INT64 BigInt( const SbxINT64 &r ); BigInt( const SbxUINT64 &r ); @@ -98,7 +97,7 @@ public: operator sal_uIntPtr() const; void Set( sal_Bool bSet ) { bIsSet = bSet; } - UniString GetString() const; + String GetString() const; sal_Bool IsSet() const { return bIsSet; } sal_Bool IsNeg() const; diff --git a/tools/source/generic/bigint.cxx b/tools/source/generic/bigint.cxx index ae01e6e3393b..4392e56d5e44 100644 --- a/tools/source/generic/bigint.cxx +++ b/tools/source/generic/bigint.cxx @@ -525,35 +525,7 @@ BigInt::BigInt( const BigInt& rBigInt ) // ----------------------------------------------------------------------- -BigInt::BigInt( const ByteString& rString ) -{ - bIsSet = sal_True; - bIsNeg = sal_False; - bIsBig = sal_False; - nVal = 0; - - sal_Bool bNeg = sal_False; - const sal_Char* p = rString.GetBuffer(); - if ( *p == '-' ) - { - bNeg = sal_True; - p++; - } - while( *p >= '0' && *p <= '9' ) - { - *this *= 10; - *this += *p - '0'; - p++; - } - if ( bIsBig ) - bIsNeg = bNeg; - else if( bNeg ) - nVal = -nVal; -} - -// ----------------------------------------------------------------------- - -BigInt::BigInt( const UniString& rString ) +BigInt::BigInt( const String& rString ) { bIsSet = sal_True; bIsNeg = sal_False; @@ -686,12 +658,12 @@ BigInt::operator double() const // ----------------------------------------------------------------------- -UniString BigInt::GetString() const +String BigInt::GetString() const { - UniString aString; + String aString; if ( !bIsBig ) - aString = UniString::CreateFromInt32( nVal ); + aString = String::CreateFromInt32( nVal ); else { BigInt aTmp( *this ); @@ -704,23 +676,23 @@ UniString BigInt::GetString() const a %= a1000000000; aTmp /= a1000000000; - UniString aStr = aString; + String aStr = aString; if ( a.nVal < 100000000L ) { // leading 0s - aString = UniString::CreateFromInt32( a.nVal + 1000000000L ); + aString = String::CreateFromInt32( a.nVal + 1000000000L ); aString.Erase(0,1); } else - aString = UniString::CreateFromInt32( a.nVal ); + aString = String::CreateFromInt32( a.nVal ); aString += aStr; } while( aTmp.bIsBig ); - UniString aStr = aString; + String aStr = aString; if ( bIsNeg ) - aString = UniString::CreateFromInt32( -aTmp.nVal ); + aString = String::CreateFromInt32( -aTmp.nVal ); else - aString = UniString::CreateFromInt32( aTmp.nVal ); + aString = String::CreateFromInt32( aTmp.nVal ); aString += aStr; } |