diff options
-rw-r--r-- | basic/source/sbx/sbxvalue.cxx | 1 | ||||
-rw-r--r-- | editeng/source/items/bulitem.cxx | 2 | ||||
-rw-r--r-- | editeng/source/items/frmitems.cxx | 2 | ||||
-rw-r--r-- | svl/source/items/cintitem.cxx | 2 | ||||
-rw-r--r-- | svl/source/items/slstitm.cxx | 2 | ||||
-rw-r--r-- | svtools/source/graphic/grfattr.cxx | 2 | ||||
-rw-r--r-- | tools/source/generic/fract.cxx | 2 | ||||
-rw-r--r-- | tools/source/generic/gen.cxx | 1 | ||||
-rw-r--r-- | tools/source/generic/poly.cxx | 1 | ||||
-rw-r--r-- | vcl/source/filter/wmf/winwmf.cxx | 1 | ||||
-rw-r--r-- | vcl/source/gdi/cvtsvm.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/hatch.cxx | 1 | ||||
-rw-r--r-- | vcl/source/gdi/impgraph.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/lineinfo.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/metaact.cxx | 4 |
15 files changed, 0 insertions, 27 deletions
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index d7e536933d0d..3dad7683bbe4 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -1446,7 +1446,6 @@ bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) } break; } - //#fdo39428 SvStream no longer supports operator>>(long&) case SbxSALINT64: r.ReadInt64(aData.nInt64); break; diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index 1ab78a7bec62..f04f35a70f0d 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -86,7 +86,6 @@ vcl::Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer ) if( nVer == 1 ) { - //#fdo39428 SvStream no longer supports operator>>(long&) sal_Int32 nHeight(0), nWidth(0); rStream.ReadInt32( nHeight ); rStream.ReadInt32( nWidth ); Size aSize( nWidth, nHeight ); aFont.SetSize( aSize ); @@ -145,7 +144,6 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich ) pGraphicObject = new GraphicObject( aBmp ); } - //#fdo39428 SvStream no longer supports operator>>(long&) sal_Int32 nTmp(0); rStrm.ReadInt32( nTmp ); nWidth = nTmp; rStrm.ReadUInt16( nStart ); diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index a66570758304..6c7b3cc55b7b 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -358,7 +358,6 @@ bool SvxSizeItem::GetPresentation SvStream& SvxSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - //#fdo39428 SvStream no longer supports operator<<(long) rStrm.WriteInt32( aSize.Width() ); rStrm.WriteInt32( aSize.Height() ); return rStrm; @@ -384,7 +383,6 @@ bool SvxSizeItem::HasMetrics() const SfxPoolItem* SvxSizeItem::Create( SvStream& rStrm, sal_uInt16 ) const { - //#fdo39428 SvStream no longer supports operator>>(long&) sal_Int32 nWidth(0), nHeight(0); rStrm.ReadInt32( nWidth ).ReadInt32( nHeight ); diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx index dec43629472c..1b08883275cb 100644 --- a/svl/source/items/cintitem.cxx +++ b/svl/source/items/cintitem.cxx @@ -222,7 +222,6 @@ CntInt32Item::CntInt32Item(sal_uInt16 which, SvStream & rStream) : SfxPoolItem(which) , m_nValue(0) { - //fdo#39428 SvStream no longer supports operator>>(long&) rStream.ReadInt32( m_nValue ); } @@ -288,7 +287,6 @@ SfxPoolItem * CntInt32Item::Create(SvStream & rStream, sal_uInt16) const // virtual SvStream & CntInt32Item::Store(SvStream &rStream, sal_uInt16) const { - //fdo#39428 SvStream no longer supports operator<<(long) rStream.WriteInt32( m_nValue ); return rStream; } diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index 9459313b8948..5fd9450be63c 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -70,7 +70,6 @@ SfxStringListItem::SfxStringListItem( sal_uInt16 which, SvStream& rStream ) : SfxPoolItem( which ), pImp(NULL) { - //fdo#39428 SvStream no longer supports operator>>(long&) sal_Int32 nEntryCount; rStream.ReadInt32( nEntryCount ); @@ -173,7 +172,6 @@ SvStream& SfxStringListItem::Store( SvStream & rStream, sal_uInt16 ) const { if( !pImp ) { - //fdo#39428 SvStream no longer supports operator<<(long) rStream.WriteInt32( (sal_Int32) 0 ); return rStream; } diff --git a/svtools/source/graphic/grfattr.cxx b/svtools/source/graphic/grfattr.cxx index a24042708046..d3f7beb11174 100644 --- a/svtools/source/graphic/grfattr.cxx +++ b/svtools/source/graphic/grfattr.cxx @@ -86,7 +86,6 @@ SvStream& ReadGraphicAttr( SvStream& rIStm, GraphicAttr& rAttr ) if( aCompat.GetVersion() >= 2 ) { - //#fdo39428 SvStream no longer supports operator>>(long&) sal_Int32 nTmpL(0), nTmpT(0), nTmpR(0), nTmpB(0); rIStm.ReadInt32( nTmpL ).ReadInt32( nTmpT ).ReadInt32( nTmpR ).ReadInt32( nTmpB ); rAttr.mnLeftCrop = nTmpL; @@ -110,7 +109,6 @@ SvStream& WriteGraphicAttr( SvStream& rOStm, const GraphicAttr& rAttr ) rOStm.WriteUInt32( rAttr.mnMirrFlags ).WriteUInt16( rAttr.mnRotate10 ); rOStm.WriteInt16( rAttr.mnContPercent ).WriteInt16( rAttr.mnLumPercent ).WriteInt16( rAttr.mnRPercent ).WriteInt16( rAttr.mnGPercent ).WriteInt16( rAttr.mnBPercent ); rOStm.WriteUChar( rAttr.mbInvert ).WriteUChar( rAttr.mcTransparency ).WriteUInt16( (sal_uInt16) rAttr.meDrawMode ); - //#fdo39428 SvStream no longer supports operator<<(long) rOStm.WriteInt32( rAttr.mnLeftCrop ) .WriteInt32( rAttr.mnTopCrop ) .WriteInt32( rAttr.mnRightCrop ) diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx index cfc68b12a583..198a42aa2639 100644 --- a/tools/source/generic/fract.cxx +++ b/tools/source/generic/fract.cxx @@ -486,7 +486,6 @@ bool operator > ( const Fraction& rVal1, const Fraction& rVal2 ) SvStream& ReadFraction( SvStream& rIStream, Fraction& rFract ) { - //fdo#39428 SvStream no longer supports operator>>(long&) sal_Int32 nTmp(0); rIStream.ReadInt32( nTmp ); rFract.nNumerator = nTmp; @@ -497,7 +496,6 @@ SvStream& ReadFraction( SvStream& rIStream, Fraction& rFract ) SvStream& WriteFraction( SvStream& rOStream, const Fraction& rFract ) { - //fdo#39428 SvStream no longer supports operator<<(long) rOStream.WriteInt32( rFract.nNumerator ); rOStream.WriteInt32( rFract.nDenominator ); return rOStream; diff --git a/tools/source/generic/gen.cxx b/tools/source/generic/gen.cxx index 23eb1f59ef2e..cc64f8fb3465 100644 --- a/tools/source/generic/gen.cxx +++ b/tools/source/generic/gen.cxx @@ -25,7 +25,6 @@ SvStream& ReadPair( SvStream& rIStream, Pair& rPair ) { DBG_ASSERTWARNING( rIStream.GetVersion(), "Pair::>> - Solar-Version not set on rIStream" ); - //39428 SvStream no longer supports operator>>(long&) sal_Int32 nTmpA(0), nTmpB(0); rIStream.ReadInt32( nTmpA ).ReadInt32( nTmpB ); rPair.nA = nTmpA; diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx index c31f13c41c47..ce9aa918b89d 100644 --- a/tools/source/generic/poly.cxx +++ b/tools/source/generic/poly.cxx @@ -1559,7 +1559,6 @@ SvStream& ReadPolygon( SvStream& rIStream, Polygon& rPoly ) { for( i = 0; i < nPoints; i++ ) { - //fdo#39428 SvStream no longer supports operator>>(long&) sal_Int32 nTmpX(0), nTmpY(0); rIStream.ReadInt32( nTmpX ).ReadInt32( nTmpY ); rPoly.mpImplPolygon->mpPointAry[i].X() = nTmpX; diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx index 41e652d84fbe..821e50b2a1fd 100644 --- a/vcl/source/filter/wmf/winwmf.cxx +++ b/vcl/source/filter/wmf/winwmf.cxx @@ -982,7 +982,6 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) SvMemoryStream aMemoryStream( nEscLen ); aMemoryStream.Write( pData.get(), nEscLen ); aMemoryStream.Seek( STREAM_SEEK_TO_BEGIN ); - //#fdo39428 SvStream no longer supports operator>>(long&) sal_Int32 nTmpX(0), nTmpY(0); aMemoryStream.ReadInt32( nTmpX ) .ReadInt32( nTmpY ) diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index b9128669fd93..e3dc7dc1aec3 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -456,7 +456,6 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) rIStm.Read( (char*) &aCode, sizeof( aCode ) ); // Identifier rIStm.ReadInt16( nSize ); // Size rIStm.ReadInt16( nVersion ); // Version - //#fdo39428 SvStream no longer supports operator>>(long&) sal_Int32 nTmp32(0); rIStm.ReadInt32( nTmp32 ); aPrefSz.Width() = nTmp32; // PrefSize.Width() @@ -1261,7 +1260,6 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) case( GDI_TEXTLINE_COMMENT ): { Point aStartPt; - //#fdo39428 SvStream no longer supports operator>>(long&) sal_Int32 nWidth; sal_uInt32 nStrikeout; sal_uInt32 nUnderline; diff --git a/vcl/source/gdi/hatch.cxx b/vcl/source/gdi/hatch.cxx index c2db96d839c5..baa669d44030 100644 --- a/vcl/source/gdi/hatch.cxx +++ b/vcl/source/gdi/hatch.cxx @@ -125,7 +125,6 @@ SvStream& ReadImplHatch( SvStream& rIStm, ImplHatch& rImplHatch ) sal_Int32 nTmp32(0); rIStm.ReadUInt16( nTmp16 ); rImplHatch.meStyle = (HatchStyle) nTmp16; - //#fdo39428 SvStream no longer supports operator>>(long&) ReadColor( rIStm, rImplHatch.maColor ).ReadInt32( nTmp32 ).ReadUInt16( rImplHatch.mnAngle ); rImplHatch.mnDistance = nTmp32; diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index dc8b5802439d..bdae727e9ec2 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -976,7 +976,6 @@ bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, bool bSwap ) const sal_uLong nStartPos = rIStm.Tell(); sal_uInt32 nId; sal_uLong nHeaderLen; - //#fdo39428 SvStream no longer supports operator>>(long&) sal_Int32 nType; sal_Int32 nLen; const sal_uInt16 nOldFormat = rIStm.GetNumberFormatInt(); @@ -1012,7 +1011,6 @@ bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, bool bSwap ) else { // read old style header - //#fdo39428 SvStream no longer supports operator>>(long&) sal_Int32 nWidth, nHeight; sal_Int32 nMapMode, nScaleNumX, nScaleDenomX; sal_Int32 nScaleNumY, nScaleDenomY, nOffsX, nOffsY; diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx index 5bc5d0b32b81..74158ad80507 100644 --- a/vcl/source/gdi/lineinfo.cxx +++ b/vcl/source/gdi/lineinfo.cxx @@ -194,7 +194,6 @@ SvStream& ReadImplLineInfo( SvStream& rIStm, ImplLineInfo& rImplLineInfo ) sal_uInt16 nTmp16(0); sal_Int32 nTmp32(0); - //#fdo39428 SvStream no longer supports operator>>(long&) rIStm.ReadUInt16( nTmp16 ); rImplLineInfo.meStyle = (LineStyle) nTmp16; rIStm.ReadInt32( nTmp32 ); rImplLineInfo.mnWidth = nTmp32; @@ -229,7 +228,6 @@ SvStream& WriteImplLineInfo( SvStream& rOStm, const ImplLineInfo& rImplLineInfo { VersionCompat aCompat( rOStm, STREAM_WRITE, 4 ); - //#fdo39428 SvStream no longer supports operator<<(long) // version 1 rOStm.WriteUInt16( (sal_uInt16) rImplLineInfo.meStyle ).WriteInt32( rImplLineInfo.mnWidth ); diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index b23f2adedc43..3715034b0a2a 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -1545,7 +1545,6 @@ void MetaTextLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) MetaAction::Write(rOStm, pData); VersionCompat aCompat(rOStm, STREAM_WRITE, 2); - //#fdo39428 SvStream no longer supports operator<<(long) WritePair( rOStm, maPos ); rOStm.WriteInt32( mnWidth ); rOStm.WriteUInt32( meStrikeout ); @@ -1558,7 +1557,6 @@ void MetaTextLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) { VersionCompat aCompat(rIStm, STREAM_READ); - //#fdo39428 SvStream no longer supports operator>>(long&) sal_Int32 nTempWidth(0); ReadPair( rIStm, maPos ); rIStm.ReadInt32( nTempWidth ); @@ -2643,14 +2641,12 @@ void MetaMoveClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData { MetaAction::Write(rOStm, pData); VersionCompat aCompat(rOStm, STREAM_WRITE, 1); - //#fdo39428 SvStream no longer supports operator<<(long) rOStm.WriteInt32( mnHorzMove ).WriteInt32( mnVertMove ); } void MetaMoveClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) { VersionCompat aCompat(rIStm, STREAM_READ); - //#fdo39428 SvStream no longer supports operator>>(long&) sal_Int32 nTmpHM(0), nTmpVM(0); rIStm.ReadInt32( nTmpHM ).ReadInt32( nTmpVM ); mnHorzMove = nTmpHM; |