From 61345105ff0d11da9c6f5e5149cc2977b33ec36e Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 2 Jun 2012 14:18:49 -0500 Subject: targeted string re-work Change-Id: Ie65e17698cc11301873e964868c4c8f4d8dc953c --- sd/source/filter/html/buttonset.cxx | 6 +++--- sd/source/filter/ppt/pptin.cxx | 4 ++-- sd/source/filter/sdpptwrp.cxx | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx index 8d89d1fd2d2f..b819e302d0b2 100644 --- a/sd/source/filter/html/buttonset.cxx +++ b/sd/source/filter/html/buttonset.cxx @@ -100,7 +100,7 @@ bool ButtonsImpl::getGraphic( const Reference< XGraphicProvider >& xGraphicProvi if( xInputStream.is() && xGraphicProvider.is() ) try { Sequence< PropertyValue > aMediaProperties( 1 ); - aMediaProperties[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "InputStream" ) ); + aMediaProperties[0].Name = ::rtl::OUString("InputStream" ); aMediaProperties[0].Value <<= xInputStream; Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ) ); @@ -160,7 +160,7 @@ public: ButtonSetImpl::ButtonSetImpl() { - const OUString sSubPath( RTL_CONSTASCII_USTRINGPARAM( "/wizard/web/buttons" ) ); + const OUString sSubPath( "/wizard/web/buttons" ); OUString sSharePath( SvtPathOptions().GetConfigPath() ); sSharePath += sSubPath; @@ -266,7 +266,7 @@ Reference< XGraphicProvider > ButtonSetImpl::getGraphicProvider() { Reference< XGraphicProvider > xGraphProvider( xServiceManager->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.graphic.GraphicProvider" ) ) ), UNO_QUERY_THROW ); + ::rtl::OUString( "com.sun.star.graphic.GraphicProvider" ) ), UNO_QUERY_THROW ); mxGraphicProvider = xGraphProvider; } diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index d7cd210a50a4..e456a4e1b5f9 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -116,7 +116,7 @@ SdPPTImport::SdPPTImport( SdDrawDocument* pDocument, SvStream& rDocStream, SvSto sal_uInt32 nImportFlags = 0; #ifdef DBG_UTIL - PropRead* pSummaryInformation = new PropRead( rStorage, String( RTL_CONSTASCII_USTRINGPARAM( "\005SummaryInformation" ) ) ); + PropRead* pSummaryInformation = new PropRead( rStorage, String( "\005SummaryInformation" ) ); if ( pSummaryInformation->IsValid() ) { pSummaryInformation->Read(); @@ -132,7 +132,7 @@ SdPPTImport::SdPPTImport( SdDrawDocument* pDocument, SvStream& rDocStream, SvSto { String aComment; aPropItem.Read( aComment ); - if ( aComment.Search( String( RTL_CONSTASCII_USTRINGPARAM( "Applixware" ) ), 0 ) != STRING_NOTFOUND ) + if ( aComment.Search( String( "Applixware" ), 0 ) != STRING_NOTFOUND ) { nImportFlags |= PPT_IMPORTFLAGS_NO_TEXT_ASSERT; } diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index 052cf611835b..6be40e8e9535 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -86,7 +86,7 @@ sal_Bool SdPPTFilter::Import() /* check if there is a dualstorage, then the document is propably a PPT95 containing PPT97 */ SvStorageRef xDualStorage; - String sDualStorage( RTL_CONSTASCII_USTRINGPARAM( "PP97_DUALSTORAGE" ) ); + String sDualStorage( "PP97_DUALSTORAGE" ); if ( pStorage->IsContained( sDualStorage ) ) { xDualStorage = pStorage->OpenSotStorage( sDualStorage, STREAM_STD_READ ); -- cgit v1.2.3