diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-02-27 09:45:35 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-02-27 09:45:58 +0000 |
| commit | 906e35f80a17d51c305e0db251e6224f5dd23d52 (patch) | |
| tree | eb1b62e54748e6fd62be8cab9dcf8735baa7f9e3 /sc/source/core/data/validat.cxx | |
| parent | 84fa063b4ce1bd6a8996c20c89e238ee38bcdcfe (diff) | |
merge GetString variants
Diffstat (limited to 'sc/source/core/data/validat.cxx')
| -rw-r--r-- | sc/source/core/data/validat.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 277ab9835587..a759385c31ae 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -212,7 +212,7 @@ sal_Bool ScValidationData::DoScript( const ScAddress& rPos, const String& rInput if ( bIsValue ) nValue = pCell->GetValue(); else - pCell->GetString( aValStr ); + aValStr = pCell->GetString(); } if ( bIsValue ) aParams[0] = ::com::sun::star::uno::makeAny( nValue ); @@ -334,7 +334,7 @@ sal_Bool ScValidationData::DoMacro( const ScAddress& rPos, const String& rInput, if ( bIsValue ) nValue = pCell->GetValue(); else - pCell->GetString( aValStr ); + aValStr = pCell->GetString(); } if ( bIsValue ) refPar->Get(1)->PutDouble( nValue ); @@ -478,11 +478,11 @@ sal_Bool ScValidationData::IsDataValid( ScBaseCell* pCell, const ScAddress& rPos nVal = ((ScValueCell*)pCell)->GetValue(); break; case CELLTYPE_STRING: - ((ScStringCell*)pCell)->GetString( aString ); + aString = ((ScStringCell*)pCell)->GetString(); bIsVal = false; break; case CELLTYPE_EDIT: - ((ScEditCell*)pCell)->GetString( aString ); + aString = ((ScEditCell*)pCell)->GetString(); bIsVal = false; break; case CELLTYPE_FORMULA: @@ -492,7 +492,7 @@ sal_Bool ScValidationData::IsDataValid( ScBaseCell* pCell, const ScAddress& rPos if ( bIsVal ) nVal = pFCell->GetValue(); else - pFCell->GetString( aString ); + aString = pFCell->GetString(); } break; default: // Notizen, Broadcaster @@ -654,8 +654,7 @@ bool ScValidationData::GetSelectionFromFormula( xMatRef->PutDouble( aValidationSrc.GetValue(), 0); else { - String aStr; - aValidationSrc.GetString( aStr); + String aStr = aValidationSrc.GetString(); xMatRef->PutString( aStr, 0); } |