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 /framework/source/uielement | |
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 'framework/source/uielement')
4 files changed, 23 insertions, 23 deletions
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index c39d87a75dd1..cbf868e92e38 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -190,7 +190,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r fPoint = float( m_pHeightArray[nPos-1] ) / 10; // Create dispatchable .uno command and set it - aCommand = aFontHeightCommand + OUString::valueOf( fPoint ); + aCommand = aFontHeightCommand + OUString::number( fPoint ); pVCLPopupMenu->SetItemCommand( nPos, aCommand ); } } @@ -209,7 +209,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r fPoint = float( m_pHeightArray[nPos-1] ) / 10; // Create dispatchable .uno command and set it - aCommand = aFontHeightCommand + OUString::valueOf( fPoint ); + aCommand = aFontHeightCommand + OUString::number( fPoint ); pVCLPopupMenu->SetItemCommand( nPos, aCommand ); } pTempAry++; @@ -228,7 +228,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r fPoint = float( m_pHeightArray[nPos-1] ) / 10; // Create dispatchable .uno command and set it - aCommand = aFontHeightCommand + OUString::valueOf( fPoint ); + aCommand = aFontHeightCommand + OUString::number( fPoint ); pVCLPopupMenu->SetItemCommand( nPos, aCommand ); pTempAry++; diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index ad667efa7e01..ff46fb4e44ac 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -908,7 +908,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) if ( aItemCommand.isEmpty() ) { aItemCommand = OUString( "slot:" ); - aItemCommand += OUString::valueOf( (sal_Int32)pMenuItemHandler->nItemId ); + aItemCommand += OUString::number( pMenuItemHandler->nItemId ); pMenu->SetItemCommand( pMenuItemHandler->nItemId, aItemCommand ); } @@ -1343,7 +1343,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF // Set item command for popup menu to enable it for GetImageFromURL const OUString aSlotString( "slot:" ); OUString aNewItemCommand( aSlotString ); - aNewItemCommand += OUString::valueOf( (sal_Int32)ITEMID_ADDONLIST ); + aNewItemCommand += OUString::number( ITEMID_ADDONLIST ); pPopup->SetItemCommand( ITEMID_ADDONLIST, aNewItemCommand ); } else @@ -1960,7 +1960,7 @@ sal_uInt16 MenuBarManager::FillItemCommand(OUString& _rItemCommand, Menu* _pMenu { const static OUString aSlotString( "slot:" ); _rItemCommand = aSlotString; - _rItemCommand += OUString::valueOf( (sal_Int32)nItemId ); + _rItemCommand += OUString::number( nItemId ); _pMenu->SetItemCommand( nItemId, _rItemCommand ); } return nItemId; diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx index d5447d641f10..68c71fd362eb 100644 --- a/framework/source/uielement/objectmenucontroller.cxx +++ b/framework/source/uielement/objectmenucontroller.cxx @@ -90,7 +90,7 @@ void ObjectMenuController::fillPopupMenu( const Sequence< com::sun::star::embed: // use VCL popup menu pointer to set vital information that are not part of the awt implementation OUString aCommand( aVerbCommand ); - aCommand += OUString::valueOf( rVerb.VerbID ); + aCommand += OUString::number( rVerb.VerbID ); pVCLPopupMenu->SetItemCommand( i+1, aCommand ); // Store verb command } } diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index ea55937d94c0..39c0cef03baf 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -356,8 +356,8 @@ void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star:: double fValue; bool bFloat( false ); if ( impl_getValue( rControlCommand.Arguments[i].Value, nValue, fValue, bFloat )) - aStep = bFloat ? OUString::valueOf( fValue ) : - OUString::valueOf( nValue ); + aStep = bFloat ? OUString::number( fValue ) : + OUString::number( nValue ); break; } } @@ -374,7 +374,7 @@ void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star:: if ( impl_getValue( rControlCommand.Arguments[i].Value, nValue, fValue, bFloat )) { - aValue = bFloat ? OUString::valueOf( fValue ) : OUString::valueOf( nValue ); + aValue = bFloat ? OUString::number( fValue ) : OUString::number( nValue ); bFloatValue = bFloat; } break; @@ -394,18 +394,18 @@ void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star:: { if ( aName.equalsAsciiL( "Value", 5 )) { - aValue = bFloat ? OUString::valueOf( fValue ) : OUString::valueOf( nValue ); + aValue = bFloat ? OUString::number( fValue ) : OUString::number( nValue ); bFloatValue = bFloat; } else if ( aName.equalsAsciiL( "Step", 4 )) - aStep = bFloat ? OUString::valueOf( fValue ) : - OUString::valueOf( nValue ); + aStep = bFloat ? OUString::number( fValue ) : + OUString::number( nValue ); else if ( aName.equalsAsciiL( "LowerLimit", 10 )) - aMin = bFloat ? OUString::valueOf( fValue ) : - OUString::valueOf( nValue ); + aMin = bFloat ? OUString::number( fValue ) : + OUString::number( nValue ); else if ( aName.equalsAsciiL( "UpperLimit", 10 )) - aMax = bFloat ? OUString::valueOf( fValue ) : - OUString::valueOf( nValue ); + aMax = bFloat ? OUString::number( fValue ) : + OUString::number( nValue ); } else if ( aName.equalsAsciiL( "OutputFormat", 12 )) rControlCommand.Arguments[i].Value >>= m_aOutFormat; @@ -421,8 +421,8 @@ void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star:: double fValue; bool bFloat( false ); if ( impl_getValue( rControlCommand.Arguments[i].Value, nValue, fValue, bFloat )) - aMin = bFloat ? OUString::valueOf( fValue ) : - OUString::valueOf( nValue ); + aMin = bFloat ? OUString::number( fValue ) : + OUString::number( nValue ); break; } } @@ -437,8 +437,8 @@ void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star:: double fValue; bool bFloat( false ); if ( impl_getValue( rControlCommand.Arguments[i].Value, nValue, fValue, bFloat )) - aMax = bFloat ? OUString::valueOf( fValue ) : - OUString::valueOf( nValue ); + aMax = bFloat ? OUString::number( fValue ) : + OUString::number( nValue ); break; } } @@ -507,9 +507,9 @@ OUString SpinfieldToolbarController::impl_formatOutputString( double fValue ) if ( m_aOutFormat.isEmpty() ) { if ( m_bFloat ) - return OUString::valueOf( fValue ); + return OUString::number( fValue ); else - return OUString::valueOf( sal_Int32( fValue )); + return OUString::number( sal_Int32( fValue )); } else { |