sd/qa/unit/data/xml/fdo64586_0.xml | 4 ++--
sd/qa/unit/data/xml/n758621_0.xml | 8 ++++----
sd/qa/unit/data/xml/n758621_1.xml | 6 +++---
svx/source/svdraw/svdotext.cxx | 10 ++++------
4 files changed, 13 insertions(+), 15 deletions(-)
New commits:
commit 0a9cc5ce4d2d814587dba16ed8acc7eb38e347c8
Author: David Tardon <dtar...@redhat.com>
Date: Tue Mar 25 08:45:18 2014 +0100
Revert "avoid infinite loop when setting vert. text dir."
The problem is already fixed by
33c310b6ff9feb277c001ce61db96864baedc3bc and
1a67b7cc3d5dc3dcd0de0e247f638c33d57dea1b .
This reverts commit 363119a9f2f0710a55530909330efb343d5a8bae.
Change-Id: Ieac14da9f37849cd51d14ed0035b3808b8dd77c0
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 3270545..8e89fb2 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1617,17 +1617,15 @@ void SdrTextObj::SetVerticalWriting(bool bVertical)
case SDRTEXTHORZADJUST_BLOCK:
aNewSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_BLOCK)); break;
}
+ SetObjectItemSet(aNewSet);
+
pOutlinerParaObject = GetOutlinerParaObject();
if( pOutlinerParaObject )
{
- // Set ParaObject orientation accordingly. This _must_ be
- // done before applying the updated item set, otherwise we
- // get stuck in a loop leading to eventual stack overflow.
+ // set ParaObject orientation accordingly
pOutlinerParaObject->SetVertical(bVertical);
}
- SetObjectItemSet(aNewSet);
-
// restore object size
SetSnapRect(aObjectRect);
}
commit 1e188aa0043907c478989b3e863b2719af02d360
Author: David Tardon <dtar...@redhat.com>
Date: Tue Mar 25 08:44:11 2014 +0100
update test files
Change-Id: I937a85fa7bda7df13e79e704973c21bfc732ba66
diff --git a/sd/qa/unit/data/xml/fdo64586_0.xml
b/sd/qa/unit/data/xml/fdo64586_0.xml
index e5c4316..a248783 100644
--- a/sd/qa/unit/data/xml/fdo64586_0.xml
+++ b/sd/qa/unit/data/xml/fdo64586_0.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<XShapes>
- <XShape positionX="1397" positionY="838" sizeX="25197" sizeY="3507"
type="com.sun.star.presentation.TitleTextShape" fontHeight="44.000000"
fontColor="000000" textAutoGrowHeight="true" textAutoGrowWidth="false"
textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK"
textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0"
textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0"
textMaximumFrameWidth="0" textMinimumFrameHeight="3507"
textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0"
textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE"
textAnimationStartInside="false" textAnimationStopInside="false"
textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff"
fillTransparence="0" fillTransparenceGradientName="">
+ <XShape positionX="1397" positionY="838" sizeX="25197" sizeY="3506"
type="com.sun.star.presentation.TitleTextShape" fontHeight="44.000000"
fontColor="000000" textAutoGrowHeight="true" textAutoGrowWidth="false"
textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK"
textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0"
textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0"
textMaximumFrameWidth="0" textMinimumFrameHeight="3506"
textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0"
textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE"
textAnimationStartInside="false" textAnimationStopInside="false"
textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff"
fillTransparence="0" fillTransparenceGradientName="">
<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="000000" 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="25198.000000" column2="0.000000" column3="1397.000000"/>
- <Line2 column1="0.000000" column2="3508.000000" column3="838.000000"/>
+ <Line2 column1="0.000000" column2="3507.000000" column3="838.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
diff --git a/sd/qa/unit/data/xml/n758621_0.xml
b/sd/qa/unit/data/xml/n758621_0.xml
index b0523b0..754be1d 100644
--- a/sd/qa/unit/data/xml/n758621_0.xml
+++ b/sd/qa/unit/data/xml/n758621_0.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<XShapes>
- <XShape positionX="12042" positionY="1774" sizeX="12087" sizeY="9782"
type="com.sun.star.presentation.TitleTextShape" fontHeight="60.000000"
fontColor="004990" textAutoGrowHeight="true" textAutoGrowWidth="false"
textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT"
textVerticalAdjust="CENTER" textLeftDistance="250" textRightDistance="250"
textUpperDistance="130" textLowerDistance="130" textMaximumFrameHeight="0"
textMaximumFrameWidth="0" textMinimumFrameHeight="9522"
textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0"
textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE"
textAnimationStartInside="false" textAnimationStopInside="false"
textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff"
fillTransparence="0" fillTransparenceGradientName="">
+ <XShape positionX="12042" positionY="1904" sizeX="12087" sizeY="9521"
type="com.sun.star.presentation.TitleTextShape" fontHeight="60.000000"
fontColor="004990" textAutoGrowHeight="true" textAutoGrowWidth="false"
textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT"
textVerticalAdjust="CENTER" textLeftDistance="250" textRightDistance="250"
textUpperDistance="130" textLowerDistance="130" textMaximumFrameHeight="0"
textMaximumFrameWidth="0" textMinimumFrameHeight="9261"
textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0"
textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE"
textAnimationStartInside="false" textAnimationStopInside="false"
textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff"
fillTransparence="0" fillTransparenceGradientName="">
<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="000000" 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,11 +10,11 @@
<LineEnd/>
<Transformation>
<Line1 column1="12088.000000" column2="0.000000" column3="12042.000000"/>
- <Line2 column1="0.000000" column2="9783.000000" column3="1774.000000"/>
+ <Line2 column1="0.000000" column2="9522.000000" column3="1904.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="14176" positionY="13123" sizeX="9953" sizeY="3811"
type="com.sun.star.presentation.SubtitleShape" fontHeight="36.000000"
fontColor="92d050" textAutoGrowHeight="true" textAutoGrowWidth="false"
textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT"
textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0"
textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0"
textMaximumFrameWidth="0" textMinimumFrameHeight="3811"
textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0"
textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE"
textAnimationStartInside="false" textAnimationStopInside="false"
textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff"
fillTransparence="0" fillTransparenceGradientName="">
+ <XShape positionX="14176" positionY="13123" sizeX="9953" sizeY="3810"
type="com.sun.star.presentation.SubtitleShape" fontHeight="36.000000"
fontColor="92d050" textAutoGrowHeight="true" textAutoGrowWidth="false"
textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT"
textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0"
textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0"
textMaximumFrameWidth="0" textMinimumFrameHeight="3810"
textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0"
textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE"
textAnimationStartInside="false" textAnimationStopInside="false"
textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff"
fillTransparence="0" fillTransparenceGradientName="">
<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="000000" 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"/>
@@ -24,7 +24,7 @@
<LineEnd/>
<Transformation>
<Line1 column1="9954.000000" column2="0.000000" column3="14176.000000"/>
- <Line2 column1="0.000000" column2="3812.000000" column3="13123.000000"/>
+ <Line2 column1="0.000000" column2="3811.000000" column3="13123.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
diff --git a/sd/qa/unit/data/xml/n758621_1.xml
b/sd/qa/unit/data/xml/n758621_1.xml
index 7489ff2..0f71931 100644
--- a/sd/qa/unit/data/xml/n758621_1.xml
+++ b/sd/qa/unit/data/xml/n758621_1.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<XShapes>
- <XShape positionX="1485" positionY="504" sizeX="18411" sizeY="2166"
type="com.sun.star.presentation.TitleTextShape" fontHeight="40.000000"
fontColor="ff0000" textAutoGrowHeight="true" textAutoGrowWidth="false"
textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT"
textVerticalAdjust="CENTER" textLeftDistance="250" textRightDistance="250"
textUpperDistance="130" textLowerDistance="130" textMaximumFrameHeight="0"
textMaximumFrameWidth="0" textMinimumFrameHeight="1906"
textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0"
textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE"
textAnimationStartInside="false" textAnimationStopInside="false"
textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff"
fillTransparence="0" fillTransparenceGradientName="">
+ <XShape positionX="1485" positionY="610" sizeX="18411" sizeY="1954"
type="com.sun.star.presentation.TitleTextShape" fontHeight="40.000000"
fontColor="ff0000" textAutoGrowHeight="true" textAutoGrowWidth="false"
textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT"
textVerticalAdjust="CENTER" textLeftDistance="250" textRightDistance="250"
textUpperDistance="130" textLowerDistance="130" textMaximumFrameHeight="0"
textMaximumFrameWidth="0" textMinimumFrameHeight="1645"
textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0"
textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE"
textAnimationStartInside="false" textAnimationStopInside="false"
textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff"
fillTransparence="0" fillTransparenceGradientName="">
<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="000000" 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,11 +10,11 @@
<LineEnd/>
<Transformation>
<Line1 column1="18412.000000" column2="0.000000" column3="1485.000000"/>
- <Line2 column1="0.000000" column2="2167.000000" column3="504.000000"/>
+ <Line2 column1="0.000000" column2="1955.000000" column3="610.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="1692" positionY="4444" sizeX="22217" sizeY="12061"
type="com.sun.star.presentation.OutlinerShape" fontHeight="24.000000"
fontColor="000000" textAutoGrowHeight="false" textAutoGrowWidth="false"
textContourFrame="false" textFitToSize="AUTOFIT" textHorizontalAdjust="LEFT"
textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250"
textUpperDistance="130" textLowerDistance="130" textMaximumFrameHeight="0"
textMaximumFrameWidth="0" textMinimumFrameHeight="12062"
textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0"
textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE"
textAnimationStartInside="false" textAnimationStopInside="false"
textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff"
fillTransparence="0" fillTransparenceGradientName="">
+ <XShape positionX="1692" positionY="4444" sizeX="22217" sizeY="12061"
type="com.sun.star.presentation.OutlinerShape" fontHeight="24.000000"
fontColor="000000" textAutoGrowHeight="false" textAutoGrowWidth="false"
textContourFrame="false" textFitToSize="AUTOFIT" textHorizontalAdjust="LEFT"
textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250"
textUpperDistance="130" textLowerDistance="130" textMaximumFrameHeight="0"
textMaximumFrameWidth="0" textMinimumFrameHeight="11811"
textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0"
textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE"
textAnimationStartInside="false" textAnimationStopInside="false"
textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff"
fillTransparence="0" fillTransparenceGradientName="">
<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="000000" 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"/>
commit 9ee0cf63a1dafebb673fbee9ccfc82a56fd050d4
Author: Armin Le Grand <a...@apache.org>
Date: Thu Sep 19 11:34:41 2013 +0000
i115391 corected from isLocked to IsPasteResize which was used in modifiers
for CustomShape and TextShape
(cherry picked from commit 473a118a62842270b85713d0ab0dc247b5778439)
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 170c5ec..3270545 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -566,7 +566,7 @@ bool SdrTextObj::NbcSetMaxTextFrameHeight(long nHgt)
// states of IsAutoGrowWidth/Height to correctly set TextMinFrameWidth/Height
void SdrTextObj::AdaptTextMinSize()
{
- if(bTextFrame && (!pModel || !pModel->isLocked()))
+ if(bTextFrame && (!pModel || !pModel->IsPasteResize()))
{
const bool bW(IsAutoGrowWidth());
const bool bH(IsAutoGrowHeight());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
