diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-08-21 15:07:31 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-08-21 15:10:35 +0200 |
commit | 64b993e046f23baaacaff1572b7d2a816588b5ef (patch) | |
tree | 237dce36a1d4787d168a0520839f6aab22500487 /forms | |
parent | 75f41baab6ce75786a91fe461835ee16a23ec18e (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 'forms')
-rw-r--r-- | forms/source/component/DatabaseForm.cxx | 4 | ||||
-rw-r--r-- | forms/source/runtime/formoperations.cxx | 2 | ||||
-rw-r--r-- | forms/source/solar/component/navbarcontrol.cxx | 2 | ||||
-rw-r--r-- | forms/source/xforms/binding.cxx | 2 | ||||
-rw-r--r-- | forms/source/xforms/datatypes.cxx | 4 | ||||
-rw-r--r-- | forms/source/xforms/model_ui.cxx | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 4976da058e54..fc33131b6f14 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -660,7 +660,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc if (xSubmitButtonComponent == xComponentSet) { // <name>.x=<pos.X>&<name>.y=<pos.Y> - OUString aRhs = OUString::valueOf( MouseEvt.X ); + OUString aRhs = OUString::number( MouseEvt.X ); // Only if a name is available we have a name.x OUStringBuffer aLhs(aName); @@ -671,7 +671,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc rList.push_back( HtmlSuccessfulObj(aLhs.makeStringAndClear(), aRhs) ); aLhs.append(aName); - aRhs = OUString::valueOf( MouseEvt.Y ); + aRhs = OUString::number( MouseEvt.Y ); if (!aName.isEmpty()) aLhs.append(".y"); else diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index f2e2de68f670..539026476279 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -400,7 +400,7 @@ namespace frm if ( bIsNew ) ++nCount; - OUString sValue = OUString::valueOf( sal_Int32( nCount ) ); + OUString sValue = OUString::number( nCount ); if ( !bFinalCount ) sValue += OUString(" *"); diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx index b0850e7ab9b7..58c0c44e6b20 100644 --- a/forms/source/solar/component/navbarcontrol.cxx +++ b/forms/source/solar/component/navbarcontrol.cxx @@ -450,7 +450,7 @@ namespace frm } else if ( _nFeatureId == FormFeature::MoveAbsolute ) { - pNavBar->setFeatureText( _nFeatureId, OUString::valueOf(getIntegerState(_nFeatureId)) ); + pNavBar->setFeatureText( _nFeatureId, OUString::number(getIntegerState(_nFeatureId)) ); } } diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index 99222b267f7e..d4f677531245 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.cxx @@ -1022,7 +1022,7 @@ void Binding::_checkBindingID() do { nNumber++; - sName = sIDPrefix + OUString::valueOf( nNumber ); + sName = sIDPrefix + OUString::number( nNumber ); } while( xBindings->hasByName( sName ) ); setBindingID( sName ); diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx index 66dbd907856a..a4f522ef50b8 100644 --- a/forms/source/xforms/datatypes.cxx +++ b/forms/source/xforms/datatypes.cxx @@ -741,7 +741,7 @@ namespace xforms { double fValue( 0 ); normalizeValue( _rValue, fValue ); - return OUString::valueOf( fValue ); + return OUString::number( fValue ); } //-------------------------------------------------------------------- @@ -959,7 +959,7 @@ namespace xforms { sal_Int16 nValue( 0 ); OSL_VERIFY( _rValue >>= nValue ); - return OUString::valueOf( (sal_Int32)nValue ); + return OUString::number( nValue ); } //-------------------------------------------------------------------- diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx index e4b07df13691..281638e5a28e 100644 --- a/forms/source/xforms/model_ui.cxx +++ b/forms/source/xforms/model_ui.cxx @@ -598,7 +598,7 @@ Model::XNode_t Model::createAttribute( const XNode_t& xParent, while( xElement->hasAttribute( sUniqueName ) ) { nCount++; - sUniqueName = sName + OUString::valueOf( nCount ); + sUniqueName = sName + OUString::number( nCount ); } // TODO: implement proper namespace handling |