Attachment #65789 for issue #106472

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





    const sal_uInt8 aFldData[] =
    {
        0,0,0,0,        // len of struct
        0x44,0,         // the start of "next" data             
        0,0,0,0,0,0,0,0,0,0,                // PIC-Structure!  /10
        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,    //  |              /16

        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,    //  |              /16
        0,0,0,0,                            // /               /4
    };
    sal_uInt32 slen=sizeof(sal_uInt32)
        + sizeof(aFldData)
        + sizeof( aFldHeader )
        + 2*ffname.getLength() + 4
        + 2*ffdeftext.getLength() + 4

        + 2*ffstattext.getLength() + 4
        + 2*ffentrymcr.getLength() + 4
        + 2*ffexitmcr.getLength() + 4;

    *pDataStrm << slen;

    *( (sal_uInt32 *)aFldData ) = slen;
    int len = sizeof( aFldData );
    OSL_ENSURE( len == 0x44-sizeof(sal_uInt32), "SwWW8Writer::WriteFormData(..) - wrong aFldData length" );
    pDataStrm->Write( aFldData, len );

    len = sizeof( aFldHeader );

Return to issue 106472

Lines 3510-3516 Link Here

(-)a/sw/source/filter/ww8/wrtww8.cxx (-7 / +6 lines)
3510		3510
3511	const sal_uInt8 aFldData[] =	3511	const sal_uInt8 aFldData[] =
3512	{	3512	{
3513	0,0,0,0, // len of struct
3514	0x44,0, // the start of "next" data	3513	0x44,0, // the start of "next" data
3515	0,0,0,0,0,0,0,0,0,0, // PIC-Structure! /10	3514	0,0,0,0,0,0,0,0,0,0, // PIC-Structure! /10
3516	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // \| /16	3515	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // \| /16
Lines 3518-3524 Link Here
3518	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // \| /16	3517	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // \| /16
3519	0,0,0,0, // / /4	3518	0,0,0,0, // / /4
3520	};	3519	};
3521	int slen = sizeof( aFldData )	3520	sal_uInt32 slen=sizeof(sal_uInt32)
		3521	+ sizeof(aFldData)
3522	+ sizeof( aFldHeader )	3522	+ sizeof( aFldHeader )
3523	+ 2*ffname.getLength() + 4	3523	+ 2*ffname.getLength() + 4
3524	+ 2*ffdeftext.getLength() + 4	3524	+ 2*ffdeftext.getLength() + 4
Lines 3527-3538 Link Here
3527	+ 2*ffstattext.getLength() + 4	3527	+ 2*ffstattext.getLength() + 4
3528	+ 2*ffentrymcr.getLength() + 4	3528	+ 2*ffentrymcr.getLength() + 4
3529	+ 2*ffexitmcr.getLength() + 4;	3529	+ 2*ffexitmcr.getLength() + 4;
3530	#ifdef OSL_BIGENDIAN	3530
3531	slen = SWAPLONG( slen );	3531	*pDataStrm << slen;
3532	#endif // OSL_BIGENDIAN	3532
3533	( (sal_uInt32 )aFldData ) = slen;
3534	int len = sizeof( aFldData );	3533	int len = sizeof( aFldData );
3535	OSL_ENSURE( len == 0x44, "SwWW8Writer::WriteFormData(..) - wrong aFldData length" );	3534	OSL_ENSURE( len == 0x44-sizeof(sal_uInt32), "SwWW8Writer::WriteFormData(..) - wrong aFldData length" );
3536	pDataStrm->Write( aFldData, len );	3535	pDataStrm->Write( aFldData, len );
3537		3536
3538	len = sizeof( aFldHeader );	3537	len = sizeof( aFldHeader );