Attachment #9833 for issue #20282

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




			sal_uInt16 nPortions = pParaPortion->GetTextPortions().Count();
			for ( sal_uInt16 nTP = 0; nTP < nPortions; nTP++ )
			{
printf("here we are impedit3 nTP=%d nPortions=%d\n",nTP,nPortions);
printf("step2 nPos=%d nStart=%d nEnd=%d\n",nPos,nStart,nEnd);
				// Es darf kein Start/Ende im geloeschten Bereich liegen.
				TextPortion* const pTP = pParaPortion->GetTextPortions()[ nTP ];
				nPos += pTP->GetLen();
printf("step3 nPos=%d nStart=%d nEnd=%d\n",nPos,nStart,nEnd);
				if ( ( nPos > nStart ) && ( nPos < nEnd ) )
				{
					printf("in the break if\n");
					bQuickFormat = sal_False;
					break;
				}
				printf("passed the break if\n");
			}
		}
	}


    if ( bEmptyNodeWithPolygon )
	{
printf("in here 5\n");
		TextPortion* pDummyPortion = new TextPortion( 0 );
		pParaPortion->GetTextPortions().Reset();
		pParaPortion->GetTextPortions().Insert( pDummyPortion, 0 );
	}
	else if ( bQuickFormat )
	{
printf("in here 6\n");
		// schnellere Methode:
		RecalcTextPortion( pParaPortion, nInvalidStart, nInvalidDiff );
	}
	else	// nRealInvalidStart kann vor InvalidStart liegen, weil Portions geloescht....
    {
printf("in here 7\n");
		CreateTextPortions( pParaPortion, nRealInvalidStart );
    }



	BOOL bForceOneRun = bEmptyNodeWithPolygon;
    BOOL bCompressedChars = FALSE;
printf(" before the while nIndex = %d pNode->Len()=%d\n",nIndex,pNode->Len());

	while ( ( nIndex < pNode->Len() ) || bForceOneRun )
	{
printf(" start while: nIndex = %d pNode->Len()=%d\n",nIndex,pNode->Len());
		bForceOneRun = FALSE;

		sal_Bool bEOL = sal_False;

		long nStartX = GetXValue( rLRItem.GetTxtLeft() );
		if ( nIndex == 0 )
		{
printf("if nIndex==0\n");
			long nFI = GetXValue( rLRItem.GetTxtFirstLineOfst() );
			nStartX += nFI;


				if ( pParaPortion->GetBulletX() > nStartX )
					nStartX = pParaPortion->GetBulletX();
			}

		}



		EditCharAttrib* pNextFeature = pNode->GetCharAttribs().FindFeature( pLine->GetStart() );
		while ( ( nTmpWidth < nXWidth ) && !bEOL && ( nTmpPortion < pParaPortion->GetTextPortions().Count() ) )
		{
printf("in while 2\n");
			nPortionStart = nTmpPos;
			pPortion = pParaPortion->GetTextPortions().GetObject( nTmpPortion );
			if ( pPortion->GetKind() == PORTIONKIND_HYPHENATOR )

		GetRefDevice()->Pop();

    GetRefDevice()->SetLayoutMode( nOldLayoutMode );
printf("here at the end\n");

	return bHeightChanged;
}

Return to issue 20282

Lines 681-694 Link Here

(-)svx/source/editeng/impedit3.cxx (+14 lines)
681	sal_uInt16 nPortions = pParaPortion->GetTextPortions().Count();	681	sal_uInt16 nPortions = pParaPortion->GetTextPortions().Count();
682	for ( sal_uInt16 nTP = 0; nTP < nPortions; nTP++ )	682	for ( sal_uInt16 nTP = 0; nTP < nPortions; nTP++ )
683	{	683	{
		684	printf("here we are impedit3 nTP=%d nPortions=%d\n",nTP,nPortions);
		685	printf("step2 nPos=%d nStart=%d nEnd=%d\n",nPos,nStart,nEnd);
684	// Es darf kein Start/Ende im geloeschten Bereich liegen.	686	// Es darf kein Start/Ende im geloeschten Bereich liegen.
685	TextPortion* const pTP = pParaPortion->GetTextPortions()[ nTP ];	687	TextPortion* const pTP = pParaPortion->GetTextPortions()[ nTP ];
686	nPos += pTP->GetLen();	688	nPos += pTP->GetLen();
		689	printf("step3 nPos=%d nStart=%d nEnd=%d\n",nPos,nStart,nEnd);
687	if ( ( nPos > nStart ) && ( nPos < nEnd ) )	690	if ( ( nPos > nStart ) && ( nPos < nEnd ) )
688	{	691	{
		692	printf("in the break if\n");
689	bQuickFormat = sal_False;	693	bQuickFormat = sal_False;
690	break;	694	break;
691	}	695	}
		696	printf("passed the break if\n");
692	}	697	}
693	}	698	}
694	}	699	}
Lines 702-718 Link Here
702		707
703	if ( bEmptyNodeWithPolygon )	708	if ( bEmptyNodeWithPolygon )
704	{	709	{
		710	printf("in here 5\n");
705	TextPortion* pDummyPortion = new TextPortion( 0 );	711	TextPortion* pDummyPortion = new TextPortion( 0 );
706	pParaPortion->GetTextPortions().Reset();	712	pParaPortion->GetTextPortions().Reset();
707	pParaPortion->GetTextPortions().Insert( pDummyPortion, 0 );	713	pParaPortion->GetTextPortions().Insert( pDummyPortion, 0 );
708	}	714	}
709	else if ( bQuickFormat )	715	else if ( bQuickFormat )
710	{	716	{
		717	printf("in here 6\n");
711	// schnellere Methode:	718	// schnellere Methode:
712	RecalcTextPortion( pParaPortion, nInvalidStart, nInvalidDiff );	719	RecalcTextPortion( pParaPortion, nInvalidStart, nInvalidDiff );
713	}	720	}
714	else // nRealInvalidStart kann vor InvalidStart liegen, weil Portions geloescht....	721	else // nRealInvalidStart kann vor InvalidStart liegen, weil Portions geloescht....
715	{	722	{
		723	printf("in here 7\n");
716	CreateTextPortions( pParaPortion, nRealInvalidStart );	724	CreateTextPortions( pParaPortion, nRealInvalidStart );
717	}	725	}
718		726
Lines 769-777 Link Here
769		777
770	BOOL bForceOneRun = bEmptyNodeWithPolygon;	778	BOOL bForceOneRun = bEmptyNodeWithPolygon;
771	BOOL bCompressedChars = FALSE;	779	BOOL bCompressedChars = FALSE;
		780	printf(" before the while nIndex = %d pNode->Len()=%d\n",nIndex,pNode->Len());
772		781
773	while ( ( nIndex < pNode->Len() ) \|\| bForceOneRun )	782	while ( ( nIndex < pNode->Len() ) \|\| bForceOneRun )
774	{	783	{
		784	printf(" start while: nIndex = %d pNode->Len()=%d\n",nIndex,pNode->Len());
775	bForceOneRun = FALSE;	785	bForceOneRun = FALSE;
776		786
777	sal_Bool bEOL = sal_False;	787	sal_Bool bEOL = sal_False;
Lines 782-787 Link Here
782	long nStartX = GetXValue( rLRItem.GetTxtLeft() );	792	long nStartX = GetXValue( rLRItem.GetTxtLeft() );
783	if ( nIndex == 0 )	793	if ( nIndex == 0 )
784	{	794	{
		795	printf("if nIndex==0\n");
785	long nFI = GetXValue( rLRItem.GetTxtFirstLineOfst() );	796	long nFI = GetXValue( rLRItem.GetTxtFirstLineOfst() );
786	nStartX += nFI;	797	nStartX += nFI;
787		798
Lines 791-796 Link Here
791	if ( pParaPortion->GetBulletX() > nStartX )	802	if ( pParaPortion->GetBulletX() > nStartX )
792	nStartX = pParaPortion->GetBulletX();	803	nStartX = pParaPortion->GetBulletX();
793	}	804	}
		805
794	}	806	}
795		807
796		808
Lines 908-913 Link Here
908	EditCharAttrib* pNextFeature = pNode->GetCharAttribs().FindFeature( pLine->GetStart() );	920	EditCharAttrib* pNextFeature = pNode->GetCharAttribs().FindFeature( pLine->GetStart() );
909	while ( ( nTmpWidth < nXWidth ) && !bEOL && ( nTmpPortion < pParaPortion->GetTextPortions().Count() ) )	921	while ( ( nTmpWidth < nXWidth ) && !bEOL && ( nTmpPortion < pParaPortion->GetTextPortions().Count() ) )
910	{	922	{
		923	printf("in while 2\n");
911	nPortionStart = nTmpPos;	924	nPortionStart = nTmpPos;
912	pPortion = pParaPortion->GetTextPortions().GetObject( nTmpPortion );	925	pPortion = pParaPortion->GetTextPortions().GetObject( nTmpPortion );
913	if ( pPortion->GetKind() == PORTIONKIND_HYPHENATOR )	926	if ( pPortion->GetKind() == PORTIONKIND_HYPHENATOR )
Lines 1558-1563 Link Here
1558	GetRefDevice()->Pop();	1571	GetRefDevice()->Pop();
1559		1572
1560	GetRefDevice()->SetLayoutMode( nOldLayoutMode );	1573	GetRefDevice()->SetLayoutMode( nOldLayoutMode );
		1574	printf("here at the end\n");
1561		1575
1562	return bHeightChanged;	1576	return bHeightChanged;
1563	}	1577	}