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

(-)sw/source/core/text/itrform2.cxx (-1 / +16 lines)
Lines 61-66 Link Here
61
#define _SVSTDARR_LONGS
61
#define _SVSTDARR_LONGS
62
#include <svl/svstdarr.hxx>
62
#include <svl/svstdarr.hxx>
63
#include <unotools/charclass.hxx>
63
#include <unotools/charclass.hxx>
64
#include <editeng/ulspitem.hxx>
64
65
65
#if OSL_DEBUG_LEVEL > 1
66
#if OSL_DEBUG_LEVEL > 1
66
#include <ndtxt.hxx>		// pSwpHints, Ausgabeoperator
67
#include <ndtxt.hxx>		// pSwpHints, Ausgabeoperator
Lines 1755-1761 Link Here
1755
                    KSHORT nAsc = ( 4 * nLineHeight ) / 5;  // 80%
1756
                    KSHORT nAsc = ( 4 * nLineHeight ) / 5;  // 80%
1756
                    if( nAsc < pCurr->GetAscent() ||
1757
                    if( nAsc < pCurr->GetAscent() ||
1757
                        nLineHeight - nAsc < pCurr->Height() - pCurr->GetAscent() )
1758
                        nLineHeight - nAsc < pCurr->Height() - pCurr->GetAscent() )
1758
                        pCurr->SetClipping( sal_True );
1759
					{
1760
						sal_Bool bIsClip( sal_True );
1761
						if( IsParaLine() )
1762
						{
1763
							if( pAttrSet != NULL )
1764
							{
1765
								const SvxULSpaceItem aULSpace(( const SvxULSpaceItem& )pAttrSet->Get( RES_UL_SPACE ));
1766
								const sal_uInt16& nUpperSapcing = aULSpace.GetUpper();								
1767
								sal_uInt32 nSpacingForClip = nLineHeight + nUpperSapcing;
1768
								if( nSpacingForClip >= pCurr->GetAscent() )	
1769
									bIsClip = sal_False;
1770
							}
1771
						}
1772
						pCurr->SetClipping( bIsClip );
1773
					}
1759
                    pCurr->Height( nLineHeight );
1774
                    pCurr->Height( nLineHeight );
1760
                    pCurr->SetAscent( nAsc );
1775
                    pCurr->SetAscent( nAsc );
1761
                    pInf->GetParaPortion()->SetFixLineHeight();
1776
                    pInf->GetParaPortion()->SetFixLineHeight();

Return to issue 119476