[ooo-build-commit] Branch 'ooo/master' - 2 commits - oox/inc oox/source

[Jan Holesovsky]

 oox/inc/oox/helper/helper.hxx           |    2 +-
 oox/source/drawingml/fillproperties.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 198daec3729150498b79ed4b2a72ca4436046042
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Mon Jul 20 12:55:48 2009 +0000

    #i10000# build fix

diff --git a/oox/inc/oox/helper/helper.hxx b/oox/inc/oox/helper/helper.hxx
index 4c40e9c..d6e2286 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 90ca4c1..6ddb72b 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 0bcef72..46fe6ae 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 );
                             }
                         }
commit b396afe1c03bf9aa5e5d54e9801f15a2d01510fc
Author: Release Engineers <releng at openoffice.org>
Date:   Fri Jul 17 12:00:19 2009 +0000

    #i10000# build fix

diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index 6ddb72b..90ca4c1 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 = getDoubleIntervalValue< double >( -fAngle / 60000.0, 0.0, 360.0 );
+        fAngle = getIntervalValue< double >( -fAngle / 60000.0, 0.0, 360.0 );
         rPropSet.setProperty( PROP_TextRotation, fAngle );
 
         if( bSupportsStacked )