convert svtools/source/urlobj/* from String to OUString

Change-Id: I1fdf450d598746f89688bdd7c41483b0f4d86152

svtools/source/urlobj/inetimg.cxx

@@ -22,7 +22,7 @@
 
 #include <svtools/inetimg.hxx>
 
-#define TOKEN_SEPARATOR '\001'
+static const sal_Unicode TOKEN_SEPARATOR = '\001';
 
 sal_Bool INetImage::Write( SvStream& rOStm, sal_uLong nFormat ) const
 {
@@ -31,13 +31,13 @@ sal_Bool INetImage::Write( SvStream& rOStm, sal_uLong nFormat ) const
     {
     case SOT_FORMATSTR_ID_INET_IMAGE:
         {
-            String sString;
-            (sString += aImageURL ) += TOKEN_SEPARATOR;
-            (sString += aTargetURL ) += TOKEN_SEPARATOR;
-            (sString += aTargetFrame ) += TOKEN_SEPARATOR;
-            (sString += aAlternateText ) += TOKEN_SEPARATOR;
+            OUString sString;
+            (sString += aImageURL ) += OUString(TOKEN_SEPARATOR);
+            (sString += aTargetURL ) += OUString(TOKEN_SEPARATOR);
+            (sString += aTargetFrame ) += OUString(TOKEN_SEPARATOR);
+            (sString += aAlternateText ) += OUString(TOKEN_SEPARATOR);
             sString += OUString::number( aSizePixel.Width() );
-            sString += TOKEN_SEPARATOR;
+            sString += OUString(TOKEN_SEPARATOR);
             sString += OUString::number( aSizePixel.Height() );
 
             OString sOut(OUStringToOString(sString,
@@ -63,17 +63,17 @@ sal_Bool INetImage::Read( SvStream& rIStm, sal_uLong nFormat )
     {
     case SOT_FORMATSTR_ID_INET_IMAGE:
         {
-            String sINetImg = read_zeroTerminated_uInt8s_ToOUString(rIStm, RTL_TEXTENCODING_UTF8);
+            OUString sINetImg = read_zeroTerminated_uInt8s_ToOUString(rIStm, RTL_TEXTENCODING_UTF8);
             sal_Int32 nStart = 0;
-            aImageURL = sINetImg.GetToken( 0, TOKEN_SEPARATOR, nStart );
-            aTargetURL = sINetImg.GetToken( 0, TOKEN_SEPARATOR, nStart );
-            aTargetFrame = sINetImg.GetToken( 0, TOKEN_SEPARATOR, nStart );
-            aAlternateText = sINetImg.GetToken( 0, TOKEN_SEPARATOR, nStart );
-            aSizePixel.Width() = sINetImg.GetToken( 0, TOKEN_SEPARATOR,
-                                                    nStart ).ToInt32();
-            aSizePixel.Height() = sINetImg.GetToken( 0, TOKEN_SEPARATOR,
-                                                    nStart ).ToInt32();
-            bRet = 0 != sINetImg.Len();
+            aImageURL = sINetImg.getToken( 0, TOKEN_SEPARATOR, nStart );
+            aTargetURL = sINetImg.getToken( 0, TOKEN_SEPARATOR, nStart );
+            aTargetFrame = sINetImg.getToken( 0, TOKEN_SEPARATOR, nStart );
+            aAlternateText = sINetImg.getToken( 0, TOKEN_SEPARATOR, nStart );
+            aSizePixel.Width() = sINetImg.getToken( 0, TOKEN_SEPARATOR,
+                                                    nStart ).toInt32();
+            aSizePixel.Height() = sINetImg.getToken( 0, TOKEN_SEPARATOR,
+                                                    nStart ).toInt32();
+            bRet = !sINetImg.isEmpty();
         }
         break;