diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2014-05-13 13:22:04 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2014-05-13 13:22:04 +0200 |
| commit | 3beaccc09dfedc560d171dbbf26f2592e046d903 (patch) | |
| tree | 916e8e9cc44feab522ce2ff771ff9adb923768e8 /basic | |
| parent | f492e45dd2fd1f0ef59f37cd0c3f125203831e98 (diff) | |
Revert "i#64348 basic: fix CDec() crash if string is empty"
This reverts commit 375b01bf747bb206c3fd6bad0acbd38271a8fb86.
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/sbx/sbxdec.cxx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx index f0cab347e512..59f5e015a737 100644 --- a/basic/source/sbx/sbxdec.cxx +++ b/basic/source/sbx/sbxdec.cxx @@ -194,8 +194,6 @@ void SbxDecimal::setUInt( unsigned int val ) bool SbxDecimal::setString( OUString* pOUString ) { - assert(pOUString); - static LCID nLANGID = MAKELANGID( LANG_ENGLISH, SUBLANG_ENGLISH_US ); // Convert delimiter @@ -473,11 +471,7 @@ start: case SbxLPSTR: case SbxSTRING: case SbxBYREF | SbxSTRING: - if( !p->pOUString ) - pnDecRes->setString( new OUString ); - else - pnDecRes->setString( p->pOUString ); - break; + pnDecRes->setString( p->pOUString ); break; case SbxOBJECT: { SbxValue* pVal = PTR_CAST(SbxValue,p->pObj); |