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 /svx/source/xml | |
| parent | 8df9025eac81d8a65162c396d28d176c084d16b3 (diff) | |
ByteString->rtl::OString[Buffer]
Diffstat (limited to 'svx/source/xml')
| -rw-r--r-- | svx/source/xml/xmlgrhlp.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 23cb968233b9..78e458cf5306 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -695,11 +695,12 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, s if( aObj.GetType() != GRAPHIC_NONE ) { - const static ::rtl::OUString aBaseURL( RTL_CONSTASCII_USTRINGPARAM( XML_GRAPHICOBJECT_URL_BASE ) ); - maGrfObjs.push_back( aObj ); + ::rtl::OUString aBaseURL( RTL_CONSTASCII_USTRINGPARAM( XML_GRAPHICOBJECT_URL_BASE ) ); + rURLPair.second = aBaseURL; - rURLPair.second += String( aObj.GetUniqueID().GetBuffer(), RTL_TEXTENCODING_ASCII_US ); + rURLPair.second += rtl::OStringToOUString(aObj.GetUniqueID(), + RTL_TEXTENCODING_ASCII_US); } else rURLPair.second = String(); @@ -951,8 +952,9 @@ Reference< XOutputStream > SAL_CALL SvXMLGraphicHelper::createOutputStream() if( pOStm ) { - const GraphicObject& rGrfObj = pOStm->GetGraphicObject(); - const ::rtl::OUString aId( ::rtl::OUString::createFromAscii( rGrfObj.GetUniqueID().GetBuffer() ) ); + const GraphicObject& rGrfObj = pOStm->GetGraphicObject(); + const ::rtl::OUString aId(::rtl::OStringToOUString( + rGrfObj.GetUniqueID(), RTL_TEXTENCODING_ASCII_US)); if( aId.getLength() ) { |