diff options
Diffstat (limited to 'oox/source/drawingml/customshapegeometry.cxx')
-rw-r--r-- | oox/source/drawingml/customshapegeometry.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx index b6d6e1986d49..37a6281f160d 100644 --- a/oox/source/drawingml/customshapegeometry.cxx +++ b/oox/source/drawingml/customshapegeometry.cxx @@ -216,7 +216,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu aGuide.maName = rValue; aGuide.maFormula = "logheight" ; - aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) ); + aRet.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; } else @@ -251,7 +251,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu aGuide.maName = rValue; aGuide.maFormula = "logheight/" + OUString::number( nIntVal ); - aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) ); + aRet.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; } break; @@ -270,7 +270,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu aGuide.maName = rValue; aGuide.maFormula = "max(logwidth,logheight)"; - aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) ); + aRet.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; } break; @@ -280,7 +280,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu aGuide.maName = rValue; aGuide.maFormula = "min(logwidth,logheight)"; - aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) ); + aRet.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; } break; @@ -307,7 +307,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu aGuide.maName = rValue; aGuide.maFormula = "min(logwidth,logheight)/" + OUString::number( nIntVal ); - aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) ); + aRet.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; } break; @@ -321,7 +321,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu aGuide.maName = rValue; aGuide.maFormula = "logwidth" ; - aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) ); + aRet.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; } else @@ -362,7 +362,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu aGuide.maName = rValue; aGuide.maFormula = "logwidth/" + OUString::number( nIntVal ); - aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) ); + aRet.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; } break; @@ -374,7 +374,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu if ( bConstant ) { if (nConstant != -1) { - aRet.Value = Any( nConstant ); + aRet.Value <<= nConstant; aRet.Type = EnhancedCustomShapeParameterType::NORMAL; } } @@ -388,7 +388,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu } if ( ( n >= '0' ) && ( n <= '9' ) ) { // seems to be a ST_Coordinate - aRet.Value = Any( (sal_Int32)(rValue.toInt32() ) ); + aRet.Value <<= (sal_Int32)(rValue.toInt32() ); aRet.Type = EnhancedCustomShapeParameterType::NORMAL; } else @@ -396,7 +396,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu sal_Int32 nGuideIndex = CustomShapeProperties::GetCustomShapeGuideValue( rCustomShapeProperties.getAdjustmentGuideList(), rValue ); if ( nGuideIndex >= 0 ) { - aRet.Value = Any( nGuideIndex ); + aRet.Value <<= nGuideIndex; aRet.Type = EnhancedCustomShapeParameterType::ADJUSTMENT; } else @@ -404,13 +404,13 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu nGuideIndex = CustomShapeProperties::GetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), rValue ); if ( nGuideIndex >= 0 ) { - aRet.Value = Any( nGuideIndex ); + aRet.Value <<= nGuideIndex; aRet.Type = EnhancedCustomShapeParameterType::EQUATION; } else { SAL_WARN("oox", "error: unhandled value " << rValue); - aRet.Value = Any( rValue ); + aRet.Value <<= rValue; } } } @@ -1061,7 +1061,7 @@ ContextHandlerRef Path2DContext::onCreateContext( sal_Int32 aElementToken, aGuide.maFormula = "(" + GetFormulaParameter( GetAdjCoordinate( mrCustomShapeProperties, rAttribs.getString( XML_stAng ).get() ) ) + ")/60000.0"; - aAngles.First.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( mrCustomShapeProperties.getGuideList(), aGuide ) ); + aAngles.First.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( mrCustomShapeProperties.getGuideList(), aGuide ); aAngles.First.Type = EnhancedCustomShapeParameterType::EQUATION; // swing angle @@ -1069,7 +1069,7 @@ ContextHandlerRef Path2DContext::onCreateContext( sal_Int32 aElementToken, aGuide.maFormula = "(" + GetFormulaParameter( GetAdjCoordinate( mrCustomShapeProperties, rAttribs.getString( XML_swAng ).get() ) ) + ")/60000.0"; - aAngles.Second.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( mrCustomShapeProperties.getGuideList(), aGuide ) ); + aAngles.Second.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( mrCustomShapeProperties.getGuideList(), aGuide ); aAngles.Second.Type = EnhancedCustomShapeParameterType::EQUATION; mrPath2D.parameter.push_back( aScale ); |