diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-06-10 23:35:57 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-06-13 11:43:36 +0100 |
commit | 66580eea14fba104b47dea6103ead3e7c239bfcf (patch) | |
tree | d42c2fb4e445181dbfee895105d97d9947044a66 | |
parent | 832d65122a0ce5e5224c86a5b668dc3166cafe4b (diff) |
createFromAscii -> RTL_CONSTASCII_USTRINGPARAM
-rw-r--r-- | vcl/source/gdi/pdfwriter_impl2.cxx | 14 | ||||
-rw-r--r-- | vcl/source/gdi/svgread.cxx | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 17b684e6a675..c1fd5a8c6ca5 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -196,18 +196,18 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSiz uno::Reference < io::XStream > xStream = new utl::OStreamWrapper( aStrm ); uno::Reference< io::XSeekable > xSeekable( xStream, UNO_QUERY_THROW ); uno::Reference< graphic::XGraphicProvider > xGraphicProvider( ImplGetSVData()->maAppData.mxMSF->createInstance( - OUString::createFromAscii( "com.sun.star.graphic.GraphicProvider" ) ), UNO_QUERY ); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.graphic.GraphicProvider")) ), UNO_QUERY ); if ( xGraphicProvider.is() ) { uno::Reference< graphic::XGraphic > xGraphic( aGraphic.GetXGraphic() ); uno::Reference < io::XOutputStream > xOut( xStream->getOutputStream() ); - rtl::OUString aMimeType( ::rtl::OUString::createFromAscii( "image/jpeg" ) ); + rtl::OUString aMimeType(RTL_CONSTASCII_USTRINGPARAM("image/jpeg")); uno::Sequence< beans::PropertyValue > aOutMediaProperties( 3 ); - aOutMediaProperties[0].Name = ::rtl::OUString::createFromAscii( "OutputStream" ); + aOutMediaProperties[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OutputStream")); aOutMediaProperties[0].Value <<= xOut; - aOutMediaProperties[1].Name = ::rtl::OUString::createFromAscii( "MimeType" ); + aOutMediaProperties[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MimeType")); aOutMediaProperties[1].Value <<= aMimeType; - aOutMediaProperties[2].Name = ::rtl::OUString::createFromAscii( "FilterData" ); + aOutMediaProperties[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterData")); aOutMediaProperties[2].Value <<= aFilterData; xGraphicProvider->storeGraphic( xGraphic, aOutMediaProperties ); xOut->flush(); @@ -221,13 +221,13 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSiz xSeekable->seek( 0 ); Sequence< PropertyValue > aArgs( 1 ); - aArgs[ 0 ].Name = ::rtl::OUString::createFromAscii( "InputStream" ); + aArgs[ 0 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream")); aArgs[ 0 ].Value <<= xStream; uno::Reference< XPropertySet > xPropSet( xGraphicProvider->queryGraphicDescriptor( aArgs ) ); if ( xPropSet.is() ) { sal_Int16 nBitsPerPixel = 24; - if ( xPropSet->getPropertyValue( ::rtl::OUString::createFromAscii( "BitsPerPixel" ) ) >>= nBitsPerPixel ) + if ( xPropSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BitsPerPixel")) ) >>= nBitsPerPixel ) { bTrueColorJPG = nBitsPerPixel != 8; } diff --git a/vcl/source/gdi/svgread.cxx b/vcl/source/gdi/svgread.cxx index 47ef39c37f20..554cfa804b1b 100644 --- a/vcl/source/gdi/svgread.cxx +++ b/vcl/source/gdi/svgread.cxx @@ -78,7 +78,7 @@ namespace vcl if( nStmLen ) { - const vcl::RenderGraphic aSVGGraphic( ::rtl::OUString::createFromAscii( "image/svg+xml" ), nStmLen ); + const vcl::RenderGraphic aSVGGraphic( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("image/svg+xml")), nStmLen ); mrStm.Seek( nStmPos ); mrStm.Read( aSVGGraphic.GetGraphicData().get(), nStmLen ); |