diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-03-27 22:02:36 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-27 22:37:37 +0100 |
commit | 919f7104b51b156db34787eb7bd5f16e4ecfb633 (patch) | |
tree | 2186a07d0bb94bb488f964a4cfd413a1150b622a /sd | |
parent | callcatcher: update list (diff) | |
download | core-919f7104b51b156db34787eb7bd5f16e4ecfb633.tar.gz core-919f7104b51b156db34787eb7bd5f16e4ecfb633.zip |
drop intermediate temporary UniStrings
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/filter/eppt/epptso.cxx | 4 | ||||
-rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 17 |
2 files changed, 10 insertions, 11 deletions
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 6eec4bf1472b..6841e545db6d 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -1232,7 +1232,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u if ( pIter != maSlideNameList.end() ) { nPageIndex = pIter - maSlideNameList.begin(); - aPageUrl = UniString::CreateFromInt32( 256 + nPageIndex ); + aPageUrl = rtl::OUString::valueOf(static_cast<sal_Int32>(256 + nPageIndex)); aPageUrl.Append( String( RTL_CONSTASCII_USTRINGPARAM( "," ) ) ); aPageUrl.Append( String::CreateFromInt32( nPageIndex + 1 ) ); aPageUrl.Append( String( RTL_CONSTASCII_USTRINGPARAM( ",Slide " ) ) ); @@ -2057,7 +2057,7 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat nHyperLinkType = 7; String aEmpty; - String aHyperString = UniString::CreateFromInt32( 256 + nIndex ); + String aHyperString = rtl::OUString::valueOf(static_cast<sal_Int32>(256 + nIndex)); aHyperString.Append( String( RTL_CONSTASCII_USTRINGPARAM( "," ) ) ); aHyperString.Append( String::CreateFromInt32( nIndex + 1 ) ); aHyperString.Append( String( RTL_CONSTASCII_USTRINGPARAM( ",Slide " ) ) ); diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 069af5b479f9..147813b34293 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -1266,7 +1266,7 @@ sal_Bool ImplSdPPTImport::Import() DffRecordHeader aContent; if ( SeekToRec( rStCtrl, PPT_PST_CString, aCuHeader.GetRecEndFilePos(), &aContent ) ) { - String aCuShow; + rtl::OUString aCuShow; aContent.SeekToBegOfRecord( rStCtrl ); if ( ReadString( aCuShow ) ) { @@ -1868,7 +1868,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat String ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const { - String aRetval; + rtl::OUString aRetval; sal_uInt32 nPosMerk = rStCtrl.Tell(); DffRecordHeader aDocHd; if ( SeekToDocument( &aDocHd ) ) @@ -1885,7 +1885,7 @@ String ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const while( !bDone && SeekToRec( rStCtrl, PPT_PST_Sound, nDataLen, &aSoundRecHd ) ) { sal_uInt32 nStrLen = aSoundRecHd.GetRecEndFilePos(); - String aRefStr; + rtl::OUString aRefStr; sal_uInt32 nPosMerk2 = rStCtrl.Tell(); if ( SeekToRec( rStCtrl, PPT_PST_CString, nStrLen, NULL, 2 ) ) { @@ -1894,7 +1894,7 @@ String ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const } if ( bRefStrValid ) { - if ( UniString::CreateFromInt32( nSoundRef ) == aRefStr ) + if ( rtl::OUString::valueOf(static_cast<sal_Int32>(nSoundRef)) == aRefStr ) { rStCtrl.Seek( nPosMerk2 ); if ( SeekToRec( rStCtrl, PPT_PST_CString, nStrLen, NULL, 0 ) ) @@ -1915,12 +1915,11 @@ String ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const GalleryExplorer::FillObjList( GALLERY_THEME_SOUNDS, aSoundList ); GalleryExplorer::FillObjList( GALLERY_THEME_USERSOUNDS, aSoundList ); - for( size_t n = 0; ( n < aSoundList.size() ) && !bSoundExists; n++ ) + for( size_t n = 0; ( n < aSoundList.size() ) && !bSoundExists; ++n ) { INetURLObject aURL( aSoundList[ n ] ); - String aSoundName( aURL.GetName() ); - if( aSoundName == aRetval ) + if( aURL.GetName() == aRetval ) { aRetval = aSoundList[ n ]; bSoundExists = sal_True; @@ -2013,7 +2012,7 @@ String ImplSdPPTImport::ReadMedia( sal_uInt32 nMediaRef ) const case PPT_PST_CString : { aHd.SeekToBegOfRecord( rStCtrl ); - String aStr; + rtl::OUString aStr; if ( ReadString( aStr ) ) { if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aStr, aRetVal ) ) @@ -2622,7 +2621,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi case PPT_PST_InteractiveInfo: { sal_uInt32 nFilePosMerk2 = rSt.Tell(); - String aMacroName; + rtl::OUString aMacroName; if(SeekToRec( rSt, PPT_PST_CString, nHdRecEnd, NULL, 0 ) ) ReadString(aMacroName); |