diff options
Diffstat (limited to 'canvas')
-rw-r--r-- | canvas/source/cairo/cairo_devicehelper.cxx | 2 | ||||
-rw-r--r-- | canvas/source/tools/verifyinput.cxx | 38 | ||||
-rw-r--r-- | canvas/source/vcl/devicehelper.cxx | 2 | ||||
-rw-r--r-- | canvas/source/vcl/spritecanvashelper.cxx | 4 | ||||
-rw-r--r-- | canvas/source/vcl/spritedevicehelper.cxx | 2 |
5 files changed, 24 insertions, 24 deletions
diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx index ce14003f9f84..3973836e797c 100644 --- a/canvas/source/cairo/cairo_devicehelper.cxx +++ b/canvas/source/cairo/cairo_devicehelper.cxx @@ -254,7 +254,7 @@ namespace cairocanvas if( mpRefDevice ) { OUString aFilename("dbg_frontbuffer"); - aFilename += OUString::valueOf(nFilePostfixCount); + aFilename += OUString::number(nFilePostfixCount); aFilename += ".bmp"; SvFileStream aStream( aFilename, STREAM_STD_READWRITE ); diff --git a/canvas/source/tools/verifyinput.cxx b/canvas/source/tools/verifyinput.cxx index b682caf20929..48fdad5f6456 100644 --- a/canvas/source/tools/verifyinput.cxx +++ b/canvas/source/tools/verifyinput.cxx @@ -227,7 +227,7 @@ namespace canvas throw lang::IllegalArgumentException( OUString::createFromAscii(pStr) + ": verifyInput(): AffineMatrix2D contains infinite or NAN value(s) at the following positions (m00-m12): " + - OUString::valueOf(nBinaryState), + OUString::number(nBinaryState), xIf, nArgPos ); } #else @@ -262,7 +262,7 @@ namespace canvas throw lang::IllegalArgumentException( OUString::createFromAscii(pStr) + ": verifyInput(): Matrix2D contains infinite or NAN value(s) at the following positions (m00-m11): " + - OUString::valueOf(nBinaryState), + OUString::number(nBinaryState), xIf, nArgPos ); } #else @@ -300,9 +300,9 @@ namespace canvas throw lang::IllegalArgumentException( OUString::createFromAscii(pStr) + ": verifyInput(): render state's device color has too few components (" + - OUString::valueOf(nMinColorComponents) + + OUString::number(nMinColorComponents) + " expected, " + - OUString::valueOf(renderState.DeviceColor.getLength()) + + OUString::number(renderState.DeviceColor.getLength()) + " provided)", xIf, nArgPos ); #else @@ -317,7 +317,7 @@ namespace canvas throw lang::IllegalArgumentException( OUString::createFromAscii(pStr) + ": verifyInput(): render state's CompositeOperation value out of range (" + - OUString::valueOf(sal::static_int_cast<sal_Int32>(renderState.CompositeOperation)) + + OUString::number(sal::static_int_cast<sal_Int32>(renderState.CompositeOperation)) + " not known)", xIf, nArgPos ); #else @@ -342,7 +342,7 @@ namespace canvas throw lang::IllegalArgumentException( OUString::createFromAscii(pStr) + ": verifyInput(): textures' alpha value out of range (is " + - OUString::valueOf(texture.Alpha) + ")", + OUString::number(texture.Alpha) + ")", xIf, nArgPos ); #else throw lang::IllegalArgumentException(); @@ -368,7 +368,7 @@ namespace canvas throw lang::IllegalArgumentException( OUString::createFromAscii(pStr) + ": verifyInput(): textures' RepeatModeX value is out of range (" + - OUString::valueOf(sal::static_int_cast<sal_Int32>(texture.RepeatModeX)) + + OUString::number(sal::static_int_cast<sal_Int32>(texture.RepeatModeX)) + " not known)", xIf, nArgPos ); #else @@ -383,7 +383,7 @@ namespace canvas throw lang::IllegalArgumentException( OUString::createFromAscii(pStr) + ": verifyInput(): textures' RepeatModeY value is out of range (" + - OUString::valueOf(sal::static_int_cast<sal_Int32>(texture.RepeatModeY)) + + OUString::number(sal::static_int_cast<sal_Int32>(texture.RepeatModeY)) + " not known)", xIf, nArgPos ); #else @@ -413,7 +413,7 @@ namespace canvas throw lang::IllegalArgumentException( OUString::createFromAscii(mpStr) + ": verifyInput(): one of stroke attributes' DashArray value out of range (is " + - OUString::valueOf(rVal) + ")", + OUString::number(rVal) + ")", mrIf, mnArgPos ); #else throw lang::IllegalArgumentException(); @@ -439,7 +439,7 @@ namespace canvas throw lang::IllegalArgumentException( OUString::createFromAscii(pStr) + ": verifyInput(): stroke attributes' StrokeWidth value out of range (is " + - OUString::valueOf(strokeAttributes.StrokeWidth) + + OUString::number(strokeAttributes.StrokeWidth) + ")", xIf, nArgPos ); #else @@ -454,7 +454,7 @@ namespace canvas throw lang::IllegalArgumentException( OUString::createFromAscii(pStr) + ": verifyInput(): stroke attributes' MiterLimit value out of range (is " + - OUString::valueOf(strokeAttributes.MiterLimit) + ")", + OUString::number(strokeAttributes.MiterLimit) + ")", xIf, nArgPos ); #else throw lang::IllegalArgumentException(); @@ -476,7 +476,7 @@ namespace canvas throw lang::IllegalArgumentException( OUString::createFromAscii(pStr) + ": verifyInput(): stroke attributes' StartCapType value is out of range (" + - OUString::valueOf(sal::static_int_cast<sal_Int32>(strokeAttributes.StartCapType)) + + OUString::number(sal::static_int_cast<sal_Int32>(strokeAttributes.StartCapType)) + " not known)", xIf, nArgPos ); #else @@ -491,7 +491,7 @@ namespace canvas throw lang::IllegalArgumentException( OUString::createFromAscii(pStr) + ": verifyInput(): stroke attributes' StartCapType value is out of range (" + - OUString::valueOf(sal::static_int_cast<sal_Int32>(strokeAttributes.EndCapType)) + + OUString::number(sal::static_int_cast<sal_Int32>(strokeAttributes.EndCapType)) + " not known)", xIf, nArgPos ); #else @@ -506,7 +506,7 @@ namespace canvas throw lang::IllegalArgumentException( OUString::createFromAscii(pStr) + ": verifyInput(): stroke attributes' JoinType value is out of range (" + - OUString::valueOf(sal::static_int_cast<sal_Int32>(strokeAttributes.JoinType)) + + OUString::number(sal::static_int_cast<sal_Int32>(strokeAttributes.JoinType)) + " not known)", xIf, nArgPos ); #else @@ -578,7 +578,7 @@ namespace canvas throw lang::IllegalArgumentException( OUString::createFromAscii(pStr) + ": verifyInput(): bitmap layout's ColorSpace getEndianness() value is out of range (" + - OUString::valueOf(sal::static_int_cast<sal_Int32>(bitmapLayout.ColorSpace->getEndianness())) + + OUString::number(sal::static_int_cast<sal_Int32>(bitmapLayout.ColorSpace->getEndianness())) + " not known)", xIf, nArgPos ); #else @@ -683,7 +683,7 @@ namespace canvas throw lang::IllegalArgumentException( OUString::createFromAscii(pStr) + ": verifyBitmapSize(): size has 0 or negative width (value: " + - OUString::valueOf(size.Width) + ")", + OUString::number(size.Width) + ")", xIf, 0 ); #else throw lang::IllegalArgumentException(); @@ -696,7 +696,7 @@ namespace canvas throw lang::IllegalArgumentException( OUString::createFromAscii(pStr) + ": verifyBitmapSize(): size has 0 or negative height (value: " + - OUString::valueOf(size.Height) + + OUString::number(size.Height) + ")", xIf, 0 ); #else @@ -717,7 +717,7 @@ namespace canvas throw lang::IllegalArgumentException( OUString::createFromAscii(pStr) + ": verifySpriteSize(): size has 0 or negative width (value: " + - OUString::valueOf(size.Width) + ")", + OUString::number(size.Width) + ")", xIf, 0 ); #else throw lang::IllegalArgumentException(); @@ -730,7 +730,7 @@ namespace canvas throw lang::IllegalArgumentException( OUString::createFromAscii(pStr) + ": verifySpriteSize(): size has 0 or negative height (value: " + - OUString::valueOf(size.Height) + ")", + OUString::number(size.Height) + ")", xIf, 0 ); #else throw lang::IllegalArgumentException(); diff --git a/canvas/source/vcl/devicehelper.cxx b/canvas/source/vcl/devicehelper.cxx index dc568749ee75..b874bd1a5ff3 100644 --- a/canvas/source/vcl/devicehelper.cxx +++ b/canvas/source/vcl/devicehelper.cxx @@ -212,7 +212,7 @@ namespace vclcanvas if( mpOutDev ) { OUString aFilename("dbg_frontbuffer"); - aFilename += OUString::valueOf(nFilePostfixCount); + aFilename += OUString::number(nFilePostfixCount); aFilename += OUString(".bmp"); SvFileStream aStream( aFilename, STREAM_STD_READWRITE ); diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx index 185d440d76a5..88a297025158 100644 --- a/canvas/source/vcl/spritecanvashelper.cxx +++ b/canvas/source/vcl/spritecanvashelper.cxx @@ -645,9 +645,9 @@ namespace vclcanvas mpRedrawManager->forEachSprite( makeAdder(nCount,sal_Int32(1)) ); OUString text( - OUString::valueOf( + OUString::number( // disambiguate overload... - static_cast<sal_Int64>(nCount) ) ); + nCount ) ); // pad with leading space while( text.getLength() < 3 ) diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx index 0a0e4b578f0f..2e1063c5f8b6 100644 --- a/canvas/source/vcl/spritedevicehelper.cxx +++ b/canvas/source/vcl/spritedevicehelper.cxx @@ -129,7 +129,7 @@ namespace vclcanvas if( mpBackBuffer ) { OUString aFilename("dbg_backbuffer"); - aFilename += OUString::valueOf(nFilePostfixCount); + aFilename += OUString::number(nFilePostfixCount); aFilename += OUString(".bmp"); SvFileStream aStream( aFilename, STREAM_STD_READWRITE ); |