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 /editeng | |
| parent | 8df9025eac81d8a65162c396d28d176c084d16b3 (diff) | |
ByteString->rtl::OString[Buffer]
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/items/frmitems.cxx | 11 | ||||
| -rw-r--r-- | editeng/source/uno/unonrule.cxx | 3 |
2 files changed, 8 insertions, 6 deletions
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 0a94389f2c33..5eaac774713b 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -3544,11 +3544,12 @@ bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const sLink = *pStrLink; else if( pImpl->pGraphicObject ) { - OUString sPrefix(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX)); - String sId( pImpl->pGraphicObject->GetUniqueID(), - RTL_TEXTENCODING_ASCII_US ); - sLink = sPrefix; - sLink += OUString(sId); + OUString sPrefix(RTL_CONSTASCII_USTRINGPARAM( + UNO_NAME_GRAPHOBJ_URLPREFIX)); + OUString sId(rtl::OStringToOUString( + pImpl->pGraphicObject->GetUniqueID(), + RTL_TEXTENCODING_ASCII_US)); + sLink = sPrefix + sId; } rVal <<= sLink; } diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index d3915e770d21..a69aadaed881 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/editeng/source/uno/unonrule.cxx @@ -244,7 +244,8 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex( sa { const GraphicObject* pGrafObj = pBrush->GetGraphicObject(); OUString aURL( RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX)); - aURL += OUString::createFromAscii( pGrafObj->GetUniqueID().GetBuffer() ); + aURL += OStringToOUString(pGrafObj->GetUniqueID(), + RTL_TEXTENCODING_ASCII_US); aVal <<= aURL; const beans::PropertyValue aGraphicProp( OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicURL")), -1, aVal, beans::PropertyState_DIRECT_VALUE); |