Kaydet (Commit) fe1998c1 authored tarafından Thorsten Behrens's avatar Thorsten Behrens

Revert "aw084: #i108052# Added code to mimic old behaviour and call user layout…

Revert "aw084: #i108052# Added code to mimic old behaviour and call user layout link when empty paragraph is rendered"

This reverts commit 9d40293f.

The change was causing extra paragraph markers to be emitted, e.g.
leading to fdo#43837 and fdo#43684.
üst 854dc02f
...@@ -2911,27 +2911,6 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta ...@@ -2911,27 +2911,6 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
// Over the Portions of the line ... // Over the Portions of the line ...
// -------------------------------------------------- // --------------------------------------------------
sal_uInt16 nIndex = pLine->GetStart(); sal_uInt16 nIndex = pLine->GetStart();
// #i108052# When stripping a callback for empty paragraphs is needed. This
// was somehow lost/removed/killed by making the TextPortions with empty
// paragraph to type PORTIONKIND_TAB instead of PORTIONKIND_TEXT. Adding here
// since I could not find out who and why this has changed.
if(bStripOnly && pLine->GetStartPortion() == pLine->GetEndPortion())
{
const Color aOverlineColor(pOutDev->GetOverlineColor());
const Color aTextLineColor(pOutDev->GetTextLineColor());
GetEditEnginePtr()->DrawingText(
aTmpPos, String(), 0, 0, 0,
aTmpFont, n, nIndex, 0,
0,
0,
false, true, false, // support for EOL/EOP TEXT comments
0,
aOverlineColor,
aTextLineColor);
}
for ( sal_uInt16 y = pLine->GetStartPortion(); y <= pLine->GetEndPortion(); y++ ) for ( sal_uInt16 y = pLine->GetStartPortion(); y <= pLine->GetEndPortion(); y++ )
{ {
DBG_ASSERT( pPortion->GetTextPortions().Count(), "Line without Textportion in Paint!" ); DBG_ASSERT( pPortion->GetTextPortions().Count(), "Line without Textportion in Paint!" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment