diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-08-21 15:07:31 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-08-21 15:10:35 +0200 |
| commit | 64b993e046f23baaacaff1572b7d2a816588b5ef (patch) | |
| tree | 237dce36a1d4787d168a0520839f6aab22500487 /oox/source/drawingml/customshapegeometry.cxx | |
| parent | 75f41baab6ce75786a91fe461835ee16a23ec18e (diff) | |
finish deprecation of O(U)String::valueOf()
Compiler plugin to replace with matching number(), boolean() or OUString ctor,
ran it, few manual tweaks, mark as really deprecated.
Change-Id: I4a79bdbcf4c460d21e73b635d2bd3725c22876b2
Diffstat (limited to 'oox/source/drawingml/customshapegeometry.cxx')
| -rw-r--r-- | oox/source/drawingml/customshapegeometry.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx index 526ea26308c2..115d3fbe3d6a 100644 --- a/oox/source/drawingml/customshapegeometry.cxx +++ b/oox/source/drawingml/customshapegeometry.cxx @@ -99,13 +99,13 @@ OUString GetFormulaParameter( const EnhancedCustomShapeParameter& rParameter ) { double fValue = 0.0; if ( rParameter.Value >>= fValue ) - aRet = OUString::valueOf( fValue ); + aRet = OUString::number( fValue ); } else { sal_Int32 nValue = 0; if ( rParameter.Value >>= nValue ) - aRet = OUString::valueOf( nValue ); + aRet = OUString::number( nValue ); } } break; @@ -117,7 +117,7 @@ OUString GetFormulaParameter( const EnhancedCustomShapeParameter& rParameter ) if ( rParameter.Value >>= nFormulaIndex ) { aRet = "?" - + OUString::valueOf( nFormulaIndex ) + + OUString::number( nFormulaIndex ) + " "; } } @@ -135,7 +135,7 @@ OUString GetFormulaParameter( const EnhancedCustomShapeParameter& rParameter ) if ( rParameter.Value >>= nAdjustmentIndex ) { aRet = "$" - + OUString::valueOf( nAdjustmentIndex ) + + OUString::number( nAdjustmentIndex ) + " "; } } @@ -281,7 +281,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu CustomShapeGuide aGuide; aGuide.maName = rValue; - aGuide.maFormula = "logheight/" + OUString::valueOf( nIntVal ); + aGuide.maFormula = "logheight/" + OUString::number( nIntVal ); aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; @@ -332,7 +332,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu CustomShapeGuide aGuide; aGuide.maName = rValue; - aGuide.maFormula = "min(logwidth,logheight)/" + OUString::valueOf( nIntVal ); + aGuide.maFormula = "min(logwidth,logheight)/" + OUString::number( nIntVal ); aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; @@ -379,7 +379,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu CustomShapeGuide aGuide; aGuide.maName = rValue; - aGuide.maFormula = "logwidth/" + OUString::valueOf( nIntVal ); + aGuide.maFormula = "logwidth/" + OUString::number( nIntVal ); aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; @@ -1086,7 +1086,7 @@ ContextHandlerRef Path2DContext::onCreateContext( sal_Int32 aElementToken, sal_Int32 nArcNum = mrCustomShapeProperties.getArcNum(); // start angle - aGuide.maName = "arctosa" + OUString::valueOf( nArcNum ); + aGuide.maName = "arctosa" + OUString::number( nArcNum ); aGuide.maFormula = "(" + GetFormulaParameter( GetAdjCoordinate( mrCustomShapeProperties, rAttribs.getString( XML_stAng ).get() ) ) + ")/60000.0"; @@ -1094,7 +1094,7 @@ ContextHandlerRef Path2DContext::onCreateContext( sal_Int32 aElementToken, aAngles.First.Type = EnhancedCustomShapeParameterType::EQUATION; // swing angle - aGuide.maName = "arctosw" + OUString::valueOf( nArcNum ); + aGuide.maName = "arctosw" + OUString::number( nArcNum ); aGuide.maFormula = "(" + GetFormulaParameter( GetAdjCoordinate( mrCustomShapeProperties, rAttribs.getString( XML_swAng ).get() ) ) + ")/60000.0"; |