diff options
Diffstat (limited to 'sfx2/source')
-rw-r--r-- | sfx2/source/appl/fileobj.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/appl/sfxpicklist.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/dialog/dockwin.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/filedlghelper.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/doc/Metadatable.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/docinf.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/doctemplates.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/doc/graphhelp.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/objmisc.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/menu/virtmenu.cxx | 8 |
11 files changed, 19 insertions, 19 deletions
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index b07731e2042e..06f1cca1bf31 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -613,7 +613,7 @@ void SvFileObject::SendStateChg_Impl( sfx2::LinkManager::LinkState nState ) if( !bStateChangeCalled && HasDataLinks() ) { css::uno::Any aAny; - aAny <<= OUString::valueOf( (sal_Int32)nState ); + aAny <<= OUString::number( nState ); DataChanged( SotExchange::GetFormatName( sfx2::LinkManager::RegisterStatusInfoId()), aAny ); bStateChangeCalled = sal_True; diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index c09f3604f3fa..8e146cbd2481 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -80,12 +80,12 @@ void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, cons if ( nNo < 9 ) { aPickEntry.append('~'); - aPickEntry.append(OUString::valueOf(static_cast<sal_Int32>(nNo + 1))); + aPickEntry.append(OUString::number(nNo + 1)); } else if ( nNo == 9 ) aPickEntry.appendAscii(RTL_CONSTASCII_STRINGPARAM("1~0")); else - aPickEntry.append(OUString::valueOf(static_cast<sal_Int32>(nNo + 1))); + aPickEntry.append(OUString::number(nNo + 1)); aPickEntry.appendAscii(RTL_CONSTASCII_STRINGPARAM(": ")); INetURLObject aURL( aURLString ); diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 1e3b0e2ed03f..abfb482c2f85 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -152,7 +152,7 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd , // create a resource URL from the nId provided by the sfx2 OUString aResourceURL( aDockWindowResourceURL ); - aResourceURL += OUString::valueOf(sal_Int32(nId)); + aResourceURL += OUString::number(nId); aPropValue.Value = uno::makeAny( aResourceURL ); aArgs[1] <<= aPropValue; diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 60de2670b61f..1a7d4669dbdb 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -1834,9 +1834,9 @@ void FileDialogHelper_Impl::addFilters( const String& rFactory, sQuery.appendAscii(RTL_CONSTASCII_STRINGPARAM(":module=")); sQuery.append(rFactory); // use long name here ! sQuery.appendAscii(RTL_CONSTASCII_STRINGPARAM(":iflags=")); - sQuery.append(OUString::valueOf((sal_Int32)m_nMustFlags)); + sQuery.append(OUString::number(m_nMustFlags)); sQuery.appendAscii(RTL_CONSTASCII_STRINGPARAM(":eflags=")); - sQuery.append(OUString::valueOf((sal_Int32)m_nDontFlags)); + sQuery.append(OUString::number(m_nDontFlags)); uno::Reference< XEnumeration > xResult; try diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx index 0a9e4a2c59b5..d7528f63de40 100644 --- a/sfx2/source/doc/Metadatable.cxx +++ b/sfx2/source/doc/Metadatable.cxx @@ -403,7 +403,7 @@ template< typename T > { sal_Int32 n; rtl_random_getBytes(s_Pool, & n, sizeof(n)); - id = prefix + OUString::valueOf(static_cast<sal_Int32>(abs(n))); + id = prefix + OUString::number(abs(n)); iter = i_rXmlIdMap.find(id); } while (iter != i_rXmlIdMap.end()); diff --git a/sfx2/source/doc/docinf.cxx b/sfx2/source/doc/docinf.cxx index 172cfb7eeeaf..266d226338fe 100644 --- a/sfx2/source/doc/docinf.cxx +++ b/sfx2/source/doc/docinf.cxx @@ -230,7 +230,7 @@ bool SFX2_DLLPUBLIC SaveOlePropertySet( rGlobSect.SetFileTimeValue( PROPID_EDITTIME, aEditTime ); rGlobSect.SetStringValue( PROPID_REVNUMBER, - OUString::valueOf( static_cast<sal_Int32>(i_xDocProps->getEditingCycles()) ) ); + OUString::number( i_xDocProps->getEditingCycles() ) ); if ( i_pThumb && i_pThumb->getLength() ) rGlobSect.SetThumbnailValue( PROPID_THUMBNAIL, *i_pThumb ); diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 136acac9b549..953f98bce23d 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -807,7 +807,7 @@ sal_Bool SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const OUString& { OUString aTryName = aPrefix; if ( nInd ) - aTryName += OUString::valueOf( nInd ); + aTryName += OUString::number( nInd ); try { @@ -870,7 +870,7 @@ OUString SfxDocTplService_Impl::CreateNewUniqueFileWithPrefix( const OUString& a sal_Bool bCreated = sal_False; OUString aTryName = aPrefix; if ( nInd ) - aTryName += OUString::valueOf( nInd ); + aTryName += OUString::number( nInd ); if ( aExt.toChar() != '.' ) aTryName += OUString( "." ); aTryName += aExt; diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx index 1f8a7f1e5356..2bf194a16c0f 100644 --- a/sfx2/source/doc/graphhelp.cxx +++ b/sfx2/source/doc/graphhelp.cxx @@ -451,7 +451,7 @@ sal_Bool GraphicHelper::getThumbnailReplacement_Impl( sal_Int32 nResID, const un { uno::Reference< graphic::XGraphicProvider > xGraphProvider(graphic::GraphicProvider::create(xContext)); OUString aURL("private:resource/sfx/bitmapex/"); - aURL += OUString::valueOf( nResID ); + aURL += OUString::number( nResID ); uno::Sequence< beans::PropertyValue > aMediaProps( 1 ); aMediaProps[0].Name = "URL"; diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 0e37c5d989d6..bc4b8e04469b 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -871,7 +871,7 @@ String SfxObjectShell::GetTitle if (pImp->bIsNamedVisible) { // Append number - aNoName += OUString::valueOf(static_cast<sal_Int32>(pImp->nVisualDocumentNumber)); + aNoName += OUString::number(pImp->nVisualDocumentNumber); } // Document called "noname" for the time being diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 5efb2b44f95d..2c9eeb7af10d 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -237,7 +237,7 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument // increase global instance counter. ++g_nInstanceCounter; // set own Runtime UID - m_sRuntimeUID = OUString::valueOf( g_nInstanceCounter ); + m_sRuntimeUID = OUString::number( g_nInstanceCounter ); } virtual ~IMPL_SfxBaseModel_DataContainer() @@ -3578,8 +3578,8 @@ Reference< ui::XUIConfigurationManager2 > SfxBaseModel::getUIConfigurationManage OUString aTitle( "Toolbar " ); for ( sal_Int32 i = 0; i < rToolbars.getLength(); i++ ) { - OUString aCustomTbxName = aNum + OUString::valueOf( i + 1 ); - OUString aCustomTbxTitle = aTitle + OUString::valueOf( i + 1 ); + OUString aCustomTbxName = aNum + OUString::number( i + 1 ); + OUString aCustomTbxTitle = aTitle + OUString::number( i + 1 ); Reference< container::XIndexContainer > xToolbar = rToolbars[i]; ConvertSlotsToCommands( pObjShell, xToolbar ); diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index d58fc65a510e..0d04debf6e60 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -382,7 +382,7 @@ void SfxVirtualMenu::CreateFromSVMenu() if ( Application::GetSettings().GetStyleSettings().GetUseImagesInMenus() ) { OUString aSlotURL( "slot:" ); - aSlotURL += OUString::valueOf( sal_Int32( nSlotId )); + aSlotURL += OUString::number( nSlotId); Image aImage = GetImage( xFrame, aSlotURL, false ); pSVMenu->SetItemImage( nSlotId, aImage ); } @@ -458,7 +458,7 @@ void SfxVirtualMenu::CreateFromSVMenu() else { OUString aSlotURL( "slot:" ); - aSlotURL += OUString::valueOf( sal_Int32( nSlotId )); + aSlotURL += OUString::number( nSlotId); aImage = GetImage( xFrame, aSlotURL, false ); } @@ -531,7 +531,7 @@ IMPL_LINK_NOARG(SfxVirtualMenu, SettingsChanged) else { OUString aSlotURL( "slot:" ); - aSlotURL += OUString::valueOf( sal_Int32( nSlotId )); + aSlotURL += OUString::number( nSlotId); pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, false )); } } @@ -773,7 +773,7 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu ) if ( Application::GetSettings().GetStyleSettings().GetUseImagesInMenus() ) { OUString aSlotURL( "slot:" ); - aSlotURL += OUString::valueOf( sal_Int32( SID_ADDONS )); + aSlotURL += OUString::number( SID_ADDONS); pMenu->SetItemImage( SID_ADDONS, GetImage( xFrame, aSlotURL, false )); } } |