Attachment #43591 for issue #75114

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




    {
        aStdFont = pEditEngine->GetStandardFont( nPara );
    }

	Font aBulletFont;
	aBulletFont = aStdFont;
   if ( pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL )
     {
		aBulletFont = *pFmt->GetBulletFont();
     }
	else
     { 
		aBulletFont = aStdFont;
        aBulletFont.SetUnderline( UNDERLINE_NONE );
        aBulletFont.SetStrikeout( STRIKEOUT_NONE );
        aBulletFont.SetEmphasisMark( EMPHASISMARK_NONE );
        aBulletFont.SetRelief( RELIEF_NONE );
    }
    // #107508# Use original scale...
	USHORT nScale = /* pEditEngine->IsFlatMode() ? DEFAULT_SCALE : */ pFmt->GetBulletRelSize();
	ULONG nScaledLineHeight = aStdFont.GetSize().Height();

Return to issue 75114

Lines 992-1012 Link Here

(-)svx.old/source/outliner/outliner.cxx (-10 / +1 lines)
992	{	992	{
993	aStdFont = pEditEngine->GetStandardFont( nPara );	993	aStdFont = pEditEngine->GetStandardFont( nPara );
994	}	994	}
995
996	Font aBulletFont;	995	Font aBulletFont;
997		996	aBulletFont = aStdFont;
998	if ( pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL )
999	{
1000	aBulletFont = *pFmt->GetBulletFont();
1001	}
1002	else
1003	{
1004	aBulletFont = aStdFont;
1005	aBulletFont.SetUnderline( UNDERLINE_NONE );	997	aBulletFont.SetUnderline( UNDERLINE_NONE );
1006	aBulletFont.SetStrikeout( STRIKEOUT_NONE );	998	aBulletFont.SetStrikeout( STRIKEOUT_NONE );
1007	aBulletFont.SetEmphasisMark( EMPHASISMARK_NONE );	999	aBulletFont.SetEmphasisMark( EMPHASISMARK_NONE );
1008	aBulletFont.SetRelief( RELIEF_NONE );	1000	aBulletFont.SetRelief( RELIEF_NONE );
1009	}
1010	// #107508# Use original scale...	1001	// #107508# Use original scale...
1011	USHORT nScale = /* pEditEngine->IsFlatMode() ? DEFAULT_SCALE : */ pFmt->GetBulletRelSize();	1002	USHORT nScale = /* pEditEngine->IsFlatMode() ? DEFAULT_SCALE : */ pFmt->GetBulletRelSize();
1012	ULONG nScaledLineHeight = aStdFont.GetSize().Height();	1003	ULONG nScaledLineHeight = aStdFont.GetSize().Height();