Attachment #13209 for issue #25574

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

Lines 1966-1972 Link Here

(-)ooo_1.1.0_src.orig/goodies/source/filter.vcl/eos2met/eos2met.cxx (-2 / +2 lines)
1966	const MetaStretchTextAction* pA = (const MetaStretchTextAction*) pMA;	1966	const MetaStretchTextAction* pA = (const MetaStretchTextAction*) pMA;
1967	VirtualDevice aVDev;	1967	VirtualDevice aVDev;
1968	USHORT i;	1968	USHORT i;
1969	long* pDXAry;	1969	sal_Int32* pDXAry;
1970	sal_Int32 nNormSize;	1970	sal_Int32 nNormSize;
1971	String aStr;	1971	String aStr;
1972	Polygon aPolyDummy(1);	1972	Polygon aPolyDummy(1);
Lines 1991-1997 Link Here
1991	METSetChrAngle( nOrientation = aGDIFont.GetOrientation() );	1991	METSetChrAngle( nOrientation = aGDIFont.GetOrientation() );
1992	METSetChrSet(FindChrSet(aGDIFont));	1992	METSetChrSet(FindChrSet(aGDIFont));
1993	aStr=String(pA->GetText(),pA->GetIndex(),pA->GetLen());	1993	aStr=String(pA->GetText(),pA->GetIndex(),pA->GetLen());
1994	pDXAry=new long[aStr.Len()];	1994	pDXAry=new sal_Int32[aStr.Len()];
1995	nNormSize = aVDev.GetTextArray( aStr, pDXAry );	1995	nNormSize = aVDev.GetTextArray( aStr, pDXAry );
1996		1996
1997	for ( i = 0; i < aStr.Len(); i++ )	1997	for ( i = 0; i < aStr.Len(); i++ )




	void SetAttrForFrame();
	void SetAttrForText();

	void WriteTextArray(Point & rPoint, const String& rString, const sal_Int32 * pDXAry);

	void WriteOpcodes(const GDIMetaFile & rMTF);


}


void PictWriter::WriteTextArray(Point & rPoint, const String& rString, const sal_Int32 * pDXAry)
{
	USHORT i,nLen;
	sal_Unicode c;

				Point                           aPt( pA->GetPoint() );
				String                          aStr( pA->GetText(),pA->GetIndex(),pA->GetLen() );
				VirtualDevice                   aVirDev;
				sal_Int32*                           pDXAry = new sal_Int32[ aStr.Len() ];
				sal_Int32						nNormSize( aVirDev.GetTextArray( aStr,pDXAry ) );
				USHORT                          i;





	BYTE*				mpCurrentScan;
	ULONG				mnDeflateInSize;

	sal_uInt32			mnWidth, mnHeight;
	BYTE				mnBitsPerPixel;
	BYTE				mnFilterType;			// 0 oder 4;
	ULONG				mnBBP;					// bytes per pixel ( needed for filtering )

	void				ImplWritePalette();
	void				ImplOpenChunk( ULONG nChunkType );
	void				ImplWriteChunk( BYTE nNumb );
	void				ImplWriteChunk( sal_uInt32 nNumb );
	void				ImplWriteChunk( unsigned char* pSource, long nDatSize );
	void				ImplCloseChunk( void );


	*mpOStm << (ULONG)0x0d0a1a0a;

	ImplOpenChunk(PNGCHUNK_IHDR);
	ImplWriteChunk( ( mnWidth = (sal_uInt32)mpAccess->Width() ) );
	ImplWriteChunk( ( mnHeight = (sal_uInt32)mpAccess->Height() ) );

	if ( mnWidth && mnHeight && mnBitsPerPixel && mbStatus )
	{

	*mpOStm << nSource;
}

void PNGWriter::ImplWriteChunk ( sal_uInt32 nSource )
{
	mnChunkDatSize+=4;
	*mpOStm << nSource;

Return to issue 25574

Lines 214-220 Link Here

(-)ooo_1.1.0_src.orig/goodies/source/filter.vcl/epict/epict.cxx (-3 / +3 lines)
214	void SetAttrForFrame();	214	void SetAttrForFrame();
215	void SetAttrForText();	215	void SetAttrForText();
216		216
217	void WriteTextArray(Point & rPoint, const String& rString, const long * pDXAry);	217	void WriteTextArray(Point & rPoint, const String& rString, const sal_Int32 * pDXAry);
218		218
219	void WriteOpcodes(const GDIMetaFile & rMTF);	219	void WriteOpcodes(const GDIMetaFile & rMTF);
220		220
Lines 1391-1397 Link Here
1391	}	1391	}
1392		1392
1393		1393
1394	void PictWriter::WriteTextArray(Point & rPoint, const String& rString, const long * pDXAry)	1394	void PictWriter::WriteTextArray(Point & rPoint, const String& rString, const sal_Int32 * pDXAry)
1395	{	1395	{
1396	USHORT i,nLen;	1396	USHORT i,nLen;
1397	sal_Unicode c;	1397	sal_Unicode c;
Lines 1749-1755 Link Here
1749	Point aPt( pA->GetPoint() );	1749	Point aPt( pA->GetPoint() );
1750	String aStr( pA->GetText(),pA->GetIndex(),pA->GetLen() );	1750	String aStr( pA->GetText(),pA->GetIndex(),pA->GetLen() );
1751	VirtualDevice aVirDev;	1751	VirtualDevice aVirDev;
1752	long* pDXAry = new long[ aStr.Len() ];	1752	sal_Int32* pDXAry = new sal_Int32[ aStr.Len() ];
1753	sal_Int32 nNormSize( aVirDev.GetTextArray( aStr,pDXAry ) );	1753	sal_Int32 nNormSize( aVirDev.GetTextArray( aStr,pDXAry ) );
1754	USHORT i;	1754	USHORT i;
1755		1755

Lines 119-125 Link Here

(-)ooo_1.1.0_src.orig/goodies/source/filter.vcl/epng/epng.cxx (-5 / +5 lines)
119	BYTE* mpCurrentScan;	119	BYTE* mpCurrentScan;
120	ULONG mnDeflateInSize;	120	ULONG mnDeflateInSize;
121		121
122	ULONG mnWidth, mnHeight;	122	sal_uInt32 mnWidth, mnHeight;
123	BYTE mnBitsPerPixel;	123	BYTE mnBitsPerPixel;
124	BYTE mnFilterType; // 0 oder 4;	124	BYTE mnFilterType; // 0 oder 4;
125	ULONG mnBBP; // bytes per pixel ( needed for filtering )	125	ULONG mnBBP; // bytes per pixel ( needed for filtering )
Lines 138-144 Link Here
138	void ImplWritePalette();	138	void ImplWritePalette();
139	void ImplOpenChunk( ULONG nChunkType );	139	void ImplOpenChunk( ULONG nChunkType );
140	void ImplWriteChunk( BYTE nNumb );	140	void ImplWriteChunk( BYTE nNumb );
141	void ImplWriteChunk( ULONG nNumb );	141	void ImplWriteChunk( sal_uInt32 nNumb );
142	void ImplWriteChunk( unsigned char* pSource, long nDatSize );	142	void ImplWriteChunk( unsigned char* pSource, long nDatSize );
143	void ImplCloseChunk( void );	143	void ImplCloseChunk( void );
144		144
Lines 346-353 Link Here
346	*mpOStm << (ULONG)0x0d0a1a0a;	346	*mpOStm << (ULONG)0x0d0a1a0a;
347		347
348	ImplOpenChunk(PNGCHUNK_IHDR);	348	ImplOpenChunk(PNGCHUNK_IHDR);
349	ImplWriteChunk( ( mnWidth = (ULONG)mpAccess->Width() ) );	349	ImplWriteChunk( ( mnWidth = (sal_uInt32)mpAccess->Width() ) );
350	ImplWriteChunk( ( mnHeight = (ULONG)mpAccess->Height() ) );	350	ImplWriteChunk( ( mnHeight = (sal_uInt32)mpAccess->Height() ) );
351		351
352	if ( mnWidth && mnHeight && mnBitsPerPixel && mbStatus )	352	if ( mnWidth && mnHeight && mnBitsPerPixel && mbStatus )
353	{	353	{
Lines 719-725 Link Here
719	*mpOStm << nSource;	719	*mpOStm << nSource;
720	}	720	}
721		721
722	void PNGWriter::ImplWriteChunk ( ULONG nSource )	722	void PNGWriter::ImplWriteChunk ( sal_uInt32 nSource )
723	{	723	{
724	mnChunkDatSize+=4;	724	mnChunkDatSize+=4;
725	*mpOStm << nSource;	725	*mpOStm << nSource;