editeng/source/editeng/impedit2.cxx | 6 ++----
editeng/source/editeng/impedit3.cxx | 7 -------
sd/qa/unit/data/xml/n593612_0.xml | 4 ++--
3 files changed, 4 insertions(+), 13 deletions(-)
New commits:
commit fc577e4f414b6fe838dff0163bceeea012c92de9
Author: Matúš Kukan <matus.ku...@collabora.com>
Date: Fri Jun 20 14:18:09 2014 +0200
Revert "bnc#882631: keep line visible if proportional line spacing is <
100%."
This reverts commit 339e5d44a2afa0f5309a970f1ff11968103e336a
and commit d1987a3eaccfc3add35e6b9f8307ede857c5468e
"fix sd_import_tests after e42c05c1f96832572e525d85d89590f56f5a29dd".
It would need more work and understanding, so just revert.
Also, the problem with bnc#882631 is somewhere else, though this helped too.
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index 8cf1d74..3140c16 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -4028,9 +4028,7 @@ void ImpEditEngine::CalcHeight( ParaPortion* pPortion )
{
OSL_ENSURE( pPortion->GetLines().Count(), "Paragraph with no lines in
ParaPortion::CalcHeight" );
for (sal_Int32 nLine = 0; nLine < pPortion->GetLines().Count();
++nLine)
- // Use GetTxtHeight() for first line, otherwise height is small
- // if the paragraph has proportional line spacing less than 100%.
- pPortion->nHeight += nLine ?
pPortion->GetLines()[nLine]->GetHeight() :
pPortion->GetLines()[nLine]->GetTxtHeight();
+ pPortion->nHeight += pPortion->GetLines()[nLine]->GetHeight();
if ( !aStatus.IsOutliner() )
{
@@ -4173,7 +4171,7 @@ Rectangle ImpEditEngine::GetEditCursor( ParaPortion*
pPortion, sal_Int32 nIndex,
Rectangle aEditCursor;
aEditCursor.Top() = nY;
- nY += pLine->GetTxtHeight();
+ nY += pLine->GetHeight();
aEditCursor.Bottom() = nY-1;
// Search within the line...
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 7678ef1..2881a81 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2924,13 +2924,6 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev,
Rectangle aClipRect, Point aSt
aTmpPos.X() += pLine->GetStartPosX();
aTmpPos.Y() += pLine->GetMaxAscent();
aStartPos.Y() += pLine->GetHeight();
- if (nLine == 0)
- {
- // First line needs to be visible, so add more space
if text height is bigger.
- const sal_Int32 nDiff = pLine->GetTxtHeight() -
pLine->GetHeight();
- aTmpPos.Y() += nDiff;
- aStartPos.Y() += nDiff;
- }
if (nLine != nLastLine)
aStartPos.Y() += nVertLineSpacing;
}
diff --git a/sd/qa/unit/data/xml/n593612_0.xml
b/sd/qa/unit/data/xml/n593612_0.xml
index b55385b..5d5189b 100644
--- a/sd/qa/unit/data/xml/n593612_0.xml
+++ b/sd/qa/unit/data/xml/n593612_0.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<XShapes>
- <XShape positionX="11429" positionY="1324" sizeX="2259" sizeY="15821"
type="com.sun.star.drawing.CustomShape" name="Rectangle 52"
text=" "
fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true"
textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE"
textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="254"
textRightDistance="254" textUpperDistance="127" textLowerDistance="127"
textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0"
textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0"
textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE"
textAnimationStartInside="false" textAnimationStopInside="false"
textWritingMode="LR_TB" fillStyle="SOLID" fillColor="3c8c93"
fillTransparence="0" fillTran
sparenceGradientName="">
+ <XShape positionX="11429" positionY="1324" sizeX="2259" sizeY="15192"
type="com.sun.star.drawing.CustomShape" name="Rectangle 52"
text=" "
fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true"
textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE"
textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="254"
textRightDistance="254" textUpperDistance="127" textLowerDistance="127"
textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0"
textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0"
textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE"
textAnimationStartInside="false" textAnimationStopInside="false"
textWritingMode="LR_TB" fillStyle="SOLID" fillColor="3c8c93"
fillTransparence="0" fillTran
sparenceGradientName="">
<FillTransparenceGradient style="LINEAR" startColor="000000"
endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50"
startIntensity="100" endIntensity="100" stepCount="0"/>
<FillGradient style="LINEAR" startColor="3465a4" endColor="ffffff" angle="0"
border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100"
stepCount="0"/>
<FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/>
@@ -10,7 +10,7 @@
<LineEnd/>
<Transformation>
<Line1 column1="2260.000000" column2="0.000000" column3="11429.000000"/>
- <Line2 column1="0.000000" column2="15822.000000" column3="1324.000000"/>
+ <Line2 column1="0.000000" column2="15193.000000" column3="1324.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<CustomShapeGeometry>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
