Skip to content

C
core
Kaydet (Commit) 91d5cebb authored tarafından Vasily Melenchuk's avatar Vasily Melenchuk Kaydeden (comit) Thorsten Behrens
Dosyalara gözat
Seçenekler

tdf#100491: Reduce DOCX shapes arrow line ending size multiplier 

Older arrow line endings are quite big comparing to other DOCX line
ending and same arrows in MS Word.

Change-Id: I9617aa283a7e3fcc8f413c999352d7e33f05c187
Reviewed-on: https://gerrit.libreoffice.org/43119Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
üst b98c6553
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 46 deletions
oox/source/drawingml/lineproperties.cxx
Dosyayı görüntüle @ 91d5cebb
...@@ -221,16 +221,16 @@ void lclPushMarkerProperties( ShapePropertyMap& rPropMap, ...@@ -221,16 +221,16 @@ void lclPushMarkerProperties( ShapePropertyMap& rPropMap,
double fArrowLength = 1.0; double fArrowLength = 1.0;
switch( nLength ) switch( nLength )
{ {
case OOX_ARROWSIZE_SMALL: fArrowLength = (bIsArrow ? 3.5 : 2.0); break; case OOX_ARROWSIZE_SMALL: fArrowLength = (bIsArrow ? 2.5 : 2.0); break;
case OOX_ARROWSIZE_MEDIUM: fArrowLength = (bIsArrow ? 4.5 : 3.0); break; case OOX_ARROWSIZE_MEDIUM: fArrowLength = (bIsArrow ? 3.5 : 3.0); break;
case OOX_ARROWSIZE_LARGE: fArrowLength = (bIsArrow ? 6.0 : 5.0); break; case OOX_ARROWSIZE_LARGE: fArrowLength = (bIsArrow ? 5.5 : 5.0); break;
} }
double fArrowWidth = 1.0; double fArrowWidth = 1.0;
switch( nWidth ) switch( nWidth )
{ {
case OOX_ARROWSIZE_SMALL: fArrowWidth = (bIsArrow ? 3.5 : 2.0); break; case OOX_ARROWSIZE_SMALL: fArrowWidth = (bIsArrow ? 2.5 : 2.0); break;
case OOX_ARROWSIZE_MEDIUM: fArrowWidth = (bIsArrow ? 4.5 : 3.0); break; case OOX_ARROWSIZE_MEDIUM: fArrowWidth = (bIsArrow ? 3.5 : 3.0); break;
case OOX_ARROWSIZE_LARGE: fArrowWidth = (bIsArrow ? 6.0 : 5.0); break; case OOX_ARROWSIZE_LARGE: fArrowWidth = (bIsArrow ? 5.5 : 5.0); break;
} }
// set arrow width relative to line width // set arrow width relative to line width
sal_Int32 nBaseLineWidth = ::std::max< sal_Int32 >( nLineWidth, 70 ); sal_Int32 nBaseLineWidth = ::std::max< sal_Int32 >( nLineWidth, 70 );
......
sd/qa/unit/data/xml/fdo47434_0.xml
Dosyayı görüntüle @ 91d5cebb
...@@ -9,16 +9,16 @@ ...@@ -9,16 +9,16 @@
<LineStart/> <LineStart/>
<LineEnd> <LineEnd>
<pointSequence> <pointSequence>
<point positionX="225" positionY="0" polygonFlags="NORMAL"/> <point positionX="175" positionY="0" polygonFlags="NORMAL"/>
<point positionX="450" positionY="422" polygonFlags="NORMAL"/> <point positionX="350" positionY="322" polygonFlags="NORMAL"/>
<point positionX="422" positionY="450" polygonFlags="NORMAL"/> <point positionX="322" positionY="350" polygonFlags="NORMAL"/>
<point positionX="243" positionY="102" polygonFlags="NORMAL"/> <point positionX="193" positionY="102" polygonFlags="NORMAL"/>
<point positionX="243" positionY="450" polygonFlags="NORMAL"/> <point positionX="193" positionY="350" polygonFlags="NORMAL"/>
<point positionX="206" positionY="450" polygonFlags="NORMAL"/> <point positionX="156" positionY="350" polygonFlags="NORMAL"/>
<point positionX="206" positionY="102" polygonFlags="NORMAL"/> <point positionX="156" positionY="102" polygonFlags="NORMAL"/>
<point positionX="27" positionY="450" polygonFlags="NORMAL"/> <point positionX="27" positionY="350" polygonFlags="NORMAL"/>
<point positionX="0" positionY="422" polygonFlags="NORMAL"/> <point positionX="0" positionY="322" polygonFlags="NORMAL"/>
<point positionX="225" positionY="0" polygonFlags="NORMAL"/> <point positionX="175" positionY="0" polygonFlags="NORMAL"/>
</pointSequence> </pointSequence>
</LineEnd> </LineEnd>
<Transformation> <Transformation>
...@@ -71,16 +71,16 @@ ...@@ -71,16 +71,16 @@
<LineStart/> <LineStart/>
<LineEnd> <LineEnd>
<pointSequence> <pointSequence>
<point positionX="225" positionY="0" polygonFlags="NORMAL"/> <point positionX="175" positionY="0" polygonFlags="NORMAL"/>
<point positionX="450" positionY="422" polygonFlags="NORMAL"/> <point positionX="350" positionY="322" polygonFlags="NORMAL"/>
<point positionX="422" positionY="450" polygonFlags="NORMAL"/> <point positionX="322" positionY="350" polygonFlags="NORMAL"/>
<point positionX="243" positionY="102" polygonFlags="NORMAL"/> <point positionX="193" positionY="102" polygonFlags="NORMAL"/>
<point positionX="243" positionY="450" polygonFlags="NORMAL"/> <point positionX="193" positionY="350" polygonFlags="NORMAL"/>
<point positionX="206" positionY="450" polygonFlags="NORMAL"/> <point positionX="156" positionY="350" polygonFlags="NORMAL"/>
<point positionX="206" positionY="102" polygonFlags="NORMAL"/> <point positionX="156" positionY="102" polygonFlags="NORMAL"/>
<point positionX="27" positionY="450" polygonFlags="NORMAL"/> <point positionX="27" positionY="350" polygonFlags="NORMAL"/>
<point positionX="0" positionY="422" polygonFlags="NORMAL"/> <point positionX="0" positionY="322" polygonFlags="NORMAL"/>
<point positionX="225" positionY="0" polygonFlags="NORMAL"/> <point positionX="175" positionY="0" polygonFlags="NORMAL"/>
</pointSequence> </pointSequence>
</LineEnd> </LineEnd>
<Transformation> <Transformation>
...@@ -133,16 +133,16 @@ ...@@ -133,16 +133,16 @@
<LineStart/> <LineStart/>
<LineEnd> <LineEnd>
<pointSequence> <pointSequence>
<point positionX="225" positionY="0" polygonFlags="NORMAL"/> <point positionX="175" positionY="0" polygonFlags="NORMAL"/>
<point positionX="450" positionY="422" polygonFlags="NORMAL"/> <point positionX="350" positionY="322" polygonFlags="NORMAL"/>
<point positionX="422" positionY="450" polygonFlags="NORMAL"/> <point positionX="322" positionY="350" polygonFlags="NORMAL"/>
<point positionX="243" positionY="102" polygonFlags="NORMAL"/> <point positionX="193" positionY="102" polygonFlags="NORMAL"/>
<point positionX="243" positionY="450" polygonFlags="NORMAL"/> <point positionX="193" positionY="350" polygonFlags="NORMAL"/>
<point positionX="206" positionY="450" polygonFlags="NORMAL"/> <point positionX="156" positionY="350" polygonFlags="NORMAL"/>
<point positionX="206" positionY="102" polygonFlags="NORMAL"/> <point positionX="156" positionY="102" polygonFlags="NORMAL"/>
<point positionX="27" positionY="450" polygonFlags="NORMAL"/> <point positionX="27" positionY="350" polygonFlags="NORMAL"/>
<point positionX="0" positionY="422" polygonFlags="NORMAL"/> <point positionX="0" positionY="322" polygonFlags="NORMAL"/>
<point positionX="225" positionY="0" polygonFlags="NORMAL"/> <point positionX="175" positionY="0" polygonFlags="NORMAL"/>
</pointSequence> </pointSequence>
</LineEnd> </LineEnd>
<Transformation> <Transformation>
...@@ -195,16 +195,16 @@ ...@@ -195,16 +195,16 @@
<LineStart/> <LineStart/>
<LineEnd> <LineEnd>
<pointSequence> <pointSequence>
<point positionX="225" positionY="0" polygonFlags="NORMAL"/> <point positionX="175" positionY="0" polygonFlags="NORMAL"/>
<point positionX="450" positionY="422" polygonFlags="NORMAL"/> <point positionX="350" positionY="322" polygonFlags="NORMAL"/>
<point positionX="422" positionY="450" polygonFlags="NORMAL"/> <point positionX="322" positionY="350" polygonFlags="NORMAL"/>
<point positionX="243" positionY="102" polygonFlags="NORMAL"/> <point positionX="193" positionY="102" polygonFlags="NORMAL"/>
<point positionX="243" positionY="450" polygonFlags="NORMAL"/> <point positionX="193" positionY="350" polygonFlags="NORMAL"/>
<point positionX="206" positionY="450" polygonFlags="NORMAL"/> <point positionX="156" positionY="350" polygonFlags="NORMAL"/>
<point positionX="206" positionY="102" polygonFlags="NORMAL"/> <point positionX="156" positionY="102" polygonFlags="NORMAL"/>
<point positionX="27" positionY="450" polygonFlags="NORMAL"/> <point positionX="27" positionY="350" polygonFlags="NORMAL"/>
<point positionX="0" positionY="422" polygonFlags="NORMAL"/> <point positionX="0" positionY="322" polygonFlags="NORMAL"/>
<point positionX="225" positionY="0" polygonFlags="NORMAL"/> <point positionX="175" positionY="0" polygonFlags="NORMAL"/>
</pointSequence> </pointSequence>
</LineEnd> </LineEnd>
<Transformation> <Transformation>
......
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