diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-31 15:21:47 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-31 16:29:38 +0000 |
| commit | 94644aa76acd22ac4f9cdd5374c1e1262f382c03 (patch) | |
| tree | a154902f8555d53b273be4d8125acc37254aa134 /svtools/source/misc | |
| parent | 6fca59d9c2d3ee3833da6a71d390a2a5b6b73299 (diff) | |
make svtools ByteString free
Diffstat (limited to 'svtools/source/misc')
| -rw-r--r-- | svtools/source/misc/transfer.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 87b31647a3f4..519dcc785f21 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -2005,10 +2005,10 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr if( pFDesc->cItems ) { - ByteString aDesc( pFDesc->fgd[ 0 ].cFileName ); + rtl::OString aDesc( pFDesc->fgd[ 0 ].cFileName ); rtl_TextEncoding eTextEncoding = osl_getThreadTextEncoding(); - if( ( aDesc.Len() > 4 ) && aDesc.Copy( aDesc.Len() - 4 ).EqualsIgnoreCaseAscii( ".URL" ) ) + if( ( aDesc.getLength() > 4 ) && aDesc.copy(aDesc.Len() - 4).equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM(".URL")) ) { SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( INetURLObject( String( aDesc, eTextEncoding ) ).GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READ ); @@ -2031,16 +2031,16 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr if( pStream ) { - ByteString aLine; + rtl::OString aLine; sal_Bool bSttFnd = sal_False; while( pStream->ReadLine( aLine ) ) { - if( aLine.EqualsIgnoreCaseAscii( "[InternetShortcut]" ) ) + if (aLine.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("[InternetShortcut]"))) bSttFnd = sal_True; - else if( bSttFnd && aLine.Copy( 0, 4 ).EqualsIgnoreCaseAscii( "URL=" ) ) + else if (bSttFnd && aLine.copy(0, 4).equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("URL="))) { - rBmk = INetBookmark( String( aLine.Erase( 0, 4 ), eTextEncoding ), + rBmk = INetBookmark( String( aLine.copy(4), eTextEncoding ), String( aDesc.Erase( aDesc.Len() - 4 ), eTextEncoding ) ); bRet = sal_True; break; |