Attachment #34319 for issue #62227

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




	GfxLinkType			meType;
	ImpBuffer*			mpBuf;
	ImpSwap*			mpSwap;
	sal_uInt32			mnBufSize;
	sal_uInt32			mnUserId;
    ImpGfxLink*         mpImpData;
	ULONG				mnExtra2;


						GfxLink();
						GfxLink( const GfxLink& );
						GfxLink( const String& rPath, GfxLinkType nType );
						GfxLink( BYTE* pBuf, sal_uInt32 nBufSize, GfxLinkType nType, BOOL bOwns );
						~GfxLink();
						
	GfxLink&			operator=( const GfxLink& );

						
	GfxLinkType			GetType() const;

	void				SetUserId( sal_uInt32 nUserId ) { mnUserId = nUserId; }
	sal_uInt32			GetUserId() const { return mnUserId; }

	sal_uInt32			GetDataSize() const;	
	void				SetData( BYTE* pBuf, sal_uInt32 nSize, GfxLinkType nType, BOOL bOwns );
	const BYTE*			GetData() const;

	const Size&			GetPrefSize() const;




private:

	Rectangle			maRect;
	sal_uInt32			mnHorzRound;
	sal_uInt32			mnVertRound;

	virtual	sal_Bool	Compare( const MetaAction& ) const;


						DECL_META_ACTION( RoundRect, META_ROUNDRECT_ACTION )

						MetaRoundRectAction( const Rectangle& rRect,
											 sal_uInt32 nHorzRound, sal_uInt32 nVertRound );

	virtual void		Move( long nHorzMove, long nVertMove );
	virtual void		Scale( double fScaleX, double fScaleY );

	const Rectangle&	GetRect() const { return maRect; }
	sal_uInt32			GetHorzRound() const { return mnHorzRound; }
	sal_uInt32			GetVertRound() const { return mnVertRound; }
};

// ---------------------


	Point				maPt;
	XubString			maStr;
	sal_uInt32			mnWidth;
	USHORT				mnIndex;
	USHORT				mnLen;


public:
						DECL_META_ACTION( StretchText, META_STRETCHTEXT_ACTION )

						MetaStretchTextAction( const Point& rPt, sal_uInt32 nWidth,
											   const XubString& rStr,
											   USHORT nIndex, USHORT nLen );



	const Point&		GetPoint() const { return maPt; }
	const XubString&	GetText() const { return maStr; }
	sal_uInt32			GetWidth() const { return mnWidth; }
	USHORT				GetIndex() const { return mnIndex; }
	USHORT				GetLen() const { return mnLen; }
};

private:

	ByteString			maComment;
	sal_Int32			mnValue;
	sal_uInt32			mnDataSize;
	BYTE*				mpData;

	SAL_DLLPRIVATE void	ImplInitDynamicData( const BYTE* pData, sal_uInt32 nDataSize );
	virtual	sal_Bool	Compare( const MetaAction& ) const;

public:
						MetaCommentAction( sal_Int32 nValue = 0L );
						MetaCommentAction( const MetaCommentAction& rAct );
						MetaCommentAction( const ByteString& rComment, sal_Int32 nValue = 0L, const BYTE* pData = NULL, sal_uInt32 nDataSize = 0UL );
						MetaCommentAction( const BYTE* pData, sal_uInt32 nDataSize );
						~MetaCommentAction();

	virtual void		Execute( OutputDevice* pOut );

	virtual void		Read( SvStream& rIStm, ImplMetaReadData* pData );

	const ByteString&	GetComment() const { return maComment; }
	sal_Int32			GetValue() const { return mnValue; }
	sal_uInt32			GetDataSize() const { return mnDataSize; }
	const BYTE* 		GetData() const { return mpData; }
};


{
private:

    sal_uInt32 			mnLayoutMode;
	virtual	sal_Bool	Compare( const MetaAction& ) const;

public:
						DECL_META_ACTION( LayoutMode, META_LAYOUTMODE_ACTION )

						MetaLayoutModeAction( sal_uInt32 nLayoutMode );

    sal_uInt32			GetLayoutMode() const { return mnLayoutMode; }
};

// ------------------------




	XubString					maDriver;
	XubString					maLocation;
	XubString					maComment;
	sal_uInt32					mnStatus;
	sal_uInt32					mnJobs;

public:
								QueueInfo();

	const XubString&			GetDriver() const { return maDriver; }
	const XubString&			GetLocation() const { return maLocation; }
	const XubString&			GetComment() const { return maComment; }
	sal_uInt32					GetStatus() const { return mnStatus; }
	sal_uInt32					GetJobs() const { return mnJobs; }

	const QueueInfo&			operator==( const QueueInfo& rInfo );





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

				// read coding information

	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 )

Lines 1079-1086 Link Here

(-)vcl.long2int/source/gdi/cvtsvm.cxx (-6 / +8 lines)
1079	{	1079	{
1080	Point aStartPt;	1080	Point aStartPt;
1081	long nWidth;	1081	long 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_uInt32>(eStrikeout) <<
		2084	static_cast<sal_uInt32>(eUnderline);
2083	rOStm << (INT32) 0; // number of actions that follow this comment	2085	rOStm << (INT32) 0; // number of actions that follow this comment
2084		2086
2085	// calculate and write ActionSize of comment	2087	// calculate and write ActionSize of comment
Lines 2098-2104 Link Here
2098	case( META_COMMENT_ACTION ):	2100	case( META_COMMENT_ACTION ):
2099	{	2101	{
2100	const MetaCommentAction* pA = (MetaCommentAction*) pAction;	2102	const MetaCommentAction* pA = (MetaCommentAction*) pAction;
2101	const ULONG nDataSize = pA->GetDataSize();	2103	const sal_uInt32 nDataSize = pA->GetDataSize();
2102	ULONG nOldPos, nNewPos;	2104	ULONG nOldPos, nNewPos;
2103		2105
2104	// write RefPoint comment	2106	// write RefPoint comment





// ------------------------------------------------------------------------

GfxLink::GfxLink( BYTE* pBuf, sal_uInt32 nSize, GfxLinkType nType, BOOL bOwns ) :
    mpImpData( new ImpGfxLink )
{
	meType = nType;


// ------------------------------------------------------------------------

sal_uInt32 GfxLink::GetDataSize() const
{
	return mnBufSize;
}

{
    Size            aSize;
    MapMode         aMapMode;
	sal_uInt32		nSize;
	sal_uInt32		nUserId;
	UINT16			nType;
	BYTE*			pBuf;	
    bool			bMapAndSizeValid( false );




#define SYS_OS2METAFILE			    0x00000005
#define SYS_MACMETAFILE			    0x00000006
                                    
#define GRAPHIC_FORMAT_50		    static_cast<sal_uInt32>(COMPAT_FORMAT( 'G', 'R', 'F', '5' ))
#define NATIVE_FORMAT_50		    static_cast<sal_uInt32>(COMPAT_FORMAT( 'N', 'A', 'T', '5' ))

// ---------------
// - ImpSwapFile -

	MapMode			aMapMode;
	Size			aSize;
    const ULONG		nStartPos = rIStm.Tell();
	sal_uInt32		nId;
	ULONG			nHeaderLen;
	long			nType;
	long			nLen;

	if( !rIStm.GetError() )
	{
		const ULONG	nStmPos1 = rIStm.Tell();
		sal_uInt32 nTmp;

		if ( !rImpGraphic.mbSwapUnderway )
			rImpGraphic.ImplClear();




// ------------------------------------------------------------------------

MetaRoundRectAction::MetaRoundRectAction( const Rectangle& rRect,
										  sal_uInt32 nHorzRound, sal_uInt32 nVertRound ) :
	MetaAction	( META_ROUNDRECT_ACTION ),
	maRect		( rRect ),
	mnHorzRound ( nHorzRound ),


void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
{
    const sal_uInt32 nAryLen = mpDXAry ? mnLen : 0;

	WRITE_BASE_COMPAT( rOStm, 2, pData );
	rOStm	<< maStartPt;


void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
{
	sal_uInt32 nAryLen;

	delete[] mpDXAry;


	if( nAryLen )
	{
        // #i9762#, #106172# Ensure that DX array is at least mnLen entries long
        const ULONG nIntAryLen( Max(nAryLen, static_cast<sal_uInt32>(mnLen)) );
		mpDXAry = new sal_Int32[ nIntAryLen ];
        
        ULONG i;


// ------------------------------------------------------------------------

MetaStretchTextAction::MetaStretchTextAction( const Point& rPt, sal_uInt32 nWidth,
											  const XubString& rStr,
											  USHORT nIndex, USHORT nLen ) :
	MetaAction	( META_STRETCHTEXT_ACTION ),


	rOStm << maPos;
	rOStm << mnWidth;
	rOStm << static_cast<sal_uInt32>(meStrikeout);
	rOStm << static_cast<sal_uInt32>(meUnderline);
}

// ------------------------------------------------------------------------

{
	COMPAT( rIStm );

	sal_uInt32 nTemp;
	rIStm >> maPos;
	rIStm >> mnWidth;
	rIStm >> nTemp;


// ========================================================================

MetaCommentAction::MetaCommentAction( sal_Int32 nValue ) :
	MetaAction	( META_COMMENT_ACTION ),
	mnValue 	( nValue )
{


// ------------------------------------------------------------------------

MetaCommentAction::MetaCommentAction( const ByteString& rComment, sal_Int32 nValue, const BYTE* pData, sal_uInt32 nDataSize ) :
	MetaAction	( META_COMMENT_ACTION ),
	maComment	( rComment ),
	mnValue 	( nValue )


// ------------------------------------------------------------------------

MetaCommentAction::MetaCommentAction( const BYTE* pData, sal_uInt32 nDataSize ) :
	MetaAction	( META_COMMENT_ACTION ),
	mnValue 	( 0L )
{


// ------------------------------------------------------------------------

void MetaCommentAction::ImplInitDynamicData( const BYTE* pData, sal_uInt32 nDataSize )
{
	if ( nDataSize && pData )
	{


// ------------------------------------------------------------------------

MetaLayoutModeAction::MetaLayoutModeAction( sal_uInt32 nLayoutMode ) :
	MetaAction	( META_LAYOUTMODE_ACTION ),
	mnLayoutMode( nLayoutMode )
{

Lines 268-275 Link Here

(-)vcl.long2int/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() );

Return to issue 62227

Lines 155-162 Link Here

(-)vcl.long2int/inc/gfxlink.hxx (-7 / +7 lines)
155	GfxLinkType meType;	155	GfxLinkType meType;
156	ImpBuffer* mpBuf;	156	ImpBuffer* mpBuf;
157	ImpSwap* mpSwap;	157	ImpSwap* mpSwap;
158	ULONG mnBufSize;	158	sal_uInt32 mnBufSize;
159	ULONG mnUserId;	159	sal_uInt32 mnUserId;
160	ImpGfxLink* mpImpData;	160	ImpGfxLink* mpImpData;
161	ULONG mnExtra2;	161	ULONG mnExtra2;
162		162
Lines 166-172 Link Here
166	GfxLink();	166	GfxLink();
167	GfxLink( const GfxLink& );	167	GfxLink( const GfxLink& );
168	GfxLink( const String& rPath, GfxLinkType nType );	168	GfxLink( const String& rPath, GfxLinkType nType );
169	GfxLink( BYTE* pBuf, ULONG nBufSize, GfxLinkType nType, BOOL bOwns );	169	GfxLink( BYTE* pBuf, sal_uInt32 nBufSize, GfxLinkType nType, BOOL bOwns );
170	~GfxLink();	170	~GfxLink();
171		171
172	GfxLink& operator=( const GfxLink& );	172	GfxLink& operator=( const GfxLink& );
Lines 174-184 Link Here
174		174
175	GfxLinkType GetType() const;	175	GfxLinkType GetType() const;
176		176
177	void SetUserId( ULONG nUserId ) { mnUserId = nUserId; }	177	void SetUserId( sal_uInt32 nUserId ) { mnUserId = nUserId; }
178	ULONG GetUserId() const { return mnUserId; }	178	sal_uInt32 GetUserId() const { return mnUserId; }
179		179
180	ULONG GetDataSize() const;	180	sal_uInt32 GetDataSize() const;
181	void SetData( BYTE* pBuf, ULONG nSize, GfxLinkType nType, BOOL bOwns );	181	void SetData( BYTE* pBuf, sal_uInt32 nSize, GfxLinkType nType, BOOL bOwns );
182	const BYTE* GetData() const;	182	const BYTE* GetData() const;
183		183
184	const Size& GetPrefSize() const;	184	const Size& GetPrefSize() const;

Lines 315-322 Link Here

(-)vcl.long2int/inc/metaact.hxx (-19 / +19 lines)
315	private:	315	private:
316		316
317	Rectangle maRect;	317	Rectangle maRect;
318	ULONG mnHorzRound;	318	sal_uInt32 mnHorzRound;
319	ULONG mnVertRound;	319	sal_uInt32 mnVertRound;
320		320
321	virtual sal_Bool Compare( const MetaAction& ) const;	321	virtual sal_Bool Compare( const MetaAction& ) const;
322		322
Lines 324-337 Link Here
324	DECL_META_ACTION( RoundRect, META_ROUNDRECT_ACTION )	324	DECL_META_ACTION( RoundRect, META_ROUNDRECT_ACTION )
325		325
326	MetaRoundRectAction( const Rectangle& rRect,	326	MetaRoundRectAction( const Rectangle& rRect,
327	long nHorzRound, long nVertRound );	327	sal_uInt32 nHorzRound, sal_uInt32 nVertRound );
328		328
329	virtual void Move( long nHorzMove, long nVertMove );	329	virtual void Move( long nHorzMove, long nVertMove );
330	virtual void Scale( double fScaleX, double fScaleY );	330	virtual void Scale( double fScaleX, double fScaleY );
331		331
332	const Rectangle& GetRect() const { return maRect; }	332	const Rectangle& GetRect() const { return maRect; }
333	ULONG GetHorzRound() const { return mnHorzRound; }	333	sal_uInt32 GetHorzRound() const { return mnHorzRound; }
334	ULONG GetVertRound() const { return mnVertRound; }	334	sal_uInt32 GetVertRound() const { return mnVertRound; }
335	};	335	};
336		336
337	// ---------------------	337	// ---------------------
Lines 596-602 Link Here
596		596
597	Point maPt;	597	Point maPt;
598	XubString maStr;	598	XubString maStr;
599	ULONG mnWidth;	599	sal_uInt32 mnWidth;
600	USHORT mnIndex;	600	USHORT mnIndex;
601	USHORT mnLen;	601	USHORT mnLen;
602		602
Lines 605-611 Link Here
605	public:	605	public:
606	DECL_META_ACTION( StretchText, META_STRETCHTEXT_ACTION )	606	DECL_META_ACTION( StretchText, META_STRETCHTEXT_ACTION )
607		607
608	MetaStretchTextAction( const Point& rPt, ULONG nWidth,	608	MetaStretchTextAction( const Point& rPt, sal_uInt32 nWidth,
609	const XubString& rStr,	609	const XubString& rStr,
610	USHORT nIndex, USHORT nLen );	610	USHORT nIndex, USHORT nLen );
611		611
Lines 614-620 Link Here
614		614
615	const Point& GetPoint() const { return maPt; }	615	const Point& GetPoint() const { return maPt; }
616	const XubString& GetText() const { return maStr; }	616	const XubString& GetText() const { return maStr; }
617	ULONG GetWidth() const { return mnWidth; }	617	sal_uInt32 GetWidth() const { return mnWidth; }
618	USHORT GetIndex() const { return mnIndex; }	618	USHORT GetIndex() const { return mnIndex; }
619	USHORT GetLen() const { return mnLen; }	619	USHORT GetLen() const { return mnLen; }
620	};	620	};
Lines 1481-1498 Link Here
1481	private:	1481	private:
1482		1482
1483	ByteString maComment;	1483	ByteString maComment;
1484	long mnValue;	1484	sal_Int32 mnValue;
1485	ULONG mnDataSize;	1485	sal_uInt32 mnDataSize;
1486	BYTE* mpData;	1486	BYTE* mpData;
1487		1487
1488	SAL_DLLPRIVATE void ImplInitDynamicData( const BYTE* pData, ULONG nDataSize );	1488	SAL_DLLPRIVATE void ImplInitDynamicData( const BYTE* pData, sal_uInt32 nDataSize );
1489	virtual sal_Bool Compare( const MetaAction& ) const;	1489	virtual sal_Bool Compare( const MetaAction& ) const;
1490		1490
1491	public:	1491	public:
1492	MetaCommentAction( long nValue = 0L );	1492	MetaCommentAction( sal_Int32 nValue = 0L );
1493	MetaCommentAction( const MetaCommentAction& rAct );	1493	MetaCommentAction( const MetaCommentAction& rAct );
1494	MetaCommentAction( const ByteString& rComment, long nValue = 0L, const BYTE* pData = NULL, ULONG nDataSize = 0UL );	1494	MetaCommentAction( const ByteString& rComment, sal_Int32 nValue = 0L, const BYTE* pData = NULL, sal_uInt32 nDataSize = 0UL );
1495	MetaCommentAction( const BYTE* pData, ULONG nDataSize );	1495	MetaCommentAction( const BYTE* pData, sal_uInt32 nDataSize );
1496	~MetaCommentAction();	1496	~MetaCommentAction();
1497		1497
1498	virtual void Execute( OutputDevice* pOut );	1498	virtual void Execute( OutputDevice* pOut );
Lines 1501-1508 Link Here
1501	virtual void Read( SvStream& rIStm, ImplMetaReadData* pData );	1501	virtual void Read( SvStream& rIStm, ImplMetaReadData* pData );
1502		1502
1503	const ByteString& GetComment() const { return maComment; }	1503	const ByteString& GetComment() const { return maComment; }
1504	long GetValue() const { return mnValue; }	1504	sal_Int32 GetValue() const { return mnValue; }
1505	ULONG GetDataSize() const { return mnDataSize; }	1505	sal_uInt32 GetDataSize() const { return mnDataSize; }
1506	const BYTE* GetData() const { return mpData; }	1506	const BYTE* GetData() const { return mpData; }
1507	};	1507	};
1508		1508
Lines 1514-1528 Link Here
1514	{	1514	{
1515	private:	1515	private:
1516		1516
1517	ULONG mnLayoutMode;	1517	sal_uInt32 mnLayoutMode;
1518	virtual sal_Bool Compare( const MetaAction& ) const;	1518	virtual sal_Bool Compare( const MetaAction& ) const;
1519		1519
1520	public:	1520	public:
1521	DECL_META_ACTION( LayoutMode, META_LAYOUTMODE_ACTION )	1521	DECL_META_ACTION( LayoutMode, META_LAYOUTMODE_ACTION )
1522		1522
1523	MetaLayoutModeAction( ULONG nLayoutMode );	1523	MetaLayoutModeAction( sal_uInt32 nLayoutMode );
1524		1524
1525	ULONG GetLayoutMode() const { return mnLayoutMode; }	1525	sal_uInt32 GetLayoutMode() const { return mnLayoutMode; }
1526	};	1526	};
1527		1527
1528	// ------------------------	1528	// ------------------------

Lines 128-135 Link Here

(-)vcl.long2int/inc/print.hxx (-4 / +4 lines)
128	XubString maDriver;	128	XubString maDriver;
129	XubString maLocation;	129	XubString maLocation;
130	XubString maComment;	130	XubString maComment;
131	ULONG mnStatus;	131	sal_uInt32 mnStatus;
132	ULONG mnJobs;	132	sal_uInt32 mnJobs;
133		133
134	public:	134	public:
135	QueueInfo();	135	QueueInfo();
Lines 140-147 Link Here
140	const XubString& GetDriver() const { return maDriver; }	140	const XubString& GetDriver() const { return maDriver; }
141	const XubString& GetLocation() const { return maLocation; }	141	const XubString& GetLocation() const { return maLocation; }
142	const XubString& GetComment() const { return maComment; }	142	const XubString& GetComment() const { return maComment; }
143	ULONG GetStatus() const { return mnStatus; }	143	sal_uInt32 GetStatus() const { return mnStatus; }
144	ULONG GetJobs() const { return mnJobs; }	144	sal_uInt32 GetJobs() const { return mnJobs; }
145		145
146	const QueueInfo& operator==( const QueueInfo& rInfo );	146	const QueueInfo& operator==( const QueueInfo& rInfo );
147		147

Lines 212-218 Link Here

(-)vcl.long2int/source/gdi/bitmap2.cxx (-3 / +3 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	ULONG nCodedPos;
217		217
218	// read coding information	218	// read coding information
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 71-77 Link Here

(-)vcl.long2int/source/gdi/gfxlink.cxx (-4 / +4 lines)
71		71
72	// ------------------------------------------------------------------------	72	// ------------------------------------------------------------------------
73		73
74	GfxLink::GfxLink( BYTE* pBuf, ULONG nSize, GfxLinkType nType, BOOL bOwns ) :	74	GfxLink::GfxLink( BYTE* pBuf, sal_uInt32 nSize, GfxLinkType nType, BOOL bOwns ) :
75	mpImpData( new ImpGfxLink )	75	mpImpData( new ImpGfxLink )
76	{	76	{
77	meType = nType;	77	meType = nType;
Lines 177-183 Link Here
177		177
178	// ------------------------------------------------------------------------	178	// ------------------------------------------------------------------------
179		179
180	ULONG GfxLink::GetDataSize() const	180	sal_uInt32 GfxLink::GetDataSize() const
181	{	181	{
182	return mnBufSize;	182	return mnBufSize;
183	}	183	}
Lines 355-362 Link Here
355	{	355	{
356	Size aSize;	356	Size aSize;
357	MapMode aMapMode;	357	MapMode aMapMode;
358	ULONG nSize;	358	sal_uInt32 nSize;
359	ULONG nUserId;	359	sal_uInt32 nUserId;
360	UINT16 nType;	360	UINT16 nType;
361	BYTE* pBuf;	361	BYTE* pBuf;
362	bool bMapAndSizeValid( false );	362	bool bMapAndSizeValid( false );

Lines 100-107 Link Here

(-)vcl.long2int/source/gdi/impgraph.cxx (-4 / +4 lines)
100	#define SYS_OS2METAFILE 0x00000005	100	#define SYS_OS2METAFILE 0x00000005
101	#define SYS_MACMETAFILE 0x00000006	101	#define SYS_MACMETAFILE 0x00000006
102		102
103	#define GRAPHIC_FORMAT_50 COMPAT_FORMAT( 'G', 'R', 'F', '5' )	103	#define GRAPHIC_FORMAT_50 static_cast<sal_uInt32>(COMPAT_FORMAT( 'G', 'R', 'F', '5' ))
104	#define NATIVE_FORMAT_50 COMPAT_FORMAT( 'N', 'A', 'T', '5' )	104	#define NATIVE_FORMAT_50 static_cast<sal_uInt32>(COMPAT_FORMAT( 'N', 'A', 'T', '5' ))
105		105
106	// ---------------	106	// ---------------
107	// - ImpSwapFile -	107	// - ImpSwapFile -
Lines 904-910 Link Here
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 573-579 Link Here

(-)vcl.long2int/source/gdi/metaact.cxx (-13 / +13 lines)
573	// ------------------------------------------------------------------------	573	// ------------------------------------------------------------------------
574		574
575	MetaRoundRectAction::MetaRoundRectAction( const Rectangle& rRect,	575	MetaRoundRectAction::MetaRoundRectAction( const Rectangle& rRect,
576	long nHorzRound, long nVertRound ) :	576	sal_uInt32 nHorzRound, sal_uInt32 nVertRound ) :
577	MetaAction ( META_ROUNDRECT_ACTION ),	577	MetaAction ( META_ROUNDRECT_ACTION ),
578	maRect ( rRect ),	578	maRect ( rRect ),
579	mnHorzRound ( nHorzRound ),	579	mnHorzRound ( nHorzRound ),
Lines 1426-1432 Link Here
1426		1426
1427	void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )	1427	void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
1428	{	1428	{
1429	const ULONG nAryLen = mpDXAry ? mnLen : 0;	1429	const sal_uInt32 nAryLen = mpDXAry ? mnLen : 0;
1430		1430
1431	WRITE_BASE_COMPAT( rOStm, 2, pData );	1431	WRITE_BASE_COMPAT( rOStm, 2, pData );
1432	rOStm << maStartPt;	1432	rOStm << maStartPt;
Lines 1451-1457 Link Here
1451		1451
1452	void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData )	1452	void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
1453	{	1453	{
1454	ULONG nAryLen;	1454	sal_uInt32 nAryLen;
1455		1455
1456	delete[] mpDXAry;	1456	delete[] mpDXAry;
1457		1457
Lines 1465-1471 Link Here
1465	if( nAryLen )	1465	if( nAryLen )
1466	{	1466	{
1467	// #i9762#, #106172# Ensure that DX array is at least mnLen entries long	1467	// #i9762#, #106172# Ensure that DX array is at least mnLen entries long
1468	const ULONG nIntAryLen( Max(nAryLen, static_cast<ULONG>(mnLen)) );	1468	const ULONG nIntAryLen( Max(nAryLen, static_cast<sal_uInt32>(mnLen)) );
1469	mpDXAry = new sal_Int32[ nIntAryLen ];	1469	mpDXAry = new sal_Int32[ nIntAryLen ];
1470		1470
1471	ULONG i;	1471	ULONG i;
Lines 1495-1501 Link Here
1495		1495
1496	// ------------------------------------------------------------------------	1496	// ------------------------------------------------------------------------
1497		1497
1498	MetaStretchTextAction::MetaStretchTextAction( const Point& rPt, ULONG nWidth,	1498	MetaStretchTextAction::MetaStretchTextAction( const Point& rPt, sal_uInt32 nWidth,
1499	const XubString& rStr,	1499	const XubString& rStr,
1500	USHORT nIndex, USHORT nLen ) :	1500	USHORT nIndex, USHORT nLen ) :
1501	MetaAction ( META_STRETCHTEXT_ACTION ),	1501	MetaAction ( META_STRETCHTEXT_ACTION ),
Lines 1747-1754 Link Here
1747		1747
1748	rOStm << maPos;	1748	rOStm << maPos;
1749	rOStm << mnWidth;	1749	rOStm << mnWidth;
1750	rOStm << (ULONG)meStrikeout;	1750	rOStm << static_cast<sal_uInt32>(meStrikeout);
1751	rOStm << (ULONG)meUnderline;	1751	rOStm << static_cast<sal_uInt32>(meUnderline);
1752	}	1752	}
1753		1753
1754	// ------------------------------------------------------------------------	1754	// ------------------------------------------------------------------------
Lines 1757-1763 Link Here
1757	{	1757	{
1758	COMPAT( rIStm );	1758	COMPAT( rIStm );
1759		1759
1760	ULONG nTemp;	1760	sal_uInt32 nTemp;
1761	rIStm >> maPos;	1761	rIStm >> maPos;
1762	rIStm >> mnWidth;	1762	rIStm >> mnWidth;
1763	rIStm >> nTemp;	1763	rIStm >> nTemp;
Lines 3886-3892 Link Here
3886		3886
3887	// ========================================================================	3887	// ========================================================================
3888		3888
3889	MetaCommentAction::MetaCommentAction( long nValue ) :	3889	MetaCommentAction::MetaCommentAction( sal_Int32 nValue ) :
3890	MetaAction ( META_COMMENT_ACTION ),	3890	MetaAction ( META_COMMENT_ACTION ),
3891	mnValue ( nValue )	3891	mnValue ( nValue )
3892	{	3892	{
Lines 3905-3911 Link Here
3905		3905
3906	// ------------------------------------------------------------------------	3906	// ------------------------------------------------------------------------
3907		3907
3908	MetaCommentAction::MetaCommentAction( const ByteString& rComment, long nValue, const BYTE* pData, ULONG nDataSize ) :	3908	MetaCommentAction::MetaCommentAction( const ByteString& rComment, sal_Int32 nValue, const BYTE* pData, sal_uInt32 nDataSize ) :
3909	MetaAction ( META_COMMENT_ACTION ),	3909	MetaAction ( META_COMMENT_ACTION ),
3910	maComment ( rComment ),	3910	maComment ( rComment ),
3911	mnValue ( nValue )	3911	mnValue ( nValue )
Lines 3915-3921 Link Here
3915		3915
3916	// ------------------------------------------------------------------------	3916	// ------------------------------------------------------------------------
3917		3917
3918	MetaCommentAction::MetaCommentAction( const BYTE* pData, ULONG nDataSize ) :	3918	MetaCommentAction::MetaCommentAction( const BYTE* pData, sal_uInt32 nDataSize ) :
3919	MetaAction ( META_COMMENT_ACTION ),	3919	MetaAction ( META_COMMENT_ACTION ),
3920	mnValue ( 0L )	3920	mnValue ( 0L )
3921	{	3921	{
Lines 3932-3938 Link Here
3932		3932
3933	// ------------------------------------------------------------------------	3933	// ------------------------------------------------------------------------
3934		3934
3935	void MetaCommentAction::ImplInitDynamicData( const BYTE* pData, ULONG nDataSize )	3935	void MetaCommentAction::ImplInitDynamicData( const BYTE* pData, sal_uInt32 nDataSize )
3936	{	3936	{
3937	if ( nDataSize && pData )	3937	if ( nDataSize && pData )
3938	{	3938	{
Lines 4009-4015 Link Here
4009		4009
4010	// ------------------------------------------------------------------------	4010	// ------------------------------------------------------------------------
4011		4011
4012	MetaLayoutModeAction::MetaLayoutModeAction( ULONG nLayoutMode ) :	4012	MetaLayoutModeAction::MetaLayoutModeAction( sal_uInt32 nLayoutMode ) :
4013	MetaAction ( META_LAYOUTMODE_ACTION ),	4013	MetaAction ( META_LAYOUTMODE_ACTION ),
4014	mnLayoutMode( nLayoutMode )	4014	mnLayoutMode( nLayoutMode )
4015	{	4015	{