diff options
| -rw-r--r-- | cppcanvas/source/mtfrenderer/emfplus.cxx | 2 | ||||
| -rw-r--r-- | cppuhelper/source/implbase.cxx | 1 | ||||
| -rw-r--r-- | cui/source/tabpages/numpages.cxx | 12 | ||||
| -rw-r--r-- | extensions/source/ole/oleobjw.cxx | 8 | ||||
| -rw-r--r-- | framework/inc/macros/debug/plugin.hxx | 2 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxaccessiblecomponent.cxx | 2 |
6 files changed, 14 insertions, 13 deletions
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index a8b08d2067e5..384dd2c0555e 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -771,7 +771,7 @@ namespace cppcanvas mfStream.Seek(0); static sal_Int32 emfp_debug_stream_number = 0; OUString emfp_debug_filename("/tmp/emf-embedded-stream"); - emfp_debug_filename += OUString::valueOf(emfp_debug_stream_number++); + emfp_debug_filename += OUString::number(emfp_debug_stream_number++); emfp_debug_filename += OUString(".emf"); SvFileStream file( emfp_debug_filename, STREAM_WRITE | STREAM_TRUNC ); diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx index 0d49d5fdbf78..a4e46c6b7ad0 100644 --- a/cppuhelper/source/implbase.cxx +++ b/cppuhelper/source/implbase.cxx @@ -32,6 +32,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using rtl::OUString; +using rtl::OString; namespace { diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 54126259163a..8233636ac5c4 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -2685,20 +2685,20 @@ void lcl_PrintDebugOutput(FixedText& rFixed, const SvxNumberFormat& rNumFmt) OUString const sHash( " # " ); if ( rNumFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION ) { - OUString sDebugText( OUString::valueOf( TWIP_TO_MM100(rNumFmt.GetAbsLSpace() ) ) ); + OUString sDebugText( OUString::number( TWIP_TO_MM100(rNumFmt.GetAbsLSpace() ) ) ); sDebugText += sHash; - sDebugText += OUString::valueOf( TWIP_TO_MM100(rNumFmt.GetCharTextDistance() ) ); + sDebugText += OUString::number( TWIP_TO_MM100(rNumFmt.GetCharTextDistance() ) ); sDebugText += sHash; - sDebugText += OUString::valueOf( TWIP_TO_MM100(rNumFmt.GetFirstLineOffset() ) ); + sDebugText += OUString::number( TWIP_TO_MM100(rNumFmt.GetFirstLineOffset() ) ); rFixed.SetText(sDebugText); } else if ( rNumFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT ) { - String sDebugText( OUString::valueOf( TWIP_TO_MM100(rNumFmt.GetListtabPos() ) ) ); + String sDebugText( OUString::number( TWIP_TO_MM100(rNumFmt.GetListtabPos() ) ) ); sDebugText += sHash; - sDebugText += OUString::valueOf( TWIP_TO_MM100(rNumFmt.GetFirstLineIndent() ) ); + sDebugText += OUString::number( TWIP_TO_MM100(rNumFmt.GetFirstLineIndent() ) ); sDebugText += sHash; - sDebugText += OUString::valueOf( TWIP_TO_MM100(rNumFmt.GetIndentAt() ) ); + sDebugText += OUString::number( TWIP_TO_MM100(rNumFmt.GetIndentAt() ) ); rFixed.SetText(sDebugText); } diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index 0ef5557213f8..7822d93e2191 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -1040,7 +1040,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName, "[automation bridge]IUnknownWrapper_Impl::" "invokeWithDispIdUnoTlb\n" "Could not create out parameter at index: " + - OUString::valueOf((sal_Int32) i)); + OUString::number((sal_Int32) i)); } } @@ -1415,7 +1415,7 @@ uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const OUString& aName, con { throw InvocationTargetException( "[automation bridge] ITypeInfo::GetIDsOfNames returned error " - + OUString::valueOf((sal_Int32) hr, 16), Reference<XInterface>(), Any()); + + OUString::number((sal_Int32) hr, 16), Reference<XInterface>(), Any()); } } @@ -1870,7 +1870,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc, { throw InvocationTargetException( "[automation bridge] ITypeInfo::GetIDsOfNames returned error " - + OUString::valueOf((sal_Int32) hr, 16), Reference<XInterface>(), Any()); + + OUString::number((sal_Int32) hr, 16), Reference<XInterface>(), Any()); } } @@ -1906,7 +1906,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc, OUStringBuffer buf(256); buf.appendAscii("ole automation bridge: The called function expects an argument at" "position: "); //a different number of arguments")), - buf.append(OUString::valueOf((sal_Int32) i)); + buf.append(OUString::number((sal_Int32) i)); buf.appendAscii(" (index starting at 0)."); throw IllegalArgumentException( buf.makeStringAndClear(), Reference<XInterface>(), (sal_Int16) i); diff --git a/framework/inc/macros/debug/plugin.hxx b/framework/inc/macros/debug/plugin.hxx index ffebf741378d..250d92d56bcb 100644 --- a/framework/inc/macros/debug/plugin.hxx +++ b/framework/inc/macros/debug/plugin.hxx @@ -144,7 +144,7 @@ { \ sal_Int32 nBytes = XSTREAM->available(); \ OString sInfo("Stream with "); \ - sInfo += OString::valueOf( (sal_Int32)nBytes ); \ + sInfo += OString::number(nBytes); \ sInfo += " Bytes, "; \ sBuffer.append( sInfo ); \ } \ diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index d18915805224..347ee5d96d8e 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -616,7 +616,7 @@ OUString VCLXAccessibleComponent::getAccessibleName( ) throw (uno::RuntimeExcep aName = GetWindow()->GetAccessibleName(); #if OSL_DEBUG_LEVEL > 1 aName += OUString(" (Type = "); - aName += OUString::valueOf(static_cast<sal_Int32>(GetWindow()->GetType())); + aName += OUString::number(static_cast<sal_Int32>(GetWindow()->GetType())); aName += OUString( ")"); #endif } |