diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-07-20 12:55:48 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-07-20 12:55:48 +0000 |
| commit | 58af2f47aa63e8bd1b81fdf6f0cffc8dfb13cf36 (patch) | |
| tree | 81395c40f42f60297f660da7cd0698a32b38d8f5 /oox | |
| parent | 6f93513de88d47b186e2020dc14531ee69b03c75 (diff) | |
#i10000# build fix
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/inc/oox/helper/helper.hxx | 2 | ||||
| -rw-r--r-- | oox/source/drawingml/chart/objectformatter.cxx | 2 | ||||
| -rw-r--r-- | oox/source/drawingml/fillproperties.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/oox/inc/oox/helper/helper.hxx b/oox/inc/oox/helper/helper.hxx index 4c40e9c70bb6..d6e2286fd8ac 100644 --- a/oox/inc/oox/helper/helper.hxx +++ b/oox/inc/oox/helper/helper.hxx @@ -111,7 +111,7 @@ inline ReturnType getIntervalValue( Type nValue, Type nBegin, Type nEnd ) } template< typename ReturnType > -inline ReturnType getIntervalValue( double fValue, double fBegin, double fEnd ) +inline ReturnType getDoubleIntervalValue( double fValue, double fBegin, double fEnd ) { double fInterval = fEnd - fBegin; double fCount = (fValue < fBegin) ? -(::rtl::math::approxFloor( (fBegin - fValue - 1.0) / fInterval ) + 1.0) : ::rtl::math::approxFloor( (fValue - fBegin) / fInterval ); diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index 90ca4c14e118..6ddb72bd3040 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -1149,7 +1149,7 @@ void ObjectFormatter::convertTextRotation( PropertySet& rPropSet, const ModelRef /* Chart2 expects rotation angle as double value in range of [0,360). OOXML counts clockwise, Chart2 counts counterclockwise. */ double fAngle = rxTextProp->getTextProperties().moRotation.get( 0 ); - fAngle = getIntervalValue< double >( -fAngle / 60000.0, 0.0, 360.0 ); + fAngle = getDoubleIntervalValue< double >( -fAngle / 60000.0, 0.0, 360.0 ); rPropSet.setProperty( PROP_TextRotation, fAngle ); if( bSupportsStacked ) diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index 0bcef727efb4..46fe6ae5292c 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -348,9 +348,9 @@ void FillProperties::pushToPropMap( PropertyMap& rPropMap, const FillPropertyIds rPropMap.setProperty( rPropIds[ FillBitmapSizeYId ], nFillBmpSizeY ); // offset of the first bitmap tile (given as EMUs), convert to percent - sal_Int16 nTileOffsetX = getIntervalValue< sal_Int16 >( maBlipProps.moTileOffsetX.get( 0 ) / 3.6 / aOriginalSize.Width, 0, 100 ); + sal_Int16 nTileOffsetX = getDoubleIntervalValue< sal_Int16 >( maBlipProps.moTileOffsetX.get( 0 ) / 3.6 / aOriginalSize.Width, 0, 100 ); rPropMap.setProperty( rPropIds[ FillBitmapOffsetXId ], nTileOffsetX ); - sal_Int16 nTileOffsetY = getIntervalValue< sal_Int16 >( maBlipProps.moTileOffsetY.get( 0 ) / 3.6 / aOriginalSize.Height, 0, 100 ); + sal_Int16 nTileOffsetY = getDoubleIntervalValue< sal_Int16 >( maBlipProps.moTileOffsetY.get( 0 ) / 3.6 / aOriginalSize.Height, 0, 100 ); rPropMap.setProperty( rPropIds[ FillBitmapOffsetYId ], nTileOffsetY ); } } |