ByteString->rtl::OString[Buffer]

5 files changed, 20 insertions, 11 deletions

diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index 5e5f9810ed8c..6d803b43c11e 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -688,7 +688,9 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoXBitmapTable_createInstance( XP
 uno::Any SvxUnoXBitmapTable::getAny( const XPropertyEntry* pEntry ) const throw()
 {
     OUString aURL( RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX));
-    aURL += OUString::createFromAscii( ((XBitmapEntry*)pEntry)->GetXBitmap().GetGraphicObject().GetUniqueID().GetBuffer() );
+    aURL += OStringToOUString(
+        ((XBitmapEntry*)pEntry)->GetXBitmap().GetGraphicObject().GetUniqueID(),
+        RTL_TEXTENCODING_ASCII_US);
 
     uno::Any aAny;
     aAny <<= aURL;
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 93363cab2d9b..67a311002552 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1671,7 +1671,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const ::rtl::OUString& rName, const
             sal_Bool bSwapped = static_cast< SdrGrafObj* >( mpObj.get() )->IsSwappedOut();
             const GraphicObject& rGrafObj = static_cast< SdrGrafObj*>( mpObj.get() )->GetGraphicObject(true);
             OUString aURL( RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX));
-            aURL += OUString::createFromAscii( rGrafObj.GetUniqueID().GetBuffer() );
+            aURL += OStringToOUString(rGrafObj.GetUniqueID(), RTL_TEXTENCODING_ASCII_US);
             rValue <<= aURL;
             if ( bSwapped )
                 static_cast< SdrGrafObj* >( mpObj.get() )->ForceSwapOut();
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index a7c08e759a99..7b642e6e061b 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -407,8 +407,10 @@ bool SvxOle2Shape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sfx
             if( pGraphic )
             {
                 GraphicObject aObj( *pGraphic );
-                aURL = OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX));
-                aURL += OUString::createFromAscii( aObj.GetUniqueID().GetBuffer() );
+                aURL = OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    UNO_NAME_GRAPHOBJ_URLPREFIX));
+                aURL += rtl::OStringToOUString(aObj.GetUniqueID(),
+                    RTL_TEXTENCODING_ASCII_US);
             }
         }
         rValue <<= aURL;
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() )
                 {
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 5f3237d1b7b1..1f421c4a5d7b 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -639,8 +639,11 @@ bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nM
         nMemberId == 0 )
     {
         XOBitmap aLocalXOBitmap( GetBitmapValue() );
-        aURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX));
-        aURL += ::rtl::OUString::createFromAscii( aLocalXOBitmap.GetGraphicObject().GetUniqueID().GetBuffer() );
+        aURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            UNO_NAME_GRAPHOBJ_URLPREFIX));
+        aURL += ::rtl::OStringToOUString(
+            aLocalXOBitmap.GetGraphicObject().GetUniqueID(),
+            RTL_TEXTENCODING_ASCII_US);
     }
     if( nMemberId == MID_BITMAP ||
         nMemberId == 0  )