Attachment #34340 for issue #62227

View | Details | Raw Unified | Return to issue 62227
Collapse All | Expand All




			if( ZCOMPRESS == aHeader.nCompression )
			{
				ZCodec	aCodec;
				sal_uInt32 nCodedSize, nUncodedSize;
				sal_uInt32 nCodedPos;

				// read coding information
				rIStm >> nCodedSize >> nUncodedSize >> aHeader.nCompression;

	DIBInfoHeader	aHeader;
	ULONG			nImageSizePos;
	ULONG			nEndPos;
	sal_uInt32		nCompression = 0;
	BOOL			bRet = FALSE;

	aHeader.nSize = DIBINFOHEADERSIZE;

		ZCodec			aCodec;
		SvMemoryStream	aMemStm( aHeader.nSizeImage + 4096, 65535 );
		ULONG			nCodedPos = rOStm.Tell(), nLastPos;
		sal_uInt32		nCodedSize, nUncodedSize;

		// write uncoded data palette
		if( aHeader.nColsUsed )




				case( GDI_TEXTLINE_COMMENT ):
				{
					Point	aStartPt;
					sal_Int32 	nWidth;
					sal_uInt32	nStrikeout;
					sal_uInt32	nUnderline;
					INT32	nFollowingActionCount;

					rIStm >> aStartPt >> nWidth >> nStrikeout >> nUnderline >> nFollowingActionCount;

				case( GDI_COMMENT_COMMENT ):
				{
					ByteString	aComment;
					sal_Int32	nValue;
					sal_uInt32	nDataSize;
					BYTE*		pData;
					INT32		nFollowingActionCount;


				rOStm.SeekRel( 4 );

				// write data
				rOStm << rStartPt << nWidth << 
					static_cast<sal_Int32>(eStrikeout) << static_cast<sal_uInt32>(eUnderline);
				rOStm << (INT32) 0; // number of actions that follow this comment

				// calculate and write ActionSize of comment

			case( META_COMMENT_ACTION ):
			{
				const MetaCommentAction*	pA = (MetaCommentAction*) pAction;
				const sal_uInt32			nDataSize = pA->GetDataSize();
				ULONG						nOldPos, nNewPos;

				// write RefPoint comment

Lines 331-337 Link Here

(-)vcl.api/source/gdi/gfxlink.cxx (-4 / +6 lines)
331	VersionCompat* pCompat = new VersionCompat( rOStream, STREAM_WRITE, 2 );	331	VersionCompat* pCompat = new VersionCompat( rOStream, STREAM_WRITE, 2 );
332		332
333	// Version 1	333	// Version 1
334	rOStream << (UINT16) rGfxLink.GetType() << rGfxLink.GetDataSize() << rGfxLink.GetUserId();	334	rOStream << static_cast<sal_uInt16>(rGfxLink.GetType()) <<
		335	static_cast<sal_uInt32>(rGfxLink.GetDataSize()) <<
		336	static_cast<sal_uInt32>(rGfxLink.GetUserId());
335		337
336	// Version 2	338	// Version 2
337	rOStream << rGfxLink.GetPrefSize() << rGfxLink.GetPrefMapMode();	339	rOStream << rGfxLink.GetPrefSize() << rGfxLink.GetPrefMapMode();
Lines 355-363 Link Here
355	{	357	{
356	Size aSize;	358	Size aSize;
357	MapMode aMapMode;	359	MapMode aMapMode;
358	ULONG nSize;	360	sal_uInt32 nSize;
359	ULONG nUserId;	361	sal_uInt32 nUserId;
360	UINT16 nType;	362	sal_uInt16 nType;
361	BYTE* pBuf;	363	BYTE* pBuf;
362	bool bMapAndSizeValid( false );	364	bool bMapAndSizeValid( false );
363	VersionCompat* pCompat = new VersionCompat( rIStream, STREAM_READ );	365	VersionCompat* pCompat = new VersionCompat( rIStream, STREAM_READ );

Lines 904-910 Link Here

(-)vcl.api/source/gdi/impgraph.cxx (-2 / +2 lines)
904	MapMode aMapMode;	904	MapMode aMapMode;
905	Size aSize;	905	Size aSize;
906	const ULONG nStartPos = rIStm.Tell();	906	const ULONG nStartPos = rIStm.Tell();
907	ULONG nId;	907	sal_uInt32 nId;
908	ULONG nHeaderLen;	908	ULONG nHeaderLen;
909	long nType;	909	long nType;
910	long nLen;	910	long nLen;
Lines 1486-1492 Link Here
1486	if( !rIStm.GetError() )	1486	if( !rIStm.GetError() )
1487	{	1487	{
1488	const ULONG nStmPos1 = rIStm.Tell();	1488	const ULONG nStmPos1 = rIStm.Tell();
1489	ULONG nTmp;	1489	sal_uInt32 nTmp;
1490		1490
1491	if ( !rImpGraphic.mbSwapUnderway )	1491	if ( !rImpGraphic.mbSwapUnderway )
1492	rImpGraphic.ImplClear();	1492	rImpGraphic.ImplClear();

Lines 627-633 Link Here

(-)vcl.api/source/gdi/metaact.cxx (-17 / +32 lines)
627	void MetaRoundRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )	627	void MetaRoundRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
628	{	628	{
629	WRITE_BASE_COMPAT( rOStm, 1, pData );	629	WRITE_BASE_COMPAT( rOStm, 1, pData );
630	rOStm << maRect << mnHorzRound << mnVertRound;	630	rOStm << maRect << static_cast<sal_uInt32>(mnHorzRound) << static_cast<sal_uInt32>(mnVertRound);
631	}	631	}
632		632
633	// ------------------------------------------------------------------------	633	// ------------------------------------------------------------------------
Lines 635-641 Link Here
635	void MetaRoundRectAction::Read( SvStream& rIStm, ImplMetaReadData* )	635	void MetaRoundRectAction::Read( SvStream& rIStm, ImplMetaReadData* )
636	{	636	{
637	COMPAT( rIStm );	637	COMPAT( rIStm );
638	rIStm >> maRect >> mnHorzRound >> mnVertRound;	638	rIStm >> maRect;
		639	sal_uInt32 n32Temp;
		640	rIStm >> n32Temp;
		641	mnHorzRound = n32Temp;
		642	rIStm >> n32Temp;
		643	mnVertRound = n32Temp;
639	}	644	}
640		645
641	// ========================================================================	646	// ========================================================================
Lines 1426-1432 Link Here
1426		1431
1427	void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )	1432	void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
1428	{	1433	{
1429	const ULONG nAryLen = mpDXAry ? mnLen : 0;	1434	const sal_uInt32 nAryLen = mpDXAry ? mnLen : 0;
1430		1435
1431	WRITE_BASE_COMPAT( rOStm, 2, pData );	1436	WRITE_BASE_COMPAT( rOStm, 2, pData );
1432	rOStm << maStartPt;	1437	rOStm << maStartPt;
Lines 1435-1441 Link Here
1435	rOStm << mnLen;	1440	rOStm << mnLen;
1436	rOStm << nAryLen;	1441	rOStm << nAryLen;
1437		1442
1438	for( ULONG i = 0UL; i < nAryLen; i++ )	1443	for( sal_uInt32 i = 0; i < nAryLen; i++ )
1439	rOStm << mpDXAry[ i ];	1444	rOStm << mpDXAry[ i ];
1440		1445
1441	sal_uInt16 j, nLen = maStr.Len(); // version 2	1446	sal_uInt16 j, nLen = maStr.Len(); // version 2
Lines 1451-1457 Link Here
1451		1456
1452	void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData )	1457	void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
1453	{	1458	{
1454	ULONG nAryLen;	1459	sal_uInt32 nAryLen;
1455		1460
1456	delete[] mpDXAry;	1461	delete[] mpDXAry;
1457		1462
Lines 1465-1475 Link Here
1465	if( nAryLen )	1470	if( nAryLen )
1466	{	1471	{
1467	// #i9762#, #106172# Ensure that DX array is at least mnLen entries long	1472	// #i9762#, #106172# Ensure that DX array is at least mnLen entries long
1468	const ULONG nIntAryLen( Max(nAryLen, static_cast<ULONG>(mnLen)) );	1473	const sal_uInt32 nIntAryLen( Max(nAryLen, static_cast<sal_uInt32>(mnLen)) );
1469	mpDXAry = new sal_Int32[ nIntAryLen ];	1474	mpDXAry = new sal_Int32[ nIntAryLen ];
1470		1475
1471	ULONG i;	1476	sal_uInt32 i;
1472	for( i = 0UL; i < nAryLen; i++ )	1477	for( i = 0; i < nAryLen; i++ )
1473	rIStm >> mpDXAry[ i ];	1478	rIStm >> mpDXAry[ i ];
1474		1479
1475	// #106172# setup remainder	1480	// #106172# setup remainder
Lines 1556-1562 Link Here
1556	WRITE_BASE_COMPAT( rOStm, 2, pData );	1561	WRITE_BASE_COMPAT( rOStm, 2, pData );
1557	rOStm << maPt;	1562	rOStm << maPt;
1558	rOStm.WriteByteString( maStr, pData->meActualCharSet );	1563	rOStm.WriteByteString( maStr, pData->meActualCharSet );
1559	rOStm << mnWidth;	1564	rOStm << static_cast<sal_uInt32>(mnWidth);
1560	rOStm << mnIndex;	1565	rOStm << mnIndex;
1561	rOStm << mnLen;	1566	rOStm << mnLen;
1562		1567
Lines 1576-1582 Link Here
1576	COMPAT( rIStm );	1581	COMPAT( rIStm );
1577	rIStm >> maPt;	1582	rIStm >> maPt;
1578	rIStm.ReadByteString( maStr, pData->meActualCharSet );	1583	rIStm.ReadByteString( maStr, pData->meActualCharSet );
1579	rIStm >> mnWidth;	1584	sal_uInt32 n32Temp;
		1585	rIStm >> n32Temp;
		1586	mnWidth = n32Temp;
1580	rIStm >> mnIndex;	1587	rIStm >> mnIndex;
1581	rIStm >> mnLen;	1588	rIStm >> mnLen;
1582		1589
Lines 1747-1754 Link Here
1747		1754
1748	rOStm << maPos;	1755	rOStm << maPos;
1749	rOStm << mnWidth;	1756	rOStm << mnWidth;
1750	rOStm << (ULONG)meStrikeout;	1757	rOStm << static_cast<sal_uInt32>(meStrikeout);
1751	rOStm << (ULONG)meUnderline;	1758	rOStm << static_cast<sal_uInt32>(meUnderline);
1752	}	1759	}
1753		1760
1754	// ------------------------------------------------------------------------	1761	// ------------------------------------------------------------------------
Lines 1757-1763 Link Here
1757	{	1764	{
1758	COMPAT( rIStm );	1765	COMPAT( rIStm );
1759		1766
1760	ULONG nTemp;	1767	sal_uInt32 nTemp;
1761	rIStm >> maPos;	1768	rIStm >> maPos;
1762	rIStm >> mnWidth;	1769	rIStm >> mnWidth;
1763	rIStm >> nTemp;	1770	rIStm >> nTemp;
Lines 3978-3984 Link Here
3978	void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )	3985	void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
3979	{	3986	{
3980	WRITE_BASE_COMPAT( rOStm, 1, pData );	3987	WRITE_BASE_COMPAT( rOStm, 1, pData );
3981	rOStm << maComment << mnValue << mnDataSize;	3988	rOStm << maComment << static_cast<sal_Int32>(mnValue) << static_cast<sal_uInt32>(mnDataSize);
3982		3989
3983	if ( mnDataSize )	3990	if ( mnDataSize )
3984	rOStm.Write( mpData, mnDataSize );	3991	rOStm.Write( mpData, mnDataSize );
Lines 3989-3995 Link Here
3989	void MetaCommentAction::Read( SvStream& rIStm, ImplMetaReadData* )	3996	void MetaCommentAction::Read( SvStream& rIStm, ImplMetaReadData* )
3990	{	3997	{
3991	COMPAT( rIStm );	3998	COMPAT( rIStm );
3992	rIStm >> maComment >> mnValue >> mnDataSize;	3999	rIStm >> maComment;
		4000	sal_Int32 ns32Temp;
		4001	rIStm >> ns32Temp;
		4002	mnValue = ns32Temp;
		4003	sal_uInt32 n32Temp;
		4004	rIStm >> n32Temp;
		4005	mnDataSize = n32Temp;
3993		4006
3994	if( mpData )	4007	if( mpData )
3995	delete[] mpData;	4008	delete[] mpData;
Lines 4043-4049 Link Here
4043	void MetaLayoutModeAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )	4056	void MetaLayoutModeAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
4044	{	4057	{
4045	WRITE_BASE_COMPAT( rOStm, 1, pData );	4058	WRITE_BASE_COMPAT( rOStm, 1, pData );
4046	rOStm << mnLayoutMode;	4059	rOStm << static_cast<sal_uInt32>(mnLayoutMode);
4047	}	4060	}
4048		4061
4049	// ------------------------------------------------------------------------	4062	// ------------------------------------------------------------------------
Lines 4051-4057 Link Here
4051	void MetaLayoutModeAction::Read( SvStream& rIStm, ImplMetaReadData* )	4064	void MetaLayoutModeAction::Read( SvStream& rIStm, ImplMetaReadData* )
4052	{	4065	{
4053	COMPAT( rIStm );	4066	COMPAT( rIStm );
4054	rIStm >> mnLayoutMode;	4067	sal_uInt32 n32Temp;
		4068	rIStm >> n32Temp;
		4069	mnLayoutMode = n32Temp;
4055	}	4070	}
4056		4071
4057	// ========================================================================	4072	// ========================================================================

Lines 268-275 Link Here

(-)vcl.api/source/gdi/pngwrite.cxx (-2 / +2 lines)
268	/* png signature is always an array of 8 bytes */	268	/* png signature is always an array of 8 bytes */
269	sal_uInt16 nOldMode = rOStm.GetNumberFormatInt();	269	sal_uInt16 nOldMode = rOStm.GetNumberFormatInt();
270	rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );	270	rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
271	rOStm << (ULONG)0x89504e47;	271	rOStm << static_cast<sal_uInt32>(0x89504e47);
272	rOStm << (ULONG)0x0d0a1a0a;	272	rOStm << static_cast<sal_uInt32>(0x0d0a1a0a);
273		273
274	std::vector< vcl::PNGWriter::ChunkData >::iterator aBeg( maChunkSeq.begin() );	274	std::vector< vcl::PNGWriter::ChunkData >::iterator aBeg( maChunkSeq.begin() );
275	std::vector< vcl::PNGWriter::ChunkData >::iterator aEnd( maChunkSeq.end() );	275	std::vector< vcl::PNGWriter::ChunkData >::iterator aEnd( maChunkSeq.end() );

Lines 249-256 Link Here

(-)vcl.api/source/gdi/print.cxx (-4 / +7 lines)
249	rOStream.WriteByteString( rInfo.maDriver, RTL_TEXTENCODING_UTF8 );	249	rOStream.WriteByteString( rInfo.maDriver, RTL_TEXTENCODING_UTF8 );
250	rOStream.WriteByteString( rInfo.maLocation, RTL_TEXTENCODING_UTF8 );	250	rOStream.WriteByteString( rInfo.maLocation, RTL_TEXTENCODING_UTF8 );
251	rOStream.WriteByteString( rInfo.maComment, RTL_TEXTENCODING_UTF8 );	251	rOStream.WriteByteString( rInfo.maComment, RTL_TEXTENCODING_UTF8 );
252	rOStream << rInfo.mnStatus;	252	rOStream << static_cast<sal_uInt32>(rInfo.mnStatus);
253	rOStream << rInfo.mnJobs;	253	rOStream << static_cast<sal_uInt32>(rInfo.mnJobs);
254		254
255	return rOStream;	255	return rOStream;
256	}	256	}
Lines 265-272 Link Here
265	rIStream.ReadByteString( rInfo.maDriver, RTL_TEXTENCODING_UTF8 );	265	rIStream.ReadByteString( rInfo.maDriver, RTL_TEXTENCODING_UTF8 );
266	rIStream.ReadByteString( rInfo.maLocation, RTL_TEXTENCODING_UTF8 );	266	rIStream.ReadByteString( rInfo.maLocation, RTL_TEXTENCODING_UTF8 );
267	rIStream.ReadByteString( rInfo.maComment, RTL_TEXTENCODING_UTF8 );	267	rIStream.ReadByteString( rInfo.maComment, RTL_TEXTENCODING_UTF8 );
268	rIStream >> rInfo.mnStatus;	268	sal_uInt32 n32Temp;
269	rIStream >> rInfo.mnJobs;	269	rIStream >> n32Temp;
		270	rInfo.mnStatus = n32Temp;
		271	rIStream >> n32Temp;
		272	rInfo.mnJobs = n32Temp;
270		273
271	return rIStream;	274	return rIStream;
272	}	275	}

Return to issue 62227

Lines 212-219 Link Here

(-)vcl.api/source/gdi/bitmap2.cxx (-4 / +4 lines)
212	if( ZCOMPRESS == aHeader.nCompression )	212	if( ZCOMPRESS == aHeader.nCompression )
213	{	213	{
214	ZCodec aCodec;	214	ZCodec aCodec;
215	ULONG nCodedSize, nUncodedSize;	215	sal_uInt32 nCodedSize, nUncodedSize;
216	ULONG nCodedPos;	216	sal_uInt32 nCodedPos;
217		217
218	// read coding information	218	// read coding information
219	rIStm >> nCodedSize >> nUncodedSize >> aHeader.nCompression;	219	rIStm >> nCodedSize >> nUncodedSize >> aHeader.nCompression;
Lines 692-698 Link Here
692	DIBInfoHeader aHeader;	692	DIBInfoHeader aHeader;
693	ULONG nImageSizePos;	693	ULONG nImageSizePos;
694	ULONG nEndPos;	694	ULONG nEndPos;
695	ULONG nCompression = 0;	695	sal_uInt32 nCompression = 0;
696	BOOL bRet = FALSE;	696	BOOL bRet = FALSE;
697		697
698	aHeader.nSize = DIBINFOHEADERSIZE;	698	aHeader.nSize = DIBINFOHEADERSIZE;
Lines 776-782 Link Here
776	ZCodec aCodec;	776	ZCodec aCodec;
777	SvMemoryStream aMemStm( aHeader.nSizeImage + 4096, 65535 );	777	SvMemoryStream aMemStm( aHeader.nSizeImage + 4096, 65535 );
778	ULONG nCodedPos = rOStm.Tell(), nLastPos;	778	ULONG nCodedPos = rOStm.Tell(), nLastPos;
779	ULONG nCodedSize, nUncodedSize;	779	sal_uInt32 nCodedSize, nUncodedSize;
780		780
781	// write uncoded data palette	781	// write uncoded data palette
782	if( aHeader.nColsUsed )	782	if( aHeader.nColsUsed )

Lines 1078-1086 Link Here

(-)vcl.api/source/gdi/cvtsvm.cxx (-7 / +8 lines)
1078	case( GDI_TEXTLINE_COMMENT ):	1078	case( GDI_TEXTLINE_COMMENT ):
1079	{	1079	{
1080	Point aStartPt;	1080	Point aStartPt;
1081	long nWidth;	1081	sal_Int32 nWidth;
1082	ULONG nStrikeout;	1082	sal_uInt32 nStrikeout;
1083	ULONG nUnderline;	1083	sal_uInt32 nUnderline;
1084	INT32 nFollowingActionCount;	1084	INT32 nFollowingActionCount;
1085		1085
1086	rIStm >> aStartPt >> nWidth >> nStrikeout >> nUnderline >> nFollowingActionCount;	1086	rIStm >> aStartPt >> nWidth >> nStrikeout >> nUnderline >> nFollowingActionCount;
Lines 1114-1121 Link Here
1114	case( GDI_COMMENT_COMMENT ):	1114	case( GDI_COMMENT_COMMENT ):
1115	{	1115	{
1116	ByteString aComment;	1116	ByteString aComment;
1117	long nValue;	1117	sal_Int32 nValue;
1118	ULONG nDataSize;	1118	sal_uInt32 nDataSize;
1119	BYTE* pData;	1119	BYTE* pData;
1120	INT32 nFollowingActionCount;	1120	INT32 nFollowingActionCount;
1121		1121
Lines 2079-2085 Link Here
2079	rOStm.SeekRel( 4 );	2079	rOStm.SeekRel( 4 );
2080		2080
2081	// write data	2081	// write data
2082	rOStm << rStartPt << nWidth << (ULONG) eStrikeout << (ULONG) eUnderline;	2082	rOStm << rStartPt << nWidth <<
		2083	static_cast<sal_Int32>(eStrikeout) << static_cast<sal_uInt32>(eUnderline);
2083	rOStm << (INT32) 0; // number of actions that follow this comment	2084	rOStm << (INT32) 0; // number of actions that follow this comment
2084		2085
2085	// calculate and write ActionSize of comment	2086	// calculate and write ActionSize of comment
Lines 2098-2104 Link Here
2098	case( META_COMMENT_ACTION ):	2099	case( META_COMMENT_ACTION ):
2099	{	2100	{
2100	const MetaCommentAction* pA = (MetaCommentAction*) pAction;	2101	const MetaCommentAction* pA = (MetaCommentAction*) pAction;
2101	const ULONG nDataSize = pA->GetDataSize();	2102	const sal_uInt32 nDataSize = pA->GetDataSize();
2102	ULONG nOldPos, nNewPos;	2103	ULONG nOldPos, nNewPos;
2103		2104
2104	// write RefPoint comment	2105	// write RefPoint comment