diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-21 01:09:00 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-22 09:39:16 +0100 |
| commit | 91a418d2137e33b48d9e524b53dd71e08754a06b (patch) | |
| tree | c59dacc45b00addbfd95a24221ee5bf49d400a19 /sd | |
| parent | dbfa0518af3d398f19d53d39fa72f5f437fd83fc (diff) | |
ByteString->rtl::OString
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 0e4dab8fab85..5a441b4ef611 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -433,13 +433,13 @@ sal_Bool ImplSdPPTImport::Import() { sal_uInt32 nPageNumber = 0; String aString( pHyperlink->aSubAdress ); - ByteString aStringAry[ 3 ]; + rtl::OString aStringAry[ 3 ]; sal_uInt16 nTokenCount = aString.GetTokenCount( ',' ); if ( nTokenCount > 3 ) nTokenCount = 3; sal_uInt16 nToken; for( nToken = 0; nToken < nTokenCount; nToken++ ) - aStringAry[ nToken ] = ByteString( aString.GetToken( nToken, (sal_Unicode)',' ), RTL_TEXTENCODING_UTF8 ); + aStringAry[nToken] = rtl::OUStringToOString(aString.GetToken( nToken, (sal_Unicode)',' ), RTL_TEXTENCODING_UTF8); sal_Bool bSucceeded = sal_False; @@ -448,7 +448,7 @@ sal_Bool ImplSdPPTImport::Import() { if (comphelper::string::isAsciiDecimalString(aStringAry[nToken])) { - sal_Int32 nNumber = aStringAry[ nToken ].ToInt32(); + sal_Int32 nNumber = aStringAry[ nToken ].toInt32(); if ( nNumber & ~0xff ) { PptSlidePersistList* pPageList = GetPageList( PPT_SLIDEPAGE ); @@ -486,7 +486,7 @@ sal_Bool ImplSdPPTImport::Import() { if (comphelper::string::isAsciiDecimalString(aStringAry[nToken])) { - sal_Int32 nNumber = aStringAry[ nToken ].ToInt32(); + sal_Int32 nNumber = aStringAry[ nToken ].toInt32(); if ( ( nNumber & ~0xff ) == 0 ) { nPageNumber = (sal_uInt32)nNumber - 1; |