diff options
author | Noel Grandin <noel@peralex.com> | 2014-02-05 10:41:04 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 15:31:40 +0000 |
commit | 15535e32ddcfee451d4dbc9be9de0b8c9f9d78d4 (patch) | |
tree | db4badc477cea1ecd51f5fab82ce0f24ae20f155 /dbaccess/source | |
parent | 7accbd8c0d7f1d0b87748f0de599c4d8b469a61e (diff) |
convert SvStream::operator>> methods to ReadXXX methods
First, I updated the clang rewriter to do the conversion.
Then I lightly hand-tweaked the output for the few places where
the rewriter messed up, mostly when dealing with calls on "this".
Change-Id: I40a6a977959cd97415c678eafc8507de8aa3b1a9
Reviewed-on: https://gerrit.libreoffice.org/7879
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'dbaccess/source')
-rw-r--r-- | dbaccess/source/ui/tabledesign/TEditControl.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/tabledesign/TableRow.cxx | 26 |
2 files changed, 14 insertions, 14 deletions
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index cfd9259a9b37..d4cd2274a7c0 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -812,7 +812,7 @@ void OTableEditorCtrl::InsertRows( long nRow ) OUString aFieldName; ::boost::shared_ptr<OTableRow> pRow; sal_Int32 nSize = 0; - (*aStreamRef) >> nSize; + (*aStreamRef).ReadInt32( nSize ); vInsertedUndoRedoRows.reserve(nSize); for(sal_Int32 i=0;i < nSize;++i) { diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx index a53f69f0660d..ca3e35b7ad51 100644 --- a/dbaccess/source/ui/tabledesign/TableRow.cxx +++ b/dbaccess/source/ui/tabledesign/TableRow.cxx @@ -138,9 +138,9 @@ namespace dbaui } SvStream& ReadOTableRow( SvStream& _rStr, OTableRow& _rRow ) { - _rStr >> _rRow.m_nPos; + _rStr.ReadInt32( _rRow.m_nPos ); sal_Int32 nValue = 0; - _rStr >> nValue; + _rStr.ReadInt32( nValue ); if ( nValue ) { OFieldDescription* pFieldDesc = new OFieldDescription(); @@ -153,14 +153,14 @@ namespace dbaui sValue = _rStr.ReadUniOrByteString(_rStr.GetStreamCharSet()); pFieldDesc->SetHelpText(sValue); - _rStr >> nValue; + _rStr.ReadInt32( nValue ); Any aControlDefault; switch ( nValue ) { case 1: { double nControlDefault; - _rStr >> nControlDefault; + _rStr.ReadDouble( nControlDefault ); aControlDefault <<= nControlDefault; break; } @@ -172,25 +172,25 @@ namespace dbaui pFieldDesc->SetControlDefault(aControlDefault); - _rStr >> nValue; + _rStr.ReadInt32( nValue ); pFieldDesc->SetTypeValue(nValue); - _rStr >> nValue; + _rStr.ReadInt32( nValue ); pFieldDesc->SetPrecision(nValue); - _rStr >> nValue; + _rStr.ReadInt32( nValue ); pFieldDesc->SetScale(nValue); - _rStr >> nValue; + _rStr.ReadInt32( nValue ); pFieldDesc->SetIsNullable(nValue); - _rStr >> nValue; + _rStr.ReadInt32( nValue ); pFieldDesc->SetFormatKey(nValue); - _rStr >> nValue; + _rStr.ReadInt32( nValue ); pFieldDesc->SetHorJustify((SvxCellHorJustify)nValue); - _rStr >> nValue; + _rStr.ReadInt32( nValue ); pFieldDesc->SetAutoIncrement(nValue != 0); - _rStr >> nValue; + _rStr.ReadInt32( nValue ); pFieldDesc->SetPrimaryKey(nValue != 0); - _rStr >> nValue; + _rStr.ReadInt32( nValue ); pFieldDesc->SetCurrency(nValue != 0); } return _rStr; |