Attachment #78866 for issue #119523

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

Lines 5165-5173 Link Here

(-)filter/source/msfilter/svdfppt.cxx (-4 / +10 lines)
5165	if ( nMask & 0x4000 ) // pfSpaceAfter	5165	if ( nMask & 0x4000 ) // pfSpaceAfter
5166	rIn >> aSet.mpArry[ PPT_ParaAttr_LowerDist ];	5166	rIn >> aSet.mpArry[ PPT_ParaAttr_LowerDist ];
5167	if ( nMask & 0x100 ) // pfLeftMargin	5167	if ( nMask & 0x100 ) // pfLeftMargin
5168	rIn >> nDummy16;	5168	{
		5169	rIn >> aSet.mpArry[ PPT_ParaAttr_TextOfs ];
		5170	aSet.mnAttrSet \|= 1 << PPT_ParaAttr_TextOfs;
		5171	}
5169	if ( nMask & 0x400 ) // pfIndent	5172	if ( nMask & 0x400 ) // pfIndent
5170	rIn >> nDummy16;	5173	{
		5174	rIn >> aSet.mpArry[ PPT_ParaAttr_BulletOfs ];
		5175	aSet.mnAttrSet \|= 1 << PPT_ParaAttr_BulletOfs;
		5176	}
5171	if ( nMask & 0x8000 ) // pfDefaultTabSize	5177	if ( nMask & 0x8000 ) // pfDefaultTabSize
5172	rIn >> nDummy16;	5178	rIn >> nDummy16;
5173	if ( nMask & 0x100000 ) // pfTabStops	5179	if ( nMask & 0x100000 ) // pfTabStops
Lines 5199-5207 Link Here
5199	else	5205	else
5200	nCharCount = nStringLen;	5206	nCharCount = nStringLen;
5201		5207
5202	if ( rRuler.GetTextOfs( aParaPropSet.pParaSet->mnDepth, aSet.mpArry[ PPT_ParaAttr_TextOfs ] ) )	5208	if ( ( !( aSet.mnAttrSet & 1 << PPT_ParaAttr_TextOfs ) ) && rRuler.GetTextOfs( aParaPropSet.pParaSet->mnDepth, aSet.mpArry[ PPT_ParaAttr_TextOfs ] ) )
5203	aSet.mnAttrSet \|= 1 << PPT_ParaAttr_TextOfs;	5209	aSet.mnAttrSet \|= 1 << PPT_ParaAttr_TextOfs;
5204	if ( rRuler.GetBulletOfs( aParaPropSet.pParaSet->mnDepth, aSet.mpArry[ PPT_ParaAttr_BulletOfs ] ) )	5210	if ( ( !( aSet.mnAttrSet & 1 << PPT_ParaAttr_BulletOfs ) ) && rRuler.GetBulletOfs( aParaPropSet.pParaSet->mnDepth, aSet.mpArry[ PPT_ParaAttr_BulletOfs ] ) )
5205	aSet.mnAttrSet \|= 1 << PPT_ParaAttr_BulletOfs;	5211	aSet.mnAttrSet \|= 1 << PPT_ParaAttr_BulletOfs;
5206	if ( rRuler.GetDefaultTab( aParaPropSet.pParaSet->mnDepth, aSet.mpArry[ PPT_ParaAttr_DefaultTab ] ) )	5212	if ( rRuler.GetDefaultTab( aParaPropSet.pParaSet->mnDepth, aSet.mpArry[ PPT_ParaAttr_DefaultTab ] ) )
5207	aSet.mnAttrSet \|= 1 << PPT_ParaAttr_DefaultTab;	5213	aSet.mnAttrSet \|= 1 << PPT_ParaAttr_DefaultTab;

Lines 1406-1411 Link Here

(-)sd/source/filter/eppt/epptso.cxx (+11 lines)
1406	nPropertyFlags \|= 1; // turn off bullet explicit	1406	nPropertyFlags \|= 1; // turn off bullet explicit
1407	nBulletFlags = 0;	1407	nBulletFlags = 0;
1408	}	1408	}
		1409
		1410	// Write nTextOfs and nBullets
		1411	if ( mpStyleSheet->IsHardAttribute( nInstance, nDepth, ParaAttr_TextOfs, pPara->nTextOfs ) )
		1412	nPropertyFlags \|= 0x100;
		1413	if ( mpStyleSheet->IsHardAttribute( nInstance, nDepth, ParaAttr_BulletOfs, pPara->nBulletOfs ))
		1414	nPropertyFlags \|= 0x400;
		1415
1409	FontCollectionEntry aFontDescEntry( pPara->aFontDesc.Name, pPara->aFontDesc.Family, pPara->aFontDesc.Pitch, pPara->aFontDesc.CharSet );	1416	FontCollectionEntry aFontDescEntry( pPara->aFontDesc.Name, pPara->aFontDesc.Family, pPara->aFontDesc.Pitch, pPara->aFontDesc.CharSet );
1410	sal_uInt16 nFontId = (sal_uInt16)maFontCollection.GetId( aFontDescEntry );	1417	sal_uInt16 nFontId = (sal_uInt16)maFontCollection.GetId( aFontDescEntry );
1411		1418
Lines 1444-1449 Link Here
1444	rOut << (sal_uInt16)( pPara->mnLineSpacingTop );	1451	rOut << (sal_uInt16)( pPara->mnLineSpacingTop );
1445	if ( nPropertyFlags & 0x00004000 )	1452	if ( nPropertyFlags & 0x00004000 )
1446	rOut << (sal_uInt16)( pPara->mnLineSpacingBottom );	1453	rOut << (sal_uInt16)( pPara->mnLineSpacingBottom );
		1454	if ( nPropertyFlags & 0x100 )
		1455	rOut << (sal_uInt16)(pPara->nTextOfs);
		1456	if ( nPropertyFlags & 0x400 )
		1457	rOut << (sal_uInt16)(pPara->nBulletOfs);
1447	if ( nPropertyFlags & 0x000e0000 )	1458	if ( nPropertyFlags & 0x000e0000 )
1448	{	1459	{
1449	sal_uInt16 nAsianSettings = 0;	1460	sal_uInt16 nAsianSettings = 0;

Return to issue 119523