mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init a few more stream-read svm elements

Browse Source 
Change-Id: I3dfa2485afbe66131b86764374d53181b55c2346
This commit is contained in:
Caolán McNamara
2014-04-02 09:33:03 +01:00
parent 6d20b453b6
commit 67c6ea0c42
2 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/source/generic/poly.cxx
View File

@@ -1520,7 +1520,7 @@ SvStream& ReadPolygon( SvStream& rIStream, Polygon& rPoly )
DBG_ASSERTWARNING( rIStream.GetVersion(), "Polygon::>> - Solar-Version not set on rIStream" ); DBG_ASSERTWARNING( rIStream.GetVersion(), "Polygon::>> - Solar-Version not set on rIStream" );
sal_uInt16 i; sal_uInt16 i;
sal_uInt16 nPoints; sal_uInt16 nPoints(0);
// read all points and create array // read all points and create array
rIStream.ReadUInt16( nPoints ); rIStream.ReadUInt16( nPoints );

77
vcl/source/gdi/metaact.cxx
View File

@@ -1001,7 +1001,7 @@ void MetaPolyLineAction::Read( SvStream& rIStm, ImplMetaReadData* )
ReadLineInfo( rIStm, maLineInfo ); ReadLineInfo( rIStm, maLineInfo );
if ( aCompat.GetVersion() >= 3 ) if ( aCompat.GetVersion() >= 3 )
{ {
sal_uInt8 bHasPolyFlags; sal_uInt8 bHasPolyFlags(0);
rIStm.ReadUChar( bHasPolyFlags ); rIStm.ReadUChar( bHasPolyFlags );
if ( bHasPolyFlags ) if ( bHasPolyFlags )
maPoly.Read( rIStm ); maPoly.Read( rIStm );
@@ -1183,10 +1183,11 @@ void MetaPolyPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* )
if ( aCompat.GetVersion() >= 2 ) // Version 2 if ( aCompat.GetVersion() >= 2 ) // Version 2
{ {
sal_uInt16 i, nIndex, nNumberOfComplexPolygons; sal_uInt16 nNumberOfComplexPolygons(0);
rIStm.ReadUInt16( nNumberOfComplexPolygons ); rIStm.ReadUInt16( nNumberOfComplexPolygons );
for ( i = 0; i < nNumberOfComplexPolygons; i++ ) for (sal_uInt16 i = 0; i < nNumberOfComplexPolygons; ++i)
{ {
sal_uInt16 nIndex(0);
rIStm.ReadUInt16( nIndex ); rIStm.ReadUInt16( nIndex );
Polygon aPoly; Polygon aPoly;
aPoly.Read( rIStm ); aPoly.Read( rIStm );
@@ -1271,11 +1272,12 @@ void MetaTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
COMPAT( rIStm ); COMPAT( rIStm );
ReadPair( rIStm, maPt ); ReadPair( rIStm, maPt );
maStr = rIStm.ReadUniOrByteString(pData->meActualCharSet); maStr = rIStm.ReadUniOrByteString(pData->meActualCharSet);
sal_uInt16 nTmp(0); sal_uInt16 nTmpIndex(0);
rIStm.ReadUInt16(nTmp); rIStm.ReadUInt16(nTmpIndex);
mnIndex = nTmp; mnIndex = nTmpIndex;
rIStm.ReadUInt16(nTmp); sal_uInt16 nTmpLen(0);
mnLen = nTmp; rIStm.ReadUInt16(nTmpLen);
mnLen = nTmpLen;
if ( aCompat.GetVersion() >= 2 ) // Version 2 if ( aCompat.GetVersion() >= 2 ) // Version 2
maStr = read_uInt16_lenPrefixed_uInt16s_ToOUString(rIStm); maStr = read_uInt16_lenPrefixed_uInt16s_ToOUString(rIStm);
@@ -1419,13 +1421,15 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
COMPAT( rIStm ); COMPAT( rIStm );
ReadPair( rIStm, maStartPt ); ReadPair( rIStm, maStartPt );
maStr = rIStm.ReadUniOrByteString(pData->meActualCharSet); maStr = rIStm.ReadUniOrByteString(pData->meActualCharSet);
sal_uInt16 nTmp(0); sal_uInt16 nTmpIndex(0);
rIStm.ReadUInt16(nTmp); rIStm.ReadUInt16(nTmpIndex);
mnIndex = nTmp; mnIndex = nTmpIndex;
rIStm.ReadUInt16(nTmp); sal_uInt16 nTmpLen(0);
mnLen = nTmp; rIStm.ReadUInt16(nTmpLen);
rIStm.ReadUInt16(nTmp); mnLen = nTmpLen;
nAryLen = nTmp; sal_uInt16 nTmpAryLen(0);
rIStm.ReadUInt16(nTmpAryLen);
nAryLen = nTmpAryLen;
if ( mnIndex + mnLen > maStr.getLength() ) if ( mnIndex + mnLen > maStr.getLength() )
{ {
@@ -1554,11 +1558,12 @@ void MetaStretchTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
ReadPair( rIStm, maPt ); ReadPair( rIStm, maPt );
maStr = rIStm.ReadUniOrByteString(pData->meActualCharSet); maStr = rIStm.ReadUniOrByteString(pData->meActualCharSet);
rIStm.ReadUInt32( mnWidth ); rIStm.ReadUInt32( mnWidth );
sal_uInt16 nTmp(0); sal_uInt16 nTmpIndex(0);
rIStm.ReadUInt16(nTmp); rIStm.ReadUInt16(nTmpIndex);
mnIndex = nTmp; mnIndex = nTmpIndex;
rIStm.ReadUInt16(nTmp); sal_uInt16 nTmpLen(0);
mnLen = nTmp; rIStm.ReadUInt16(nTmpLen);
mnLen = nTmpLen;
if ( aCompat.GetVersion() >= 2 ) // Version 2 if ( aCompat.GetVersion() >= 2 ) // Version 2
maStr = read_uInt16_lenPrefixed_uInt16s_ToOUString(rIStm); maStr = read_uInt16_lenPrefixed_uInt16s_ToOUString(rIStm);
@@ -1726,18 +1731,20 @@ void MetaTextLineAction::Read( SvStream& rIStm, ImplMetaReadData* )
COMPAT( rIStm ); COMPAT( rIStm );
//#fdo39428 SvStream no longer supports operator>>(long&) //#fdo39428 SvStream no longer supports operator>>(long&)
sal_uInt32 nTemp; sal_Int32 nTempWidth(0);
sal_Int32 nTemp2;
ReadPair( rIStm, maPos ); ReadPair( rIStm, maPos );
rIStm.ReadInt32( nTemp2 ); rIStm.ReadInt32( nTempWidth );
mnWidth = nTemp2; mnWidth = nTempWidth;
rIStm.ReadUInt32( nTemp ); sal_uInt32 nTempStrikeout(0);
meStrikeout = (FontStrikeout)nTemp; rIStm.ReadUInt32( nTempStrikeout );
rIStm.ReadUInt32( nTemp ); meStrikeout = (FontStrikeout)nTempStrikeout;
meUnderline = (FontUnderline)nTemp; sal_uInt32 nTempUnderline(0);
rIStm.ReadUInt32( nTempUnderline );
meUnderline = (FontUnderline)nTempUnderline;
if ( aCompat.GetVersion() >= 2 ) { if ( aCompat.GetVersion() >= 2 ) {
rIStm.ReadUInt32( nTemp ); sal_uInt32 nTempUnderline2(0);
meUnderline = (FontUnderline)nTemp; rIStm.ReadUInt32(nTempUnderline2);
meUnderline = (FontUnderline)nTempUnderline2;
} }
} }
@@ -3432,7 +3439,7 @@ void MetaTextAlignAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
void MetaTextAlignAction::Read( SvStream& rIStm, ImplMetaReadData* ) void MetaTextAlignAction::Read( SvStream& rIStm, ImplMetaReadData* )
{ {
sal_uInt16 nTmp16; sal_uInt16 nTmp16(0);
COMPAT( rIStm ); COMPAT( rIStm );
rIStm.ReadUInt16( nTmp16 ); maAlign = (TextAlign) nTmp16; rIStm.ReadUInt16( nTmp16 ); maAlign = (TextAlign) nTmp16;
@@ -3707,7 +3714,7 @@ void MetaRasterOpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
void MetaRasterOpAction::Read( SvStream& rIStm, ImplMetaReadData* ) void MetaRasterOpAction::Read( SvStream& rIStm, ImplMetaReadData* )
{ {
sal_uInt16 nTmp16; sal_uInt16 nTmp16(0);
COMPAT( rIStm ); COMPAT( rIStm );
rIStm.ReadUInt16( nTmp16 ); meRasterOp = (RasterOp) nTmp16; rIStm.ReadUInt16( nTmp16 ); meRasterOp = (RasterOp) nTmp16;
@@ -4180,9 +4187,9 @@ void MetaCommentAction::Scale( double fXScale, double fYScale )
SvMemoryStream aMemStm( (void*)mpData, mnDataSize, STREAM_READ ); SvMemoryStream aMemStm( (void*)mpData, mnDataSize, STREAM_READ );
SvMemoryStream aDest; SvMemoryStream aDest;
sal_Int32 nLeft, nRight, nTop, nBottom; sal_Int32 nLeft(0), nRight(0), nTop(0), nBottom(0);
sal_Int32 nPixX, nPixY, nMillX, nMillY; sal_Int32 nPixX(0), nPixY(0), nMillX(0), nMillY(0);
float m11, m12, m21, m22, mdx, mdy; float m11(0), m12(0), m21(0), m22(0), mdx(0), mdy(0);
// read data // read data
aMemStm.ReadInt32( nLeft ).ReadInt32( nTop ).ReadInt32( nRight ).ReadInt32( nBottom ); aMemStm.ReadInt32( nLeft ).ReadInt32( nTop ).ReadInt32( nRight ).ReadInt32( nBottom );