summaryrefslogtreecommitdiff
path: root/vcl/source
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 /vcl/source
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 'vcl/source')
-rw-r--r--vcl/source/control/field.cxx4
-rw-r--r--vcl/source/gdi/graph.cxx2
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx8
-rw-r--r--vcl/source/window/builder.cxx8
-rw-r--r--vcl/source/window/printdlg.cxx10
5 files changed, 16 insertions, 16 deletions
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 27367d770dae..e0c7558ade9f 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -945,12 +945,12 @@ namespace
OUStringBuffer aBuf;
sal_Int32 nTextLen;
- nTextLen = OUString::valueOf(rFormatter.GetMin()).getLength();
+ nTextLen = OUString::number(rFormatter.GetMin()).getLength();
string::padToLength(aBuf, nTextLen, '9');
Size aMinTextSize = rSpinField.CalcMinimumSizeForText(
rFormatter.CreateFieldText(aBuf.makeStringAndClear().toInt64()));
- nTextLen = OUString::valueOf(rFormatter.GetMax()).getLength();
+ nTextLen = OUString::number(rFormatter.GetMax()).getLength();
string::padToLength(aBuf, nTextLen, '9');
Size aMaxTextSize = rSpinField.CalcMinimumSizeForText(
rFormatter.CreateFieldText(aBuf.makeStringAndClear().toInt64()));
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index 328289b12506..e6d46e7cd578 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -394,7 +394,7 @@ uno::Reference< graphic::XGraphic > Graphic::GetXGraphic() const
OUString aURL( "private:memorygraphic/" );
aLoadProps[ 0 ].Name = OUString( "URL" );
- aLoadProps[ 0 ].Value <<= ( aURL += OUString::valueOf( reinterpret_cast< sal_Int64 >( this ) ) );
+ aLoadProps[ 0 ].Value <<= ( aURL += OUString::number( reinterpret_cast< sal_Int64 >( this ) ) );
xRet = xProv->queryGraphic( aLoadProps );
}
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 252cd5d2b550..482929d883ba 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -773,7 +773,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr
if( i_rControl.getType() == PDFWriter::RadioButton )
{
aPartialName = "RadioGroup";
- aPartialName += OString::valueOf( static_cast<const PDFWriter::RadioButtonWidget&>(i_rControl).RadioGroup );
+ aPartialName += OString::number( static_cast<const PDFWriter::RadioButtonWidget&>(i_rControl).RadioGroup );
}
else
aPartialName = OString( "Widget" );
@@ -6634,7 +6634,7 @@ bool PDFWriterImpl::emitTrailer()
for( sal_Int32 i = 0; i < nObjects; i++ )
{
aLine.setLength( 0 );
- OString aOffset = OString::valueOf( (sal_Int64)m_aObjects[i] );
+ OString aOffset = OString::number( m_aObjects[i] );
for( sal_Int32 j = 0; j < (10-aOffset.getLength()); j++ )
aLine.append( '0' );
aLine.append( aOffset );
@@ -11649,7 +11649,7 @@ void PDFWriterImpl::ensureUniqueRadioOnValues()
{
int nKidIndex = rGroupWidget.m_aKidsIndex[nKid];
PDFWidget& rKid = m_aWidgets[nKidIndex];
- rKid.m_aOnValue = OUString::valueOf( sal_Int32(nKid+1) );
+ rKid.m_aOnValue = OUString::number( nKid+1 );
if( rKid.m_aValue != "Off" )
rKid.m_aValue = rKid.m_aOnValue;
}
@@ -11895,7 +11895,7 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa
rNewWidget.m_aRect = Rectangle(0, 0, 0, 0);
m_nSignatureObject = createObject();
- rNewWidget.m_aValue = OUString::valueOf( m_nSignatureObject );
+ rNewWidget.m_aValue = OUString::number( m_nSignatureObject );
rNewWidget.m_aValue += " 0 R";
//createDefaultSignatureAppearance( rNewWidget, rSig );
// let's add a fake appearance
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 21d45b6431cf..6cc9800aa138 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1051,9 +1051,9 @@ void VclBuilder::cleanupWidgetOwnScrolling(Window *pScrollParent, Window *pWindo
{
//remove the redundant scrolling parent
sal_Int32 nWidthReq = pScrollParent->get_width_request();
- rMap[OString("width-request")] = OString::valueOf(nWidthReq);
+ rMap[OString("width-request")] = OString::number(nWidthReq);
sal_Int32 nHeightReq = pScrollParent->get_height_request();
- rMap[OString("height-request")] = OString::valueOf(nHeightReq);
+ rMap[OString("height-request")] = OString::number(nHeightReq);
m_pParserState->m_aRedundantParentWidgets[pScrollParent] = pWindow;
}
@@ -2000,7 +2000,7 @@ void VclBuilder::handleRow(xmlreader::XmlReader &reader, const OString &rID, sal
}
else if (nId == 0 && name.equals("translatable") && reader.getAttributeValue(false).equals("yes"))
{
- sValue = getTranslation(rID, OString::valueOf(nRowIndex));
+ sValue = getTranslation(rID, OString::number(nRowIndex));
bTranslated = !sValue.isEmpty();
}
}
@@ -2140,7 +2140,7 @@ std::vector<OString> VclBuilder::handleItems(xmlreader::XmlReader &reader, const
{
if (name.equals("translatable") && reader.getAttributeValue(false).equals("yes"))
{
- sValue = getTranslation(rID, OString::valueOf(nItemIndex));
+ sValue = getTranslation(rID, OString::number(nItemIndex));
bTranslated = !sValue.isEmpty();
}
}
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 594fb4442450..42c04113d0a2 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -325,7 +325,7 @@ void PrintDialog::ShowNupOrderWindow::Paint( const Rectangle& i_rRect )
Font aFont( GetSettings().GetStyleSettings().GetFieldFont() );
aFont.SetSize( Size( 0, 24 ) );
SetFont( aFont );
- Size aSampleTextSize( GetTextWidth( OUString::valueOf( sal_Int32(nPages+1) ) ), GetTextHeight() );
+ Size aSampleTextSize( GetTextWidth( OUString::number( nPages+1 ) ), GetTextHeight() );
Size aOutSize( GetOutputSizePixel() );
Size aSubSize( aOutSize.Width() / mnColumns, aOutSize.Height() / mnRows );
@@ -341,7 +341,7 @@ void PrintDialog::ShowNupOrderWindow::Paint( const Rectangle& i_rRect )
long nTextHeight = GetTextHeight();
for( int i = 0; i < nPages; i++ )
{
- OUString aPageText( OUString::valueOf( sal_Int32(i+1) ) );
+ OUString aPageText( OUString::number( i+1 ) );
int nX = 0, nY = 0;
switch( mnOrderMode )
{
@@ -1269,7 +1269,7 @@ void PrintDialog::updatePrinterText()
void PrintDialog::setPreviewText( sal_Int32 )
{
- OUString aNewText( searchAndReplace( maPageStr, "%n", 2, OUString::valueOf( mnCachedPages ) ) );
+ OUString aNewText( searchAndReplace( maPageStr, "%n", 2, OUString::number( mnCachedPages ) ) );
mpNumPagesText->SetText( aNewText );
}
@@ -1904,8 +1904,8 @@ void PrintProgressDialog::setProgress( int i_nCurrent, int i_nMax )
if( mnMax < 1 )
mnMax = 1;
- OUString aNewText( searchAndReplace( maStr, "%p", 2, OUString::valueOf( mnCur ) ) );
- aNewText = searchAndReplace( aNewText, "%n", 2, OUString::valueOf( mnMax ) );
+ OUString aNewText( searchAndReplace( maStr, "%p", 2, OUString::number( mnCur ) ) );
+ aNewText = searchAndReplace( aNewText, "%n", 2, OUString::number( mnMax ) );
maText.SetText( aNewText );
// update progress