diff options
| -rw-r--r-- | basctl/source/basicide/linenumberwindow.cxx | 4 | ||||
| -rw-r--r-- | cui/source/options/optlingu.cxx | 6 | ||||
| -rw-r--r-- | reportdesign/source/ui/dlg/GroupsSorting.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/interpr1.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/excel/xiescher.cxx | 6 | ||||
| -rw-r--r-- | svl/source/items/intitem.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/uno/wizard/wizardshell.cxx | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx index 837e477cf287..052e2a3f4f75 100644 --- a/basctl/source/basicide/linenumberwindow.cxx +++ b/basctl/source/basicide/linenumberwindow.cxx @@ -83,8 +83,8 @@ void LineNumberWindow::Paint( const Rectangle& ) } sal_Int64 y = (nStartLine - 1) * nLineHeight; - for(int n = nStartLine; n <= nEndLine; ++n, y += nLineHeight) - DrawText(Point(0, y - m_nCurYOffset), String::CreateFromInt32(n)); + for(sal_Int32 n = nStartLine; n <= nEndLine; ++n, y += nLineHeight) + DrawText(Point(0, y - m_nCurYOffset), rtl::OUString::valueOf(n)); } void LineNumberWindow::DataChanged(DataChangedEvent const & rDCEvt) diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index b23de8b7aba3..5c2ad383ffc4 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -490,10 +490,10 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, OptionsUserData aData( (sal_uLong) pEntry->GetUserData() ); if(aData.HasNumericValue()) { - String sTxt( ' ' ); - sTxt += String::CreateFromInt32( aData.GetNumericValue() ); + rtl::OUStringBuffer sTxt; + aTxt.append(' ').append(static_cast<sal_Int32>(aData.GetNumericValue())); rDev.SetFont( aFont ); - rDev.DrawText( aNewPos, sTxt ); + rDev.DrawText( aNewPos, sTxt.makeStringAndClear() ); } rDev.SetFont( aOldFont ); diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 5edc7a5414c7..69f81d99fa6a 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -1355,7 +1355,7 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _x nPos = 0; } m_aGroupOnLst.SelectEntryPos(nPos); - m_aGroupIntervalEd.SetText(String::CreateFromInt32(_xGroup->getGroupInterval())); + m_aGroupIntervalEd.SetText(rtl::OUString::valueOf(_xGroup->getGroupInterval())); m_aGroupIntervalEd.SaveValue(); m_aGroupIntervalEd.Enable( nPos != 0 ); m_aKeepTogetherLst.SelectEntryPos(_xGroup->getKeepTogether()); diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 66c19f5e59e6..3f463219acf3 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -2102,7 +2102,7 @@ void getFormatString(SvNumberFormatter* pFormatter, sal_uLong nFormat, String& r } } if( bAppendPrec ) - rFmtStr += String::CreateFromInt32( nPrec ); + rFmtStr += rtl::OUString::valueOf(static_cast<sal_Int32>(nPrec)); const SvNumberformat* pFormat = pFormatter->GetEntry( nFormat ); if( lcl_FormatHasNegColor( pFormat ) ) rFmtStr += '-'; diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 13b1667a98a4..74ed03b8d6e9 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -4176,11 +4176,11 @@ void XclImpObjectManager::ConvertObjects() OUString XclImpObjectManager::GetDefaultObjName( const XclImpDrawObjBase& rDrawObj ) const { - String aDefName; + rtl::OUStringBuffer aDefName; DefObjNameMap::const_iterator aIt = maDefObjNames.find( rDrawObj.GetObjType() ); if( aIt != maDefObjNames.end() ) - aDefName.Append( aIt->second ); - return aDefName.Append( sal_Unicode( ' ' ) ).Append( String::CreateFromInt32( rDrawObj.GetObjId() ) ); + aDefName.append(aIt->second); + return aDefName.append(' ').append(static_cast<sal_Int32>(rDrawObj.GetObjId())).makeStringAndClear(); } ScRange XclImpObjectManager::GetUsedArea( SCTAB nScTab ) const diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx index 9fea48419f3a..abe1586c17db 100644 --- a/svl/source/items/intitem.cxx +++ b/svl/source/items/intitem.cxx @@ -103,7 +103,7 @@ SfxItemPresentation SfxInt16Item::GetPresentation(SfxItemPresentation, const IntlWrapper *) const { DBG_CHKTHIS(SfxInt16Item, 0); - rText = UniString::CreateFromInt32(m_nValue); + rText = rtl::OUString::valueOf(static_cast<sal_Int32>(m_nValue)); return SFX_ITEM_PRESENTATION_NAMELESS; } diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx index f6a20206daf7..37b033864edc 100644 --- a/svtools/source/uno/wizard/wizardshell.cxx +++ b/svtools/source/uno/wizard/wizardshell.cxx @@ -239,7 +239,7 @@ namespace svt { namespace uno DBG_UNHANDLED_EXCEPTION(); } // fallback for ill-behaved clients: the numeric state - return String::CreateFromInt32( i_nState ); + return rtl::OUString::valueOf(static_cast<sal_Int32>(i_nState)); } //------------------------------------------------------------------------------------------------------------------ |