From e2e2cc61144cb22227eebfadff0ea24b51ccfbd0 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Mon, 6 May 2013 16:32:22 +0200 Subject: remove usage of RTL_CONSTASCII_USTRINGPARAM Mechanical removal of usage together with OUString ctor, done by compiler plugin. Change-Id: I554227f76df0dac620b1b46fca32516f78b462c5 --- filter/source/msfilter/svdfppt.cxx | 2 +- filter/source/placeware/filter.cxx | 2 +- filter/source/svg/impsvgdialog.cxx | 12 +++++----- filter/source/svg/svgdialog.cxx | 4 ++-- .../source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 6 ++--- filter/source/xsltdialog/typedetectionimport.cxx | 26 +++++++++++----------- filter/source/xsltdialog/xmlfilterjar.cxx | 12 +++++----- 7 files changed, 32 insertions(+), 32 deletions(-) (limited to 'filter') diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 8354791b97b2..ae2f36f3354e 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -7368,7 +7368,7 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell ) eFS = com::sun::star::drawing::FillStyle_BITMAP; const XFillBitmapItem aXFillBitmapItem((const XFillBitmapItem&)pObj->GetMergedItem( XATTR_FILLBITMAP )); - OUString aURL( RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX)); + OUString aURL( UNO_NAME_GRAPHOBJ_URLPREFIX); aURL += OStringToOUString( aXFillBitmapItem.GetGraphicObject().GetUniqueID(), RTL_TEXTENCODING_ASCII_US); diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx index 52c48c23e95e..20f7f86a6926 100644 --- a/filter/source/placeware/filter.cxx +++ b/filter/source/placeware/filter.cxx @@ -164,7 +164,7 @@ Sequence< OUString > SAL_CALL PlaceWareExportFilter_getSupportedServiceNames( ) { Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); + pArray[0] = OUString ( SERVICE_NAME ); return aRet; } #undef SERVICE_NAME diff --git a/filter/source/svg/impsvgdialog.cxx b/filter/source/svg/impsvgdialog.cxx index 01e3648926f7..fc9c2c73d16b 100644 --- a/filter/source/svg/impsvgdialog.cxx +++ b/filter/source/svg/impsvgdialog.cxx @@ -66,9 +66,9 @@ ImpSVGDialog::ImpSVGDialog( Window* pParent/*, ResMgr& rResMgr*/, Sequence< Prop maCBUseNativeDecoration.SetPosSizePixel( Point( implMap( *this, 12 ), implMap( *this, 41 ) ), Size( implMap( *this, 142 ), implMap( *this, 10 ) ) ); - maCBTinyProfile.Check( maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_TINYPROFILE ) ), sal_False ) ); - maCBEmbedFonts.Check( maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_EMBEDFONTS ) ), sal_True ) ); - maCBUseNativeDecoration.Check( maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_NATIVEDECORATION ) ), sal_True ) ); + maCBTinyProfile.Check( maConfigItem.ReadBool( OUString( SVG_PROP_TINYPROFILE ), sal_False ) ); + maCBEmbedFonts.Check( maConfigItem.ReadBool( OUString( SVG_PROP_EMBEDFONTS ), sal_True ) ); + maCBUseNativeDecoration.Check( maConfigItem.ReadBool( OUString( SVG_PROP_NATIVEDECORATION ), sal_True ) ); maBTOK.SetPosSizePixel( Point( implMap( *this, 12 ), implMap( *this, 57 ) ), Size( implMap( *this, 50 ), implMap( *this, 14 ) ) ); @@ -101,9 +101,9 @@ ImpSVGDialog::~ImpSVGDialog() Sequence< PropertyValue > ImpSVGDialog::GetFilterData() { - maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_TINYPROFILE ) ), maCBTinyProfile.IsChecked() ); - maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_EMBEDFONTS ) ), maCBEmbedFonts.IsChecked() ); - maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_NATIVEDECORATION ) ), maCBUseNativeDecoration.IsChecked() ); + maConfigItem.WriteBool( OUString( SVG_PROP_TINYPROFILE ), maCBTinyProfile.IsChecked() ); + maConfigItem.WriteBool( OUString( SVG_PROP_EMBEDFONTS ), maCBEmbedFonts.IsChecked() ); + maConfigItem.WriteBool( OUString( SVG_PROP_NATIVEDECORATION ), maCBUseNativeDecoration.IsChecked() ); return( maConfigItem.GetFilterData() ); } diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx index b400c153b8fe..54563856b143 100644 --- a/filter/source/svg/svgdialog.cxx +++ b/filter/source/svg/svgdialog.cxx @@ -49,7 +49,7 @@ using namespace ::com::sun::star::document; OUString SVGDialog_getImplementationName () throw (RuntimeException) { - return OUString ( RTL_CONSTASCII_USTRINGPARAM ( SVG_DIALOG_IMPLEMENTATION_NAME ) ); + return OUString ( SVG_DIALOG_IMPLEMENTATION_NAME ); } // ----------------------------------------------------------------------------- @@ -69,7 +69,7 @@ Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames() { Sequence< OUString > aRet( 1 ); - aRet.getArray()[ 0 ] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SVG_DIALOG_SERVICE_NAME ) ); + aRet.getArray()[ 0 ] = OUString ( SVG_DIALOG_SERVICE_NAME ); return aRet; } diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index a11fcffadc17..c0b017cfc489 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -162,7 +162,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star { Reference< XConfigManager >xCfgMgr ( mxMSF->createInstance( OUString( "com.sun.star.config.SpecialConfigManager" ) ), UNO_QUERY ); - OUString PathString(xCfgMgr->substituteVariables(OUString(RTL_CONSTASCII_USTRINGPARAM("$(progurl)")))); + OUString PathString(xCfgMgr->substituteVariables(OUString("$(progurl)"))); PathString = PathString.concat(OUString( "/" )); msTemplateName=PathString.concat(msTemplateName); } @@ -388,8 +388,8 @@ Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames( ) { Sequence < OUString > aRet(2); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME1 ) ); - pArray[1] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME2 ) ); + pArray[0] = OUString ( SERVICE_NAME1 ); + pArray[1] = OUString ( SERVICE_NAME2 ); return aRet; } #undef SERVICE_NAME1 diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx index c9127d54dbc4..12cc401854b3 100644 --- a/filter/source/xsltdialog/typedetectionimport.cxx +++ b/filter/source/xsltdialog/typedetectionimport.cxx @@ -37,19 +37,19 @@ using namespace std; TypeDetectionImporter::TypeDetectionImporter( Reference< XMultiServiceFactory >& xMSF ) : mxMSF(xMSF), - sRootNode( RTL_CONSTASCII_USTRINGPARAM( "oor:component-data" ) ), - sNode( RTL_CONSTASCII_USTRINGPARAM( "node" ) ), - sName( RTL_CONSTASCII_USTRINGPARAM( "oor:name" ) ), - sProp( RTL_CONSTASCII_USTRINGPARAM( "prop" ) ), - sValue( RTL_CONSTASCII_USTRINGPARAM( "value" ) ), - sUIName( RTL_CONSTASCII_USTRINGPARAM( "UIName" ) ), - sData( RTL_CONSTASCII_USTRINGPARAM( "Data" ) ), - sFilters( RTL_CONSTASCII_USTRINGPARAM( "Filters" ) ), - sTypes( RTL_CONSTASCII_USTRINGPARAM( "Types" ) ), - sFilterAdaptorService( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.XmlFilterAdaptor" ) ), - sXSLTFilterService( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.documentconversion.XSLTFilter" ) ), - sCdataAttribute( RTL_CONSTASCII_USTRINGPARAM( "CDATA" ) ), - sWhiteSpace( RTL_CONSTASCII_USTRINGPARAM( " " ) ) + sRootNode( "oor:component-data" ), + sNode( "node" ), + sName( "oor:name" ), + sProp( "prop" ), + sValue( "value" ), + sUIName( "UIName" ), + sData( "Data" ), + sFilters( "Filters" ), + sTypes( "Types" ), + sFilterAdaptorService( "com.sun.star.comp.Writer.XmlFilterAdaptor" ), + sXSLTFilterService( "com.sun.star.documentconversion.XSLTFilter" ), + sCdataAttribute( "CDATA" ), + sWhiteSpace( " " ) { } diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx index 9d2eee03a2c5..12241c771286 100644 --- a/filter/source/xsltdialog/xmlfilterjar.cxx +++ b/filter/source/xsltdialog/xmlfilterjar.cxx @@ -62,12 +62,12 @@ using ::rtl::Uri; XMLFilterJarHelper::XMLFilterJarHelper( Reference< XMultiServiceFactory >& xMSF ) : mxMSF( xMSF ), - sVndSunStarPackage( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ) ), - sXSLTPath( RTL_CONSTASCII_USTRINGPARAM( "$(user)/xslt/" ) ), - sTemplatePath( RTL_CONSTASCII_USTRINGPARAM( "$(user)/template/") ), - sSpecialConfigManager( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.config.SpecialConfigManager" ) ), - sPump( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.Pump" ) ), - sProgPath( RTL_CONSTASCII_USTRINGPARAM( "$(prog)/" ) ) + sVndSunStarPackage( "vnd.sun.star.Package:" ), + sXSLTPath( "$(user)/xslt/" ), + sTemplatePath( "$(user)/template/" ), + sSpecialConfigManager( "com.sun.star.config.SpecialConfigManager" ), + sPump( "com.sun.star.io.Pump" ), + sProgPath( "$(prog)/" ) { try { -- cgit