summaryrefslogtreecommitdiff
path: root/sdext
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 /sdext
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 'sdext')
-rw-r--r--sdext/source/minimizer/informationdialog.cxx2
-rw-r--r--sdext/source/minimizer/optimizerdialogcontrols.cxx16
-rw-r--r--sdext/source/minimizer/pppoptimizerdialog.cxx4
-rw-r--r--sdext/source/pdfimport/pdfparse/pdfentries.cxx6
-rw-r--r--sdext/source/pdfimport/tree/drawtreevisiting.cxx4
-rw-r--r--sdext/source/pdfimport/tree/writertreevisiting.cxx6
-rw-r--r--sdext/source/presenter/PresenterAccessibility.cxx2
-rw-r--r--sdext/source/presenter/PresenterController.cxx6
-rw-r--r--sdext/source/presenter/PresenterScreen.cxx2
-rw-r--r--sdext/source/presenter/PresenterSlideSorter.cxx2
-rw-r--r--sdext/source/presenter/PresenterToolBar.cxx8
11 files changed, 29 insertions, 29 deletions
diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx
index e055ad415a26..8a7702afb688 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -202,7 +202,7 @@ static OUString ImpValueOfInMB( const sal_Int64& rVal )
double fVal( static_cast<double>( rVal ) );
fVal /= ( 1 << 20 );
fVal += 0.05;
- OUStringBuffer aVal( OUString::valueOf( fVal ) );
+ OUStringBuffer aVal( OUString::number( fVal ) );
sal_Int32 nX( OUString( aVal.getStr() ).indexOf( '.', 0 ) );
if ( nX > 0 )
aVal.setLength( nX + 2 );
diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx
index bc031a538d0e..d07b3d3ba4e6 100644
--- a/sdext/source/minimizer/optimizerdialogcontrols.cxx
+++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx
@@ -505,7 +505,7 @@ void OptimizerDialog::UpdateControlStatesPage2()
else if ( getString( STR_IMAGE_RESOLUTION_3 ).getToken( 0, ';', nI3 ).toInt32() == nImageResolution )
aResolutionText = aResolutionItemList[ 3 ];
if ( aResolutionText.isEmpty() )
- aResolutionText = OUString::valueOf( nImageResolution );
+ aResolutionText = OUString::number( nImageResolution );
setControlProperty( TKGet( TK_RadioButton0Pg1 ), TKGet( TK_State ), Any( (sal_Int16)( bJPEGCompression != sal_True ) ) );
setControlProperty( TKGet( TK_RadioButton1Pg1 ), TKGet( TK_State ), Any( (sal_Int16)( bJPEGCompression != sal_False ) ) );
@@ -590,7 +590,7 @@ static OUString ImpValueOfInMB( const sal_Int64& rVal, sal_Unicode nSeparator =
double fVal( static_cast<double>( rVal ) );
fVal /= ( 1 << 20 );
fVal += 0.05;
- OUStringBuffer aVal( OUString::valueOf( fVal ) );
+ OUStringBuffer aVal( OUString::number( fVal ) );
sal_Int32 nX( OUString( aVal.getStr() ).indexOf( '.', 0 ) );
if ( nX >= 0 )
{
@@ -737,7 +737,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
OUString aPlaceholder( "%SLIDES" );
sal_Int32 i = aStr.indexOf( aPlaceholder, 0 );
if ( i >= 0 )
- aStr = aStr.replaceAt( i, aPlaceholder.getLength(), OUString::valueOf( nDeletedSlides ) );
+ aStr = aStr.replaceAt( i, aPlaceholder.getLength(), OUString::number( nDeletedSlides ) );
aSummaryStrings.push_back( aStr );
}
@@ -757,15 +757,15 @@ void OptimizerDialog::UpdateControlStatesPage4()
OUString aResolutionPlaceholder( "%RESOLUTION" );
sal_Int32 i = aStr.indexOf( aImagePlaceholder, 0 );
if ( i >= 0 )
- aStr = aStr.replaceAt( i, aImagePlaceholder.getLength(), OUString::valueOf( nGraphics ) );
+ aStr = aStr.replaceAt( i, aImagePlaceholder.getLength(), OUString::number( nGraphics ) );
sal_Int32 j = aStr.indexOf( aQualityPlaceholder, 0 );
if ( j >= 0 )
- aStr = aStr.replaceAt( j, aQualityPlaceholder.getLength(), OUString::valueOf( nJPEGQuality ) );
+ aStr = aStr.replaceAt( j, aQualityPlaceholder.getLength(), OUString::number( nJPEGQuality ) );
sal_Int32 k = aStr.indexOf( aResolutionPlaceholder, 0 );
if ( k >= 0 )
- aStr = aStr.replaceAt( k, aResolutionPlaceholder.getLength(), OUString::valueOf( nImageResolution ) );
+ aStr = aStr.replaceAt( k, aResolutionPlaceholder.getLength(), OUString::number( nImageResolution ) );
aSummaryStrings.push_back( aStr );
}
@@ -792,7 +792,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
OUString aPlaceholder( "%OLE" );
sal_Int32 i = aStr.indexOf( aPlaceholder, 0 );
if ( i >= 0 )
- aStr = aStr.replaceAt( i, aPlaceholder.getLength(), OUString::valueOf( nOLEReplacements ) );
+ aStr = aStr.replaceAt( i, aPlaceholder.getLength(), OUString::number( nOLEReplacements ) );
aSummaryStrings.push_back( aStr );
}
}
@@ -899,7 +899,7 @@ void OptimizerDialog::InitPage4()
const std::vector< OptimizerSettings >& rList( GetOptimizerSettings() );
do
{
- OUString aTemp( aDefault.concat( OUString::valueOf( nSession++ ) ) );
+ OUString aTemp( aDefault.concat( OUString::number( nSession++ ) ) );
for ( i = 1; i < rList.size(); i++ )
{
if ( rList[ i ].maName == aTemp )
diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx
index 0d58b07adef6..516c69a293af 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.cxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.cxx
@@ -143,9 +143,9 @@ void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL,
if ( nFileSizeSource && nFileSizeDest )
{
OUStringBuffer sBuf( OUString("Your Presentation has been minimized from:") );
- sBuf.append( OUString::valueOf( nFileSizeSource >> 10 ) );
+ sBuf.append( OUString::number( nFileSizeSource >> 10 ) );
sBuf.append( OUString("KB to ") );
- sBuf.append( OUString::valueOf( nFileSizeDest >> 10 ) );
+ sBuf.append( OUString::number( nFileSizeDest >> 10 ) );
sBuf.append( OUString("KB.") );
OUString sResult( sBuf.makeStringAndClear() );
SAL_INFO("sdext.minimizer", sResult );
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 90b4de6a4d1f..52117d3b6a00 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -967,13 +967,13 @@ bool PDFTrailer::emit( EmitContext& rWriteContext ) const
// write 20 char entry of form
// 0000offset 00gen n\r\n
aBuf.setLength( 0 );
- OString aOffset( OString::valueOf( sal_Int64(section_begin->second.second ) ) );
+ OString aOffset( OString::number( section_begin->second.second ) );
int nPad = 10 - aOffset.getLength();
for( int i = 0; i < nPad; i++ )
aBuf.append( '0' );
aBuf.append( aOffset );
aBuf.append( ' ' );
- OString aGeneration( OString::valueOf( sal_Int32(section_begin->second.first ) ) );
+ OString aGeneration( OString::number( section_begin->second.first ) );
nPad = 5 - aGeneration.getLength();
for( int i = 0; i < nPad; i++ )
aBuf.append( '0' );
@@ -991,7 +991,7 @@ bool PDFTrailer::emit( EmitContext& rWriteContext ) const
return false;
if( ! rWriteContext.write( "startxref\n", 10 ) )
return false;
- OString aOffset( OString::valueOf( sal_Int32(nXRefPos) ) );
+ OString aOffset( OString::number( nXRefPos ) );
if( ! rWriteContext.write( aOffset.getStr(), aOffset.getLength() ) )
return false;
return rWriteContext.write( "\n%%EOF\n", 7 );
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index e4f1d6631ffe..a4d166e8e4df 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -191,7 +191,7 @@ void DrawXmlEmitter::fillFrameProps( DrawElement& rElem,
{
double rel_x = rElem.x, rel_y = rElem.y;
- rProps[ "draw:z-index" ] = OUString::valueOf( rElem.ZOrder );
+ rProps[ "draw:z-index" ] = OUString::number( rElem.ZOrder );
rProps[ "draw:style-name"] = rEmitContext.rStyles.getStyleName( rElem.StyleId );
rProps[ "svg:width" ] = convertPixelToUnitString( rElem.w );
rProps[ "svg:height" ] = convertPixelToUnitString( rElem.h );
@@ -791,7 +791,7 @@ void DrawXmlFinalizer::visit( PolyPolyElement& elem, const std::list< Element* >
aVec.setX ( convPx2mmPrec2( aVec.getX() )*100.0 );
aVec.setY ( convPx2mmPrec2( aVec.getY() )*100.0 );
- aGCProps[ "svg:stroke-width" ] = OUString::valueOf( aVec.getLength() );
+ aGCProps[ "svg:stroke-width" ] = OUString::number( aVec.getLength() );
}
}
else
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx
index b36a39bf0242..04238149efe7 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx
@@ -127,13 +127,13 @@ void WriterXmlEmitter::fillFrameProps( DrawElement& rElem,
{
PageElement* pPage = dynamic_cast<PageElement*>(pAnchor);
rProps[ "text:anchor-type" ] = "page";
- rProps[ "text:anchor-page-number" ] = OUString::valueOf(pPage->PageNumber);
+ rProps[ "text:anchor-page-number" ] = OUString::number(pPage->PageNumber);
}
rel_x -= pAnchor->x;
rel_y -= pAnchor->y;
}
- rProps[ "draw:z-index" ] = OUString::valueOf( rElem.ZOrder );
+ rProps[ "draw:z-index" ] = OUString::number( rElem.ZOrder );
rProps[ "draw:style-name"] = rEmitContext.rStyles.getStyleName( rElem.StyleId );
rProps[ "svg:width" ] = convertPixelToUnitString( rElem.w );
rProps[ "svg:height" ] = convertPixelToUnitString( rElem.h );
@@ -856,7 +856,7 @@ void WriterXmlFinalizer::visit( PolyPolyElement& elem, const std::list< Element*
aVec.setX ( convPx2mmPrec2( aVec.getX() )*100.0 );
aVec.setY ( convPx2mmPrec2( aVec.getY() )*100.0 );
- aGCProps[ "svg:stroke-width" ] = OUString::valueOf( aVec.getLength() );
+ aGCProps[ "svg:stroke-width" ] = OUString::number( aVec.getLength() );
}
}
else
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index b442f76d3148..8b93a27fbe1c 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -1928,7 +1928,7 @@ void AccessibleNotes::SetTextView (
new PresenterAccessible::AccessibleParagraph(
css::lang::Locale(),
AccessibleRole::PARAGRAPH,
- "Paragraph"+OUString::valueOf(nIndex),
+ "Paragraph"+OUString::number(nIndex),
rpTextView->GetParagraph(nIndex),
nIndex));
pParagraph->LateInitialization();
diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx
index 6e419965c0e6..bf0b4c135df6 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -334,10 +334,10 @@ void PresenterController::UpdatePaneTitles (void)
OUString sSlideCount ("---");
Reference<container::XIndexAccess> xIndexAccess(mxSlideShowController, UNO_QUERY);
if (xIndexAccess.is())
- sSlideCount = OUString::valueOf(xIndexAccess->getCount());
+ sSlideCount = OUString::number(xIndexAccess->getCount());
// Get string for current slide index.
- OUString sCurrentSlideNumber (OUString::valueOf(mnCurrentSlideIndex + 1));
+ OUString sCurrentSlideNumber (OUString::number(mnCurrentSlideIndex + 1));
// Get name of the current slide.
OUString sCurrentSlideName;
@@ -1184,7 +1184,7 @@ void PresenterController::UpdatePendingSlideNumber (const sal_Int32 nPendingSlid
if ( ! pFont->mxFont.is())
return;
- const OUString sText (OUString::valueOf(mnPendingSlideNumber));
+ const OUString sText (OUString::number(mnPendingSlideNumber));
rendering::StringContext aContext (sText, 0, sText.getLength());
Reference<rendering::XTextLayout> xLayout (
pFont->mxFont->createTextLayout(
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index 05caa7e80f1c..6e88fbef2d8a 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -565,7 +565,7 @@ Reference<drawing::framework::XResourceId> PresenterScreen::GetMainPaneId (
Reference<XComponentContext>(mxContextWeak),
PresenterHelper::msFullScreenPaneURL
+ "?FullScreen=true&ScreenNumber="
- + OUString::valueOf(nScreen));
+ + OUString::number(nScreen));
}
void PresenterScreen::RequestShutdownPresenterScreen (void)
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index 01f886fdd2f1..0af04cfb70d9 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -1585,7 +1585,7 @@ void PresenterSlideSorter::MouseOverManager::SetSlide (
xSlideProperties->getPropertyValue("LinkDisplayName") >>= msText;
if (msText.isEmpty())
- msText = "Slide " + OUString::valueOf(nSlideIndex + 1);
+ msText = "Slide " + OUString::number(nSlideIndex + 1);
}
}
else
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index e5d7efe98c37..6fcd6d280f0d 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -1812,15 +1812,15 @@ OUString TimeFormatter::FormatTime (const oslDateTime& rTime)
const sal_Int32 nSeconds(sal::static_int_cast<sal_Int32>(rTime.Seconds));
// Hours
if (mbIs24HourFormat)
- sText.append(OUString::valueOf(nHours));
+ sText.append(OUString::number(nHours));
else
- sText.append(OUString::valueOf(
+ sText.append(OUString::number(
sal::static_int_cast<sal_Int32>(nHours>12 ? nHours-12 : nHours)));
sText.append(":");
// Minutes
- const OUString sMinutes (OUString::valueOf(nMinutes));
+ const OUString sMinutes (OUString::number(nMinutes));
if (sMinutes.getLength() == 1)
sText.append("0");
sText.append(sMinutes);
@@ -1829,7 +1829,7 @@ OUString TimeFormatter::FormatTime (const oslDateTime& rTime)
if (mbIsShowSeconds)
{
sText.append(":");
- const OUString sSeconds (OUString::valueOf(nSeconds));
+ const OUString sSeconds (OUString::number(nSeconds));
if (sSeconds.getLength() == 1)
sText.append("0");
sText.append(sSeconds);