From bccf34c19ae022b67565e212fa4ec0d5213947de Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 2 Jul 2012 16:02:38 +0100 Subject: ditch String::CreateFromAscii Change-Id: I2b482bd323ac510629c5ee31868010b7cd6ce691 --- forms/source/richtext/richtextvclcontrol.cxx | 4 ++-- forms/source/solar/control/navtoolbar.cxx | 8 ++++---- forms/source/xforms/binding.cxx | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'forms') diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index 043aeff2456c..f264f77a81cb 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.cxx @@ -252,8 +252,8 @@ namespace frm for ( size_t i = 0; i < SAL_N_ELEMENTS( aExportFormats ); ++i ) { aFP.AddFilter( - String::CreateFromAscii( aExportFormats[i].pDescription ), - String::CreateFromAscii( aExportFormats[i].pExtension ) ); + rtl::OUString::createFromAscii( aExportFormats[i].pDescription ), + rtl::OUString::createFromAscii( aExportFormats[i].pExtension ) ); } ErrCode nResult = aFP.Execute(); if ( nResult == 0 ) diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index ad23014600e5..ae62547851ba 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -66,9 +66,9 @@ namespace frm static String getLabelString( sal_uInt16 _nResId ) { - String sLabel = String::CreateFromAscii( " " ); + String sLabel = rtl::OUString( " " ); sLabel += String( FRM_RES_STRING( _nResId ) ); - sLabel += String::CreateFromAscii( " " ); + sLabel += rtl::OUString( " " ); return sLabel; } @@ -643,11 +643,11 @@ namespace frm break; case FormFeature::MoveAbsolute: - sItemText = String::CreateFromAscii( "12345678" ); + sItemText = rtl::OUString( "12345678" ); break; case FormFeature::TotalRecords: - sItemText = String::CreateFromAscii( "123456" ); + sItemText = rtl::OUString( "123456" ); break; } diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index ae5c11e943fc..c9d47c5bcfb0 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.cxx @@ -1028,7 +1028,7 @@ void Binding::_checkBindingID() { // no binding ID? then make one up! OUString sIDPrefix = getResource( RID_STR_XFORMS_BINDING_UI_NAME ); - sIDPrefix += String::CreateFromAscii( " " ); + sIDPrefix += rtl::OUString(" "); sal_Int32 nNumber = 0; OUString sName; do -- cgit