oox/source/drawingml/textparagraph.cxx | 3 -
sd/qa/unit/data/n593612.pptx |binary
sd/qa/unit/data/xml/n593612_0.xml | 67 +++++++++++++++++++++++++++++++++
sd/qa/unit/import-tests.cxx | 1
4 files changed, 69 insertions(+), 2 deletions(-)
New commits:
commit 422ce23ea6cb7ddad6db97d752ffe5fdf6ce0d3a
Author: Felix Zhang <fezh...@suse.com>
Date: Fri Jun 21 10:00:19 2013 +0200
bnc#593612: font size: Unit test.
Change-Id: I3cda692b93f0e08c3e666e03b04966abaca00057
diff --git a/sd/qa/unit/data/n593612.pptx b/sd/qa/unit/data/n593612.pptx
new file mode 100644
index 0000000..2ba3eeb
Binary files /dev/null and b/sd/qa/unit/data/n593612.pptx differ
diff --git a/sd/qa/unit/data/xml/n593612_0.xml
b/sd/qa/unit/data/xml/n593612_0.xml
new file mode 100644
index 0000000..1fa2c64
--- /dev/null
+++ b/sd/qa/unit/data/xml/n593612_0.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<XShapes>
+ <XShape positionX="11429" positionY="1324" sizeX="2259" sizeY="15192"
type="com.sun.star.drawing.CustomShape" name="Rectangle 52"
text=" "
fontHeight="18.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"
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="3465af" endColor="ffffff" angle="0"
border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100"
stepCount="0"/>
+ <FillHatch style="SINGLE" color="3465af" distance="20" angle="0"/>
+ <FillBitmap width="32" height="32"/>
+ <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20"
distance="20"/>
+ <LineStart/>
+ <LineEnd/>
+ <Transformation>
+ <Line1 column1="2260.000000" column2="0.000000" column3="11429.000000"/>
+ <Line2 column1="0.000000" column2="15193.000000" column3="1324.000000"/>
+ <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
+ </Transformation>
+ <CustomShapeGeometry>
+ <PropertyValue name="AdjustmentValues">
+ <AdjustmentValues/>
+ </PropertyValue>
+ <PropertyValue name="Equations" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Handles">
+ <Handles/>
+ </PropertyValue>
+ <PropertyValue name="IsPostRotateAngle" value="true" handle="0"
propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="MirroredX" value="false" handle="0"
propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="MirroredY" value="false" handle="0"
propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Path">
+ <Path>
+ <PropertyValue name="Coordinates">
+ <Coordinates>
+ <EnhancedCustomShapeParameterPair>
+ <First value="0" type="0"/>
+ <Second value="0" type="0"/>
+ </EnhancedCustomShapeParameterPair>
+ <EnhancedCustomShapeParameterPair>
+ <First value="3" type="1"/>
+ <Second value="0" type="0"/>
+ </EnhancedCustomShapeParameterPair>
+ <EnhancedCustomShapeParameterPair>
+ <First value="3" type="1"/>
+ <Second value="2" type="1"/>
+ </EnhancedCustomShapeParameterPair>
+ <EnhancedCustomShapeParameterPair>
+ <First value="0" type="0"/>
+ <Second value="2" type="1"/>
+ </EnhancedCustomShapeParameterPair>
+ </Coordinates>
+ </PropertyValue>
+ <PropertyValue name="Segments">
+ <Segments>
+ <EnhancedCustomShapeSegment command="1" count="1"/>
+ <EnhancedCustomShapeSegment command="2" count="3"/>
+ <EnhancedCustomShapeSegment command="4" count="0"/>
+ <EnhancedCustomShapeSegment command="5" count="0"/>
+ </Segments>
+ </PropertyValue>
+ <PropertyValue name="TextFrames" handle="0" propertyState="DIRECT_VALUE"/>
+ </Path>
+ </PropertyValue>
+ <PropertyValue name="TextPreRotateAngle" value="0" handle="0"
propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Type" value="ooxml-rect" handle="0"
propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="ViewBox">
+ <ViewBox x="0" y="0" width="0" height="0"/>
+ </PropertyValue>
+ </CustomShapeGeometry>
+ </XShape>
+</XShapes>
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 0957c02..bebda14 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -68,6 +68,7 @@ void SdFiltersTest::testDocumentLayout()
// FIXME re-enable again when a better fix is found { "n819614.pptx",
"xml/n819614_" },
{ "n820786.pptx", "xml/n820786_" },
{ "n762695.pptx", "xml/n762695_" },
+ { "n593612.pptx", "xml/n593612_" },
};
for ( int i = 0; i < static_cast< int >( SAL_N_ELEMENTS( aFilesToCompare )
); ++i )
commit 9fac61d21c886c3793b14628eb1de59d88bf45f8
Author: Felix Zhang <fezh...@suse.com>
Date: Fri Jun 21 09:55:07 2013 +0200
bnc#593612: font size: override para prop with run prop
Change-Id: I4d0899c8f722150176cb3479bdb3b4a81c1b3eb8
diff --git a/oox/source/drawingml/textparagraph.cxx
b/oox/source/drawingml/textparagraph.cxx
index c4e82b3..7bb719a 100644
--- a/oox/source/drawingml/textparagraph.cxx
+++ b/oox/source/drawingml/textparagraph.cxx
@@ -103,19 +103,18 @@ void TextParagraph::insertAt(
PropertyMap aioBulletList;
Reference< XPropertySet > xProps( xAt, UNO_QUERY);
- float fCharacterSize = nCharHeight > 0 ? GetFontHeight( nCharHeight )
: 18;
if ( pTextParagraphStyle.get() )
{
TextParagraphProperties aParaProp;
aParaProp.apply( *pTextParagraphStyle );
aParaProp.apply( maProperties );
- fCharacterSize = pTextParagraphStyle->getCharHeightPoints(
fCharacterSize );
// bullets have same color as following texts by default
if( !aioBulletList.hasProperty( PROP_BulletColor ) &&
maRuns.size() > 0
&&
(*maRuns.begin())->getTextCharacterProperties().maCharColor.isUsed() )
aioBulletList[ PROP_BulletColor ] <<=
(*maRuns.begin())->getTextCharacterProperties().maCharColor.getColor(
rFilterBase.getGraphicHelper() );
+ float fCharacterSize = nCharHeight > 0 ? GetFontHeight (
nCharHeight ) : pTextParagraphStyle->getCharHeightPoints( 18 );
aParaProp.pushToPropSet( &rFilterBase, xProps, aioBulletList,
&pTextParagraphStyle->getBulletList(), sal_True, fCharacterSize, true );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
