diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-20 13:25:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-08-22 10:49:30 +0200 |
| commit | ac3c5d299b417531f923371f9e7af93fee5e4587 (patch) | |
| tree | 128b9a014c028132d259c31df587fd6e2c7760ba | |
| parent | c758c9cda0478f7e99e78d127e42114c89809dcd (diff) | |
convert svtools/source/urlobj/* from String to OUString
Change-Id: I1fdf450d598746f89688bdd7c41483b0f4d86152
| -rw-r--r-- | svtools/source/urlobj/inetimg.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx index 17591c7158f0..b7a98620d60b 100644 --- a/svtools/source/urlobj/inetimg.cxx +++ b/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; |