strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace macro with lambda

Browse source 
Change-Id: I47810e067d9dab0e40b5b1583193c01ad8c91759
This commit is contained in:
Stephan Bergmann 2017-09-07 17:00:41 +02:00
parent 91d909ac8e
commit 2f902237f5
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
oox/source/drawingml/lineproperties.cxx
View file

@ -242,11 +242,11 @@ void lclPushMarkerProperties( ShapePropertyMap& rPropMap,
TODO: this can be optimized by using a map. */
if( !rPropMap.hasNamedLineMarkerInTable( aMarkerName ) )
{
// pass X and Y as percentage to OOX_ARROW_POINT
#define OOX_ARROW_POINT( x, y ) awt::Point( static_cast< sal_Int32 >( fArrowWidth * ( x ) ), static_cast< sal_Int32 >( fArrowLength * ( y ) ) )
// pass X and Y as percentage to OOX_ARROW_POINT
auto OOX_ARROW_POINT = [fArrowLength, fArrowWidth]( double x, double y ) { return awt::Point( static_cast< sal_Int32 >( fArrowWidth * x ), static_cast< sal_Int32 >( fArrowLength * y ) ); };
// tdf#100491 Arrow line marker, unlike other markers, depends on line width.
// So calculate width of half line (more convenient during drawing) taking into account
// further conversions/scaling done in OOX_ARROW_POINT macro and scaling to nMarkerWidth.
// further conversions/scaling done in OOX_ARROW_POINT and scaling to nMarkerWidth.
const double fArrowLineHalfWidth = ::std::max< double >( 100.0 * 0.5 * nLineWidth / nMarkerWidth, 1 );
::std::vector< awt::Point > aPoints;
@ -301,7 +301,6 @@ void lclPushMarkerProperties( ShapePropertyMap& rPropMap,
aPoints.push_back( OOX_ARROW_POINT( 50, 0 ) );
break;
}
#undef OOX_ARROW_POINT
OSL_ENSURE( !aPoints.empty(), "lclPushMarkerProperties - missing arrow coordinates" );
if( !aPoints.empty() )