diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-22 09:02:16 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-22 15:01:04 +0100 |
| commit | ac58231a01186d0935d0ff5fb2485d8750ed5022 (patch) | |
| tree | 386ecb69491890ca62bd049a45bb7ee26e8dd5f5 /sw | |
| parent | callcatcher: remove unused code (diff) | |
| download | core-ac58231a01186d0935d0ff5fb2485d8750ed5022.tar.gz core-ac58231a01186d0935d0ff5fb2485d8750ed5022.zip | |
ByteString->rtl::OString[Buffer]
Diffstat (limited to 'sw')
| -rwxr-xr-x | sw/source/core/graphic/ndgrf.cxx | 3 | ||||
| -rwxr-xr-x | sw/source/core/unocore/unoframe.cxx | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index a8e6dc099a66..b407c9b5b385 100755 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -795,7 +795,8 @@ SvStream* SwGrfNode::_GetStreamForEmbedGrf( String aExtStr = _aStrmName.Copy( nExtPos ); if ( GetGrfObj().GetType() != GRAPHIC_NONE ) { - _aStrmName = String( GetGrfObj().GetUniqueID(), RTL_TEXTENCODING_ASCII_US ); + _aStrmName = rtl::OStringToOUString(GetGrfObj().GetUniqueID(), + RTL_TEXTENCODING_ASCII_US); _aStrmName += aExtStr; } } diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 1225af12d2e6..8a8ffca43e64 100755 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -1488,10 +1488,11 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) } else { - String sPrefix( RTL_CONSTASCII_USTRINGPARAM(sGraphicObjectProtocol) ); - String sId( pGrfNode->GetGrfObj().GetUniqueID(), - RTL_TEXTENCODING_ASCII_US ); - (sGrfName = sPrefix) += sId; + rtl::OUString sPrefix( RTL_CONSTASCII_USTRINGPARAM(sGraphicObjectProtocol) ); + rtl::OUString sId(rtl::OStringToOUString( + pGrfNode->GetGrfObj().GetUniqueID(), + RTL_TEXTENCODING_ASCII_US)); + sGrfName = sPrefix + sId; } } aAny <<= OUString(sGrfName); |