summaryrefslogtreecommitdiff
path: root/chart2/source/controller/dialogs
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-08-21 15:07:31 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-08-21 15:10:35 +0200
commit64b993e046f23baaacaff1572b7d2a816588b5ef (patch)
tree237dce36a1d4787d168a0520839f6aab22500487 /chart2/source/controller/dialogs
parent75f41baab6ce75786a91fe461835ee16a23ec18e (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 'chart2/source/controller/dialogs')
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.cxx4
-rw-r--r--chart2/source/controller/dialogs/DataBrowserModel.cxx4
-rw-r--r--chart2/source/controller/dialogs/ObjectNameProvider.cxx10
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx12
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.cxx2
5 files changed, 16 insertions, 16 deletions
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 2ea1cf0babae..c86b10eec542 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -574,7 +574,7 @@ void DataBrowser::RenewTable()
GetDataWindow().LogicToPixel( Size( 42, 0 )).getWidth() ));
OUString aDefaultSeriesName(SCH_RESSTR(STR_COLUMN_LABEL));
- replaceParamterInString( aDefaultSeriesName, "%COLUMNNUMBER", OUString::valueOf( sal_Int32(24) ) );
+ replaceParamterInString( aDefaultSeriesName, "%COLUMNNUMBER", OUString::number( 24 ) );
sal_Int32 nColumnWidth = GetDataWindow().GetTextWidth( aDefaultSeriesName )
+ GetDataWindow().LogicToPixel( Point( 4 + impl::SeriesHeader::GetRelativeAppFontXPosForNameField(), 0 ), MAP_APPFONT ).X();
sal_Int32 nColumnCount = m_apDataBrowserModel->getColumnCount();
@@ -640,7 +640,7 @@ OUString DataBrowser::GetColString( sal_Int32 nColumnId ) const
OUString DataBrowser::GetRowString( sal_Int32 nRow ) const
{
- return OUString::valueOf(nRow + 1);
+ return OUString::number(nRow + 1);
}
OUString DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 5a63bad5c77d..6e2c6576b269 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -382,7 +382,7 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex )
// values
Reference< chart2::data::XDataSequence > xNewSeq(
xDataProvider->createDataSequenceByRangeRepresentation(
- OUString::valueOf( nIndex )));
+ OUString::number( nIndex )));
lcl_copyDataSequenceProperties(
aLSequences[nSeqIdx]->getValues(), xNewSeq );
aLSequences[nSeqIdx]->setValues( xNewSeq );
@@ -391,7 +391,7 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex )
Reference< chart2::data::XDataSequence > xNewLabelSeq(
xDataProvider->createDataSequenceByRangeRepresentation(
"label " +
- OUString::valueOf( nIndex )));
+ OUString::number( nIndex )));
lcl_copyDataSequenceProperties(
aLSequences[nSeqIdx]->getLabel(), xNewLabelSeq );
aLSequences[nSeqIdx]->setLabel( xNewLabelSeq );
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index ef63d909ad2c..943081c9d5d1 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -507,7 +507,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
sal_Int32 nIndex = aRet.indexOf( aWildcard );
if( nIndex != -1 )
{
- aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), OUString::valueOf(nPointIndex+1) );
+ aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), OUString::number(nPointIndex+1) );
}
//replace data series index
@@ -526,7 +526,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
}
}
- OUString aReplacement( OUString::valueOf(nSeriesIndex+1) );
+ OUString aReplacement( OUString::number(nSeriesIndex+1) );
aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), aReplacement );
}
@@ -673,7 +673,7 @@ OUString ObjectNameProvider::getSelectedObjectText( const OUString & rObjectCID,
sal_Int32 nPointIndex( ObjectIdentifier::getParticleID(rObjectCID).toInt32() );
// replace data point index
- replaceParamterInString( aRet, "%POINTNUMBER", OUString::valueOf( nPointIndex + 1 ));
+ replaceParamterInString( aRet, "%POINTNUMBER", OUString::number( nPointIndex + 1 ));
// replace data series index
{
@@ -685,7 +685,7 @@ OUString ObjectNameProvider::getSelectedObjectText( const OUString & rObjectCID,
if( aSeriesVector[nSeriesIndex] == xSeries )
break;
}
- replaceParamterInString( aRet, "%SERIESNUMBER", OUString::valueOf( nSeriesIndex + 1 ) );
+ replaceParamterInString( aRet, "%SERIESNUMBER", OUString::number( nSeriesIndex + 1 ) );
}
// replace point value
@@ -743,7 +743,7 @@ OUString ObjectNameProvider::getNameForCID(
aRet += getName( OBJECTTYPE_DATA_POINT );
sal_Int32 nPointIndex = ObjectIdentifier::getIndexFromParticleOrCID( rObjectCID );
aRet += " ";
- aRet += OUString::valueOf(nPointIndex+1);
+ aRet += OUString::number(nPointIndex+1);
if( eType == OBJECTTYPE_DATA_LABEL )
{
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index fb8b8fd59a04..6cfa45dc978d 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -58,7 +58,7 @@ LightButton::LightButton( Window* pParent, const ResId& rResId, sal_Int32 nLight
if( nIndex != -1 )
{
aTipHelp = aTipHelp.replaceAt(nIndex, aReplacementStr.getLength(),
- OUString::valueOf( nLightNumber ) );
+ OUString::number( nLightNumber ) );
}
this->SetQuickHelpText( String( aTipHelp ) );
}
@@ -143,13 +143,13 @@ namespace
OUString lcl_makeColorName( Color rColor )
{
OUString aStr = SVX_RESSTR(RID_SVXFLOAT3D_FIX_R) +
- OUString::valueOf((sal_Int32)rColor.GetRed()) +
+ OUString::number(rColor.GetRed()) +
" " +
SVX_RESSTR(RID_SVXFLOAT3D_FIX_G) +
- OUString::valueOf((sal_Int32)rColor.GetGreen()) +
+ OUString::number(rColor.GetGreen()) +
" " +
SVX_RESSTR(RID_SVXFLOAT3D_FIX_B) +
- OUString::valueOf((sal_Int32)rColor.GetBlue());
+ OUString::number(rColor.GetBlue());
return aStr;
}
void lcl_selectColor( ColorListBox& rListBox, const Color& rColor )
@@ -173,7 +173,7 @@ namespace
OUString aColorPropertyPrefix("D3DSceneLightColor");
OUString aDirectionPropertyPrefix("D3DSceneLightDirection");
OUString aEnabledPropertyPrefix("D3DSceneLightOn");
- OUString aIndex( OUString::valueOf( nIndex + 1 ));
+ OUString aIndex( OUString::number( nIndex + 1 ));
try
{
@@ -201,7 +201,7 @@ namespace
OUString aColorPropertyPrefix("D3DSceneLightColor");
OUString aDirectionPropertyPrefix("D3DSceneLightDirection");
OUString aEnabledPropertyPrefix("D3DSceneLightOn");
- OUString aIndex( OUString::valueOf( nIndex + 1 ));
+ OUString aIndex( OUString::number( nIndex + 1 ));
try
{
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index ffbd7bcb69b1..91d6ca4e65a2 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -475,7 +475,7 @@ void DataSourceTabPage::fillSeriesListBox()
if( nIndex != -1 )
aLabel = OUString( aResString.replaceAt(
nIndex, aReplacementStr.getLength(),
- OUString::valueOf(nUnnamedSeriesIndex)));
+ OUString::number(nUnnamedSeriesIndex)));
}
if( aLabel.isEmpty() )
aLabel = ::chart::SchResId( STR_DATA_UNNAMED_SERIES ).toString();