diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-06 08:50:03 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-06 09:52:42 +0000 |
| commit | 2d3203b2db5b44592e70e52c9927324b65a45e06 (patch) | |
| tree | a175859b1be2a2ee2ca598a6b8a9f34c25ea40f2 /dbaccess | |
| parent | 0100280a5c5b121fab2aa932092a7a887bbb507c (diff) | |
make ReadUniOrByteString return a string
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/tabledesign/TableRow.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx index 35be52c28521..2ed54512ebe4 100644 --- a/dbaccess/source/ui/tabledesign/TableRow.cxx +++ b/dbaccess/source/ui/tabledesign/TableRow.cxx @@ -169,13 +169,12 @@ namespace dbaui { OFieldDescription* pFieldDesc = new OFieldDescription(); _rRow.m_pActFieldDescr = pFieldDesc; - String sValue; - _rStr.ReadUniOrByteString(sValue, _rStr.GetStreamCharSet()); + String sValue = _rStr.ReadUniOrByteString(_rStr.GetStreamCharSet()); pFieldDesc->SetName(sValue); - _rStr.ReadUniOrByteString(sValue, _rStr.GetStreamCharSet()); + sValue = _rStr.ReadUniOrByteString(_rStr.GetStreamCharSet()); pFieldDesc->SetDescription(sValue); - _rStr.ReadUniOrByteString(sValue, _rStr.GetStreamCharSet()); + sValue = _rStr.ReadUniOrByteString(_rStr.GetStreamCharSet()); pFieldDesc->SetHelpText(sValue); _rStr >> nValue; @@ -190,7 +189,7 @@ namespace dbaui break; } case 2: - _rStr.ReadUniOrByteString(sValue, _rStr.GetStreamCharSet()); + sValue = _rStr.ReadUniOrByteString(_rStr.GetStreamCharSet()); aControlDefault <<= ::rtl::OUString(sValue); break; } |