automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings

Done with a perl regex:

s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms

Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec
Reviewed-on: https://gerrit.libreoffice.org/2832
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

16 files changed, 100 insertions, 101 deletions

diff --git a/filter/source/msfilter/mscodec.cxx b/filter/source/msfilter/mscodec.cxx
index 8cc09e6c0ba8..5d15a3ff1ad8 100644
--- a/filter/source/msfilter/mscodec.cxx
+++ b/filter/source/msfilter/mscodec.cxx
@@ -168,15 +168,15 @@ sal_Bool MSCodec_Xor95::InitCodec( const uno::Sequence< beans::NamedValue >& aDa
     sal_Bool bResult = sal_False;
 
     ::comphelper::SequenceAsHashMap aHashData( aData );
-    uno::Sequence< sal_Int8 > aKey = aHashData.getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XOR95EncryptionKey" ) ), uno::Sequence< sal_Int8 >() );
+    uno::Sequence< sal_Int8 > aKey = aHashData.getUnpackedValueOrDefault( ::rtl::OUString( "XOR95EncryptionKey" ), uno::Sequence< sal_Int8 >() );
 
     if ( aKey.getLength() == 16 )
     {
         (void)memcpy( mpnKey, aKey.getConstArray(), 16 );
         bResult = sal_True;
 
-        mnKey = (sal_uInt16)aHashData.getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XOR95BaseKey" ) ), (sal_Int16)0 );
-        mnHash = (sal_uInt16)aHashData.getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XOR95PasswordHash" ) ), (sal_Int16)0 );
+        mnKey = (sal_uInt16)aHashData.getUnpackedValueOrDefault( ::rtl::OUString( "XOR95BaseKey" ), (sal_Int16)0 );
+        mnHash = (sal_uInt16)aHashData.getUnpackedValueOrDefault( ::rtl::OUString( "XOR95PasswordHash" ), (sal_Int16)0 );
     }
     else
         OSL_FAIL( "Unexpected key size!\n" );
@@ -187,9 +187,9 @@ sal_Bool MSCodec_Xor95::InitCodec( const uno::Sequence< beans::NamedValue >& aDa
 uno::Sequence< beans::NamedValue > MSCodec_Xor95::GetEncryptionData()
 {
     ::comphelper::SequenceAsHashMap aHashData;
-    aHashData[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XOR95EncryptionKey" ) ) ] <<= uno::Sequence<sal_Int8>( (sal_Int8*)mpnKey, 16 );
-    aHashData[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XOR95BaseKey" ) ) ] <<= (sal_Int16)mnKey;
-    aHashData[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XOR95PasswordHash" ) ) ] <<= (sal_Int16)mnHash;
+    aHashData[ ::rtl::OUString( "XOR95EncryptionKey" ) ] <<= uno::Sequence<sal_Int8>( (sal_Int8*)mpnKey, 16 );
+    aHashData[ ::rtl::OUString( "XOR95BaseKey" ) ] <<= (sal_Int16)mnKey;
+    aHashData[ ::rtl::OUString( "XOR95PasswordHash" ) ] <<= (sal_Int16)mnHash;
 
     return aHashData.getAsConstNamedValueList();
 }
@@ -293,12 +293,12 @@ sal_Bool MSCodec_Std97::InitCodec( const uno::Sequence< beans::NamedValue >& aDa
     sal_Bool bResult = sal_False;
 
     ::comphelper::SequenceAsHashMap aHashData( aData );
-    uno::Sequence< sal_Int8 > aKey = aHashData.getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "STD97EncryptionKey" ) ), uno::Sequence< sal_Int8 >() );
+    uno::Sequence< sal_Int8 > aKey = aHashData.getUnpackedValueOrDefault( ::rtl::OUString( "STD97EncryptionKey" ), uno::Sequence< sal_Int8 >() );
 
     if ( aKey.getLength() == RTL_DIGEST_LENGTH_MD5 )
     {
         (void)memcpy( m_pDigestValue, aKey.getConstArray(), RTL_DIGEST_LENGTH_MD5 );
-        uno::Sequence< sal_Int8 > aUniqueID = aHashData.getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "STD97UniqueID" ) ), uno::Sequence< sal_Int8 >() );
+        uno::Sequence< sal_Int8 > aUniqueID = aHashData.getUnpackedValueOrDefault( ::rtl::OUString( "STD97UniqueID" ), uno::Sequence< sal_Int8 >() );
         if ( aUniqueID.getLength() == 16 )
         {
             (void)memcpy( m_pDocId, aUniqueID.getConstArray(), 16 );
@@ -318,8 +318,8 @@ sal_Bool MSCodec_Std97::InitCodec( const uno::Sequence< beans::NamedValue >& aDa
 uno::Sequence< beans::NamedValue > MSCodec_Std97::GetEncryptionData()
 {
     ::comphelper::SequenceAsHashMap aHashData;
-    aHashData[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "STD97EncryptionKey" ) ) ] <<= uno::Sequence< sal_Int8 >( (sal_Int8*)m_pDigestValue, RTL_DIGEST_LENGTH_MD5 );
-    aHashData[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "STD97UniqueID" ) ) ] <<= uno::Sequence< sal_Int8 >( (sal_Int8*)m_pDocId, 16 );
+    aHashData[ ::rtl::OUString( "STD97EncryptionKey" ) ] <<= uno::Sequence< sal_Int8 >( (sal_Int8*)m_pDigestValue, RTL_DIGEST_LENGTH_MD5 );
+    aHashData[ ::rtl::OUString( "STD97UniqueID" ) ] <<= uno::Sequence< sal_Int8 >( (sal_Int8*)m_pDocId, 16 );
 
     return aHashData.getAsConstNamedValueList();
 }
diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx
index ae48fd679322..5a06d41358ab 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -158,17 +158,17 @@ CustomToolBarImportHelper::createMenu( const rtl::OUString& rName, const uno::Re
         uno::Reference< container::XIndexContainer > xPopup( xCfgManager->createSettings(), uno::UNO_QUERY_THROW );
         uno::Reference< beans::XPropertySet > xProps( xPopup, uno::UNO_QUERY_THROW );
         // set name for menubar
-        xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UIName") ), uno::makeAny( rName ) );
+        xProps->setPropertyValue( rtl::OUString("UIName"), uno::makeAny( rName ) );
         if ( xPopup.is() )
         {
             uno::Sequence< beans::PropertyValue > aPopupMenu( 4 );
-            aPopupMenu[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") );
-            aPopupMenu[0].Value = uno::makeAny( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("vnd.openoffice.org:") ) + rName );
-            aPopupMenu[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Label") );
+            aPopupMenu[0].Name = rtl::OUString("CommandURL");
+            aPopupMenu[0].Value = uno::makeAny( rtl::OUString("vnd.openoffice.org:") + rName );
+            aPopupMenu[1].Name = rtl::OUString("Label");
             aPopupMenu[1].Value <<= rName;
-            aPopupMenu[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ItemDescriptorContainer") );
+            aPopupMenu[2].Name = rtl::OUString("ItemDescriptorContainer");
             aPopupMenu[2].Value = uno::makeAny( xMenuDesc );
-            aPopupMenu[3].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Type" ) );
+            aPopupMenu[3].Name = rtl::OUString("Type" );
             aPopupMenu[3].Value <<= sal_Int32( 0 );
 
             xPopup->insertByIndex( xPopup->getCount(), uno::makeAny( aPopupMenu ) );
@@ -297,7 +297,7 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect
     bBeginGroup = rHeader.isBeginGroup();
     controlGeneralInfo.ImportToolBarControlData( helper, props );
     beans::PropertyValue aProp;
-    aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Visible") ) ;
+    aProp.Name = rtl::OUString("Visible") ;
     aProp.Value = uno::makeAny( rHeader.isVisible() ); // where is the visible attribute stored
     props.push_back( aProp );
     if ( rHeader.getTct() == 0x01
@@ -348,7 +348,7 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect
     }
     else if ( rHeader.getTct() == 0x0a )
     {
-        aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") ) ;
+        aProp.Name = rtl::OUString("CommandURL") ;
         rtl::OUString sMenuBar( RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/") );
 
         TBCMenuSpecific* pMenu = getMenuSpecific();
@@ -359,7 +359,7 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect
     }
 
     short icontext =  ( rHeader.getTbct() & 0x03 );
-    aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Style") ) ;
+    aProp.Name = rtl::OUString("Style") ;
     if ( bIsMenuBar )
     {
         nStyle |= ui::ItemStyle::TEXT;
@@ -495,24 +495,24 @@ TBCGeneralInfo::ImportToolBarControlData( CustomToolBarImportHelper& helper, std
         // if ( rHeader.getTct() == 0x01 && rHeader.getTcID() == 0x01 ) // not defined, probably this is a command
         if ( !extraInfo.getOnAction().isEmpty() )
         {
-            aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") );
+            aProp.Name = rtl::OUString("CommandURL");
             ooo::vba::MacroResolvedInfo aMacroInf = ooo::vba::resolveVBAMacro( &helper.GetDocShell(), extraInfo.getOnAction(), true );
             if ( aMacroInf.mbFound )
                 aProp.Value = helper.createCommandFromMacro( aMacroInf.msResolvedMacro );
             else
-                aProp.Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UnResolvedMacro[" )).concat( extraInfo.getOnAction() ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "]" )) );
+                aProp.Value <<= rtl::OUString( "UnResolvedMacro[" ).concat( extraInfo.getOnAction() ).concat( rtl::OUString( "]" ) );
             sControlData.push_back( aProp );
         }
 
-        aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Label") );
+        aProp.Name = rtl::OUString("Label");
         aProp.Value = uno::makeAny( customText.getString().replace('&','~') );
         sControlData.push_back( aProp );
 
-        aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Type") );
+        aProp.Name = rtl::OUString("Type");
         aProp.Value = uno::makeAny( ui::ItemType::DEFAULT );
         sControlData.push_back( aProp );
 
-        aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Tooltip") );
+        aProp.Name = rtl::OUString("Tooltip");
         aProp.Value = uno::makeAny( tooltip.getString() );
         sControlData.push_back( aProp );
 /*
diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx
index f776d3e2869b..649b83ad94f0 100644
--- a/filter/source/odfflatxml/OdfFlatXml.cxx
+++ b/filter/source/odfflatxml/OdfFlatXml.cxx
@@ -204,14 +204,14 @@ OdfFlatXml::exporter(const Sequence< PropertyValue >& sourceData,
 
 OUString OdfFlatXml::impl_getImplementationName()
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.filter.OdfFlatXml"));
+    return OUString("com.sun.star.comp.filter.OdfFlatXml");
 }
 
 Sequence< OUString > OdfFlatXml::impl_getSupportedServiceNames()
 {
     Sequence< OUString > lServiceNames(2);
-    lServiceNames[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.ImportFilter" ));
-    lServiceNames[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.ExportFilter" ));
+    lServiceNames[0] = OUString( "com.sun.star.document.ImportFilter" );
+    lServiceNames[1] = OUString( "com.sun.star.document.ExportFilter" );
     return lServiceNames;
 }
 
diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx
index f019f52093ca..f2096d6105c5 100644
--- a/filter/source/placeware/exporter.cxx
+++ b/filter/source/placeware/exporter.cxx
@@ -290,7 +290,7 @@ sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference <
 {
     sal_Bool bRet = sal_False;
 
-    mxGraphicExporter = Reference< XExporter >::query( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GraphicExportFilter") ) ) );
+    mxGraphicExporter = Reference< XExporter >::query( mxMSF->createInstance( OUString("com.sun.star.drawing.GraphicExportFilter") ) );
     Reference< XDrawPagesSupplier > xDrawPagesSupplier(xDoc, UNO_QUERY);
     if(!xDrawPagesSupplier.is())
         return sal_False;
@@ -301,7 +301,7 @@ sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference <
 
     if(xStatusIndicator.is())
     {
-        xStatusIndicator->start(OUString(  RTL_CONSTASCII_USTRINGPARAM( "PlaceWare:" )),xDrawPages->getCount());
+        xStatusIndicator->start(OUString( "PlaceWare:" ),xDrawPages->getCount());
     }
 
     Reference< XDrawPage > xDrawPage;
@@ -346,7 +346,7 @@ sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference <
 
             OUString aName( RTL_CONSTASCII_USTRINGPARAM("i") );
             aName += OUString::valueOf( nPage );
-            aName += OUString( RTL_CONSTASCII_USTRINGPARAM(".gif") );
+            aName += OUString(".gif");
             pEntry->setURL( aName );
 
             if(xStatusIndicator.is())
@@ -485,17 +485,17 @@ PageEntry* PlaceWareExporter::exportPage( Reference< XDrawPage >&xDrawPage )
     Reference< XFilter > xFilter( mxGraphicExporter, UNO_QUERY );
 
     Sequence< PropertyValue > aFilterData( 2 );
-    aFilterData[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("Width") );
+    aFilterData[0].Name = OUString("Width");
     aFilterData[0].Value <<= (sal_Int32)704;
-    aFilterData[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("Translucent") );
+    aFilterData[1].Name = OUString("Translucent");
     aFilterData[1].Value <<= (sal_Bool)sal_False;
 
     Sequence< PropertyValue > aDescriptor( 3 );
-    aDescriptor[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("FilterName") );
-    aDescriptor[0].Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM("GIF") );
-    aDescriptor[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("URL") );
+    aDescriptor[0].Name = OUString("FilterName");
+    aDescriptor[0].Value <<= OUString("GIF");
+    aDescriptor[1].Name = OUString("URL");
     aDescriptor[1].Value <<= OUString( pEntry->getTempURL() );
-    aDescriptor[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("FilterData") );
+    aDescriptor[2].Name = OUString("FilterData");
     aDescriptor[2].Value <<= aFilterData;
     mxGraphicExporter->setSourceDocument( xComp );
     xFilter->filter( aDescriptor );
diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx
index deb97bdbfa3c..6ad7e8733d6c 100644
--- a/filter/source/placeware/filter.cxx
+++ b/filter/source/placeware/filter.cxx
@@ -144,7 +144,7 @@ void SAL_CALL PlaceWareExportFilter::initialize( const ::com::sun::star::uno::Se
 OUString PlaceWareExportFilter_getImplementationName ()
     throw (RuntimeException)
 {
-    return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Impress.PlaceWareExportFilter" ) );
+    return OUString( "com.sun.star.comp.Impress.PlaceWareExportFilter" );
 }
 
 // -----------------------------------------------------------------------------
diff --git a/filter/source/placeware/tempfile.cxx b/filter/source/placeware/tempfile.cxx
index 2cbf2b4f45e7..6168d2271f9c 100644
--- a/filter/source/placeware/tempfile.cxx
+++ b/filter/source/placeware/tempfile.cxx
@@ -147,9 +147,9 @@ OUString TempFile::createTempFileURL()
         u %= (nRadix*nRadix*nRadix);
         OUString aTmp( aTempDirURL );
         if( aTmp.getStr()[ aTmp.getLength() - 1 ] != sal_Unicode( '/' ) )
-            aTmp += OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ));
+            aTmp += OUString( "/" );
         aTmp += OUString::valueOf( (sal_Int32) (unsigned) u, nRadix );
-        aTmp += OUString( RTL_CONSTASCII_USTRINGPARAM( ".tmp" ));
+        aTmp += OUString( ".tmp" );
 
         osl::File aFile( aTmp );
         osl::FileBase::RC err = aFile.open(osl_File_OpenFlag_Create);
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 2570fee33b30..6b7245192d16 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -295,12 +295,12 @@ rtl::OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescrip
     sal_Int8 aMagic1[] = {'<', 's', 'v', 'g'};
     if( std::search(pBuf, pBuf+nBytes,
                     aMagic1, aMagic1+sizeof(aMagic1)/sizeof(*aMagic1)) != pBuf+nBytes )
-        return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("svg_Scalable_Vector_Graphics") );
+        return rtl::OUString("svg_Scalable_Vector_Graphics");
 
     sal_Int8 aMagic2[] = {'D', 'O', 'C', 'T', 'Y', 'P', 'E', ' ', 's', 'v', 'g'};
     if( std::search(pBuf, pBuf+nBytes,
                     aMagic2, aMagic2+sizeof(aMagic2)/sizeof(*aMagic2)) != pBuf+nBytes )
-        return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("svg_Scalable_Vector_Graphics") );
+        return rtl::OUString("svg_Scalable_Vector_Graphics");
 
     return rtl::OUString();
 }
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 588207b0bd86..62b7bb575f55 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2173,7 +2173,7 @@ void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly,
             mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrWidth, OUString::valueOf( aRect.GetWidth() ) );
             mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, OUString::valueOf( aRect.GetHeight() ) );
 
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrPatternUnits, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "userSpaceOnUse") ) );
+            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrPatternUnits, rtl::OUString( "userSpaceOnUse") );
 
             {
                 SvXMLElementExport aElemPattern( mrExport, XML_NAMESPACE_NONE, aXMLElemPattern, sal_True, sal_True );
@@ -2264,7 +2264,7 @@ void SVGActionWriter::ImplWriteGradientLinear( const PolyPolygon& rPolyPoly,
                 mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY2, OUString::valueOf( aPoly[ 1 ].Y() ) );
 
                 mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrGradientUnits,
-                                       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "userSpaceOnUse" ) ) );
+                                       rtl::OUString( "userSpaceOnUse" ) );
             }
 
             {
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index ed2901bfbbed..f32c3dd85922 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -82,7 +82,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star
         comphelper::MediaDescriptor::PROP_STATUSINDICATOR(), Reference< XStatusIndicator >()));
 
     if (xStatusIndicator.is()){
-        xStatusIndicator->start(OUString(  RTL_CONSTASCII_USTRINGPARAM( "Loading :" )),nProgressRange);
+        xStatusIndicator->start(OUString( "Loading :" ),nProgressRange);
     }
 
     OUString sXMLImportService (  udImport  );
@@ -90,7 +90,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star
 
     Sequence< Any > aAnys(1);
     OUString aBaseURI;
-    if (aMediaMap.find(OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" )))->second >>= aBaseURI)
+    if (aMediaMap.find(OUString( "URL" ))->second >>= aBaseURI)
     {
         INetURLObject aURLObj(aBaseURI);
         // base URI in this case is the URI of the actual saving location
@@ -108,7 +108,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star
      Reference< XPropertySet > xInfoSet(
         GenericPropertySet_CreateInstance( new PropertySetInfo( aImportInfoMap ) ) );
      xInfoSet->setPropertyValue(
-        OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseURI" )), makeAny( aBaseURI ));
+        OUString( "BaseURI" ), makeAny( aBaseURI ));
     aAnys[0] <<= xInfoSet;
 
 
@@ -159,12 +159,12 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star
             Sequence<com::sun::star::beans::PropertyValue> pValue=xstyleLoader->getStyleLoaderOptions();
 
             //Load the Styles from the Template URL Supplied in the TypeDetection file
-            if(msTemplateName.indexOf(OUString( RTL_CONSTASCII_USTRINGPARAM( "file:" )))==-1)
+            if(msTemplateName.indexOf(OUString( "file:" ))==-1)
             {
                 Reference< XConfigManager >xCfgMgr ( mxMSF->createInstance(
-                    OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.config.SpecialConfigManager" )) ), UNO_QUERY );
+                    OUString( "com.sun.star.config.SpecialConfigManager" ) ), UNO_QUERY );
                 OUString PathString(xCfgMgr->substituteVariables(OUString(RTL_CONSTASCII_USTRINGPARAM("$(progurl)"))));
-                PathString = PathString.concat(OUString( RTL_CONSTASCII_USTRINGPARAM( "/" )));
+                PathString = PathString.concat(OUString( "/" ));
                 msTemplateName=PathString.concat(msTemplateName);
             }
 
@@ -221,7 +221,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star
         comphelper::MediaDescriptor::PROP_STATUSINDICATOR(), Reference< XStatusIndicator >()));
 
     if (xStatusIndicator.is())
-       xStatusIndicator->start(OUString(  RTL_CONSTASCII_USTRINGPARAM( "Saving :" )),nProgressRange);
+       xStatusIndicator->start(OUString( "Saving :" ),nProgressRange);
 
     // Set up converter bridge.
     Reference< com::sun::star::xml::XExportFilter > xConverter(mxMSF->createInstance(udConvertClass ), UNO_QUERY);
@@ -261,7 +261,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star
 
         // get the base URI, so we can use relative links
         OUString aBaseURI;
-        if (aMediaMap.find(OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" )))->second >>= aBaseURI)
+        if (aMediaMap.find(OUString( "URL" ))->second >>= aBaseURI)
         {
             INetURLObject aURLObj(aBaseURI);
             // base URI in this case is the URI of the actual saving location
@@ -281,12 +281,12 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star
          Reference< XPropertySet > xInfoSet(
             GenericPropertySet_CreateInstance( new PropertySetInfo( aImportInfoMap ) ) );
          xInfoSet->setPropertyValue(
-            OUString( RTL_CONSTASCII_USTRINGPARAM( "UsePrettyPrinting" )), makeAny( bPrettyPrint ));
+            OUString( "UsePrettyPrinting" ), makeAny( bPrettyPrint ));
         xInfoSet->setPropertyValue(
-                        OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportTextNumberElement" )),
+                        OUString( "ExportTextNumberElement" ),
                         makeAny( bExportTextNumberElementForListItems ));
          xInfoSet->setPropertyValue(
-            OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseURI" )), makeAny( aBaseURI ));
+            OUString( "BaseURI" ), makeAny( aBaseURI ));
         aAnys[1] <<= xInfoSet;
 
         Reference< XExporter > xExporter( mxMSF->createInstanceWithArguments (
@@ -365,17 +365,17 @@ void SAL_CALL XmlFilterAdaptor::initialize( const Sequence< Any >& aArguments )
     {
         comphelper::SequenceAsHashMap aMap(aAnySeq);
         msFilterName = aMap.getUnpackedValueOrDefault(
-            OUString( RTL_CONSTASCII_USTRINGPARAM( "Type" )), OUString());
+            OUString( "Type" ), OUString());
         msUserData = aMap.getUnpackedValueOrDefault(
-            OUString( RTL_CONSTASCII_USTRINGPARAM( "UserData" )), Sequence< OUString >());
+            OUString( "UserData" ), Sequence< OUString >());
         msTemplateName = aMap.getUnpackedValueOrDefault(
-            OUString( RTL_CONSTASCII_USTRINGPARAM( "TemplateName" )), OUString());
+            OUString( "TemplateName" ), OUString());
     }
 }
 OUString XmlFilterAdaptor_getImplementationName ()
     throw (RuntimeException)
 {
-    return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.XmlFilterAdaptor" ) );
+    return OUString( "com.sun.star.comp.Writer.XmlFilterAdaptor" );
 }
 #define SERVICE_NAME1 "com.sun.star.document.ExportFilter"
 #define SERVICE_NAME2 "com.sun.star.document.ImportFilter"
diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx
index bec453d8ae08..953a3dc7c7f8 100644
--- a/filter/source/xmlfilterdetect/filterdetect.cxx
+++ b/filter/source/xmlfilterdetect/filterdetect.cxx
@@ -255,7 +255,7 @@ void SAL_CALL FilterDetect::initialize( const Sequence< Any >& aArguments )
 
 OUString FilterDetect_getImplementationName ()
 {
-    return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.filters.XMLFilterDetect" ) );
+    return OUString( "com.sun.star.comp.filters.XMLFilterDetect" );
 }
 #define SERVICE_NAME1 "com.sun.star.document.ExtendedTypeDetection"
 
diff --git a/filter/source/xsltdialog/typedetectionexport.cxx b/filter/source/xsltdialog/typedetectionexport.cxx
index ac7118459c8b..9fb075306486 100644
--- a/filter/source/xsltdialog/typedetectionexport.cxx
+++ b/filter/source/xsltdialog/typedetectionexport.cxx
@@ -100,10 +100,10 @@ void TypeDetectionExporter::doExport( Reference< XOutputStream > xOS,  const XML
         xHandler->setOutputStream( xOS );
 
         ::comphelper::AttributeList * pAttrList = new ::comphelper::AttributeList;
-        pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "xmlns:oor" )), sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "http://openoffice.org/2001/registry" )) );
-        pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "xmlns:xs" )), sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "http://www.w3.org/2001/XMLSchema" )) );
-        pAttrList->AddAttribute ( sName, sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "TypeDetection" )) );
-        pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "oor:package" )), sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office" )) );
+        pAttrList->AddAttribute ( OUString( "xmlns:oor" ), sCdataAttribute, OUString( "http://openoffice.org/2001/registry" ) );
+        pAttrList->AddAttribute ( OUString( "xmlns:xs" ), sCdataAttribute, OUString( "http://www.w3.org/2001/XMLSchema" ) );
+        pAttrList->AddAttribute ( sName, sCdataAttribute, OUString( "TypeDetection" ) );
+        pAttrList->AddAttribute ( OUString( "oor:package" ), sCdataAttribute, OUString( "org.openoffice.Office" ) );
         Reference < XAttributeList > xAttrList (pAttrList);
 
         xHandler->startDocument();
@@ -113,7 +113,7 @@ void TypeDetectionExporter::doExport( Reference< XOutputStream > xOS,  const XML
         // export types
         {
             xAttrList = pAttrList = new ::comphelper::AttributeList;
-            pAttrList->AddAttribute ( sName, sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "Types" )) );
+            pAttrList->AddAttribute ( sName, sCdataAttribute, OUString( "Types" ) );
             xHandler->ignorableWhitespace ( sWhiteSpace );
             xHandler->startElement( sNode, xAttrList );
 
@@ -156,7 +156,7 @@ void TypeDetectionExporter::doExport( Reference< XOutputStream > xOS,  const XML
         // export filters
         {
             xAttrList = pAttrList = new ::comphelper::AttributeList;
-            pAttrList->AddAttribute ( sName, sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "Filters" )) );
+            pAttrList->AddAttribute ( sName, sCdataAttribute, OUString( "Filters" ) );
             xHandler->ignorableWhitespace ( sWhiteSpace );
             xHandler->startElement( sNode, xAttrList );
 
@@ -233,8 +233,8 @@ void TypeDetectionExporter::addProperty( Reference< XWriter > xHandler, const OU
         const OUString sWhiteSpace          ( RTL_CONSTASCII_USTRINGPARAM ( " " ) );
 
         ::comphelper::AttributeList * pAttrList = new ::comphelper::AttributeList;
-        pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "oor:name" )), sCdataAttribute, rName );
-        pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "oor:type" )), sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "xs:string" )) );
+        pAttrList->AddAttribute ( OUString( "oor:name" ), sCdataAttribute, rName );
+        pAttrList->AddAttribute ( OUString( "oor:type" ), sCdataAttribute, OUString( "xs:string" ) );
         Reference < XAttributeList > xAttrList (pAttrList);
 
         xHandler->ignorableWhitespace ( sWhiteSpace );
@@ -263,14 +263,14 @@ void TypeDetectionExporter::addLocaleProperty( Reference< XWriter > xHandler, co
         const OUString sWhiteSpace          ( RTL_CONSTASCII_USTRINGPARAM ( " " ) );
 
         ::comphelper::AttributeList * pAttrList = new ::comphelper::AttributeList;
-        pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "oor:name" )), sCdataAttribute, rName );
-        pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "oor:type" )), sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "xs:string" )) );
+        pAttrList->AddAttribute ( OUString( "oor:name" ), sCdataAttribute, rName );
+        pAttrList->AddAttribute ( OUString( "oor:type" ), sCdataAttribute, OUString( "xs:string" ) );
         Reference < XAttributeList > xAttrList (pAttrList);
 
         xHandler->ignorableWhitespace ( sWhiteSpace );
         xHandler->startElement( sProp, xAttrList );
         xAttrList = pAttrList = new ::comphelper::AttributeList;
-        pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "xml:lang" )), sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "en-US" )) );
+        pAttrList->AddAttribute ( OUString( "xml:lang" ), sCdataAttribute, OUString( "en-US" ) );
         xHandler->ignorableWhitespace ( sWhiteSpace );
         xHandler->startElement( sValue, xAttrList );
         xHandler->characters( rValue );
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index 3bf4119c00b3..91691d68e4bf 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -190,7 +190,7 @@ void SAL_CALL XMLFilterDialogComponent::release() throw ()
 
 OUString XMLFilterDialogComponent_getImplementationName() throw ( RuntimeException )
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( "XMLFilterDialogComponent" ) );
+    return OUString( "XMLFilterDialogComponent" );
 }
 
 //-------------------------------------------------------------------------
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx
index 8bf0f710a829..5947131be136 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -72,7 +72,7 @@ XMLFilterJarHelper::XMLFilterJarHelper( Reference< XMultiServiceFactory >& xMSF
 {
     try
     {
-        Reference< XConfigManager > xCfgMgr( xMSF->createInstance(OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.config.SpecialConfigManager" ))), UNO_QUERY );
+        Reference< XConfigManager > xCfgMgr( xMSF->createInstance(OUString( "com.sun.star.config.SpecialConfigManager" )), UNO_QUERY );
         if( xCfgMgr.is() )
         {
             sProgPath = xCfgMgr->substituteVariables( sProgPath );
@@ -135,7 +135,7 @@ void XMLFilterJarHelper::addFile( Reference< XInterface > xRootFolder, Reference
     {
         OUString aFileURL( rSourceFile );
 
-        if( !aFileURL.matchIgnoreAsciiCase( OUString( RTL_CONSTASCII_USTRINGPARAM("file://") ) ) )
+        if( !aFileURL.matchIgnoreAsciiCase( OUString("file://") ) )
         {
             aFileURL = URIHelper::SmartRel2Abs( sProgPath, aFileURL, Link(), false );
         }
@@ -162,13 +162,13 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt
 
         // let ZipPackage be used ( no manifest.xml is required )
         beans::NamedValue aArg;
-        aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StorageFormat" ) );
+        aArg.Name = ::rtl::OUString( "StorageFormat" );
         aArg.Value <<= ZIP_STORAGE_FORMAT_STRING;
         aArguments[ 1 ] <<= aArg;
 
         Reference< XHierarchicalNameAccess > xIfc(
             mxMSF->createInstanceWithArguments(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.packages.comp.ZipPackage" )),
+                rtl::OUString( "com.sun.star.packages.comp.ZipPackage" ),
                 aArguments ), UNO_QUERY );
 
         if( xIfc.is() )
@@ -262,13 +262,13 @@ void XMLFilterJarHelper::openPackage( const OUString& rPackageURL, XMLFilterVect
 
         // let ZipPackage be used ( no manifest.xml is required )
         beans::NamedValue aArg;
-        aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StorageFormat" ) );
+        aArg.Name = ::rtl::OUString( "StorageFormat" );
         aArg.Value <<= ZIP_STORAGE_FORMAT_STRING;
         aArguments[ 1 ] <<= aArg;
 
         Reference< XHierarchicalNameAccess > xIfc(
             mxMSF->createInstanceWithArguments(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.packages.comp.ZipPackage" )),
+                rtl::OUString( "com.sun.star.packages.comp.ZipPackage" ),
                 aArguments ), UNO_QUERY );
 
         if( xIfc.is() )
@@ -341,8 +341,8 @@ bool XMLFilterJarHelper::copyFile( Reference< XHierarchicalNameAccess > xIfc, OU
     {
         OUString szPackagePath( encodeZipUri( rURL.copy( sVndSunStarPackage.getLength() ) ) );
 
-        if ( ::comphelper::OStorageHelper::PathHasSegment( szPackagePath, OUString( RTL_CONSTASCII_USTRINGPARAM( ".." ) ) )
-          || ::comphelper::OStorageHelper::PathHasSegment( szPackagePath, OUString( RTL_CONSTASCII_USTRINGPARAM( "." ) ) ) )
+        if ( ::comphelper::OStorageHelper::PathHasSegment( szPackagePath, OUString( ".." ) )
+          || ::comphelper::OStorageHelper::PathHasSegment( szPackagePath, OUString( "." ) ) )
             throw lang::IllegalArgumentException();
 
         if( xIfc->hasByHierarchicalName( szPackagePath ) )
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 4e387b9397f9..15b86e1eccda 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -1345,7 +1345,7 @@ OUString getApplicationUIName( const OUString& rServiceName )
         OUString aRet = RESIDSTR(STR_UNKNOWN_APPLICATION);
         if( !rServiceName.isEmpty() )
         {
-            aRet += OUString( RTL_CONSTASCII_USTRINGPARAM( " (" ));
+            aRet += OUString( " (" );
             aRet += rServiceName;
             aRet += OUString( RTL_CONSTASCII_USTRINGPARAM( ")" ));
         }
@@ -1620,7 +1620,7 @@ Sequence< OUString > filter_info_impl::getFilterUserData() const
 {
     Sequence< OUString > aUserData(8);
 
-    aUserData[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.documentconversion.XSLTFilter" ) );
+    aUserData[0] = OUString( "com.sun.star.documentconversion.XSLTFilter" );
     aUserData[1] = OUString::valueOf( mbNeedsXSLT2 );
     aUserData[2] = maImportService;
     aUserData[3] = maExportService;
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 727b5d46a6ef..b90b9cfc748c 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -117,7 +117,7 @@ static bool checkComponent( Reference< XComponent >& rxComponent, const OUString
                 if ( rServiceName == "com.sun.star.drawing.DrawingDocument" )
                 {
                     // so if we want a draw we need to check if its not an impress
-                    if( !xInfo->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument") ) ) )
+                    if( !xInfo->supportsService( OUString( "com.sun.star.presentation.PresentationDocument") ) )
                         return true;
                 }
                 else
@@ -297,8 +297,8 @@ void XMLFilterTestDialog::onExportBrowse()
             com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
             0 );
 
-        Reference< XNameAccess > xFilterContainer( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" )) ), UNO_QUERY );
-        Reference< XNameAccess > xTypeDetection( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" )) ), UNO_QUERY );
+        Reference< XNameAccess > xFilterContainer( mxMSF->createInstance( OUString( "com.sun.star.document.FilterFactory" ) ), UNO_QUERY );
+        Reference< XNameAccess > xTypeDetection( mxMSF->createInstance( OUString( "com.sun.star.document.TypeDetection" ) ), UNO_QUERY );
         if( xFilterContainer.is() && xTypeDetection.is() )
         {
             Sequence< OUString > aFilterNames( xFilterContainer->getElementNames() );
@@ -372,7 +372,7 @@ void XMLFilterTestDialog::onExportBrowse()
                                         {
                                             if( n > 0 )
                                                 aExtension += OUString( sal_Unicode(';') );
-                                            aExtension += OUString( RTL_CONSTASCII_USTRINGPARAM( "*." ));
+                                            aExtension += OUString( "*." );
                                             aExtension += (*pExtensions++);
                                         }
                                     }
@@ -406,7 +406,7 @@ void XMLFilterTestDialog::onExportBrowse()
             Reference< XInteractionHandler2 > xInter( InteractionHandler::createWithParent(comphelper::getComponentContext(mxMSF), 0) );
             OUString aFrame( RTL_CONSTASCII_USTRINGPARAM( "_default" ) );
             Sequence< PropertyValue > aArguments(1);
-            aArguments[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ));
+            aArguments[0].Name = OUString( "InteractionHandler" );
             aArguments[0].Value <<= xInter;
             Reference< XComponent > xComp( xLoader->loadComponentFromURL( m_sExportRecentFile, aFrame, 0, aArguments ) );
             if( xComp.is() )
@@ -453,19 +453,19 @@ void XMLFilterTestDialog::doExport( Reference< XComponent > xComp )
                 int i = 0;
 
 
-                aSourceData[i  ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "OutputStream" ) );
+                aSourceData[i  ].Name = OUString( "OutputStream" );
                 aSourceData[i++].Value <<= xIS;
 
-                aSourceData[i].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Indent" ) );
+                aSourceData[i].Name = OUString( "Indent" );
                 aSourceData[i++].Value <<= (sal_Bool)sal_True;
 
                 if( bUseDocType )
                     {
-                        aSourceData[i  ].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("DocType_Public"));
+                        aSourceData[i  ].Name = OUString("DocType_Public");
                         aSourceData[i++].Value <<= m_pFilterInfo->maDocType;
                     }
 
-                Reference< XExportFilter > xExporter( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.documentconversion.XSLTFilter" )) ), UNO_QUERY );
+                Reference< XExportFilter > xExporter( mxMSF->createInstance( OUString( "com.sun.star.documentconversion.XSLTFilter" ) ), UNO_QUERY );
                 Reference< XDocumentHandler > xHandler( xExporter, UNO_QUERY );
                 if( xHandler.is() )
                 {
@@ -481,8 +481,8 @@ void XMLFilterTestDialog::doExport( Reference< XComponent > xComp )
                     {
                         try
                         {
-                            xGrfResolver = Reference< XGraphicObjectResolver >::query( xDocFac->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.ExportGraphicObjectResolver" )) ) );
-                            xObjectResolver = Reference< XEmbeddedObjectResolver >::query( xDocFac->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.ExportEmbeddedObjectResolver" )) ) );
+                            xGrfResolver = Reference< XGraphicObjectResolver >::query( xDocFac->createInstance( OUString( "com.sun.star.document.ExportGraphicObjectResolver" ) ) );
+                            xObjectResolver = Reference< XEmbeddedObjectResolver >::query( xDocFac->createInstance( OUString( "com.sun.star.document.ExportEmbeddedObjectResolver" ) ) );
                         }
                         catch( const Exception& )
                         {
@@ -506,7 +506,7 @@ void XMLFilterTestDialog::doExport( Reference< XComponent > xComp )
                             xExporter2->setSourceDocument( xComp );
 
                             Sequence< PropertyValue > aDescriptor( 1 );
-                            aDescriptor[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "FileName" ) );
+                            aDescriptor[0].Name = OUString( "FileName" );
                             aDescriptor[0].Value <<= aTempFileURL;
 
                             if( xFilter->filter( aDescriptor ) )
@@ -592,9 +592,9 @@ void XMLFilterTestDialog::import( const OUString& rURL )
 
         OUString aFrame( RTL_CONSTASCII_USTRINGPARAM( "_default" ) );
         Sequence< PropertyValue > aArguments(2);
-        aArguments[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
+        aArguments[0].Name = OUString( "FilterName" );
         aArguments[0].Value <<= m_pFilterInfo->maFilterName;
-        aArguments[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ));
+        aArguments[1].Name = OUString( "InteractionHandler" );
         aArguments[1].Value <<= xInter;
 
         xLoader->loadComponentFromURL( rURL, aFrame, 0, aArguments );
@@ -606,7 +606,7 @@ void XMLFilterTestDialog::import( const OUString& rURL )
             TempFile aTempFile(lead, &ext);
             OUString aTempFileURL( aTempFile.GetURL() );
 
-            Reference< XImportFilter > xImporter( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.documentconversion.XSLTFilter" )) ), UNO_QUERY );
+            Reference< XImportFilter > xImporter( mxMSF->createInstance( OUString( "com.sun.star.documentconversion.XSLTFilter" ) ), UNO_QUERY );
             if( xImporter.is() )
             {
                 osl::File aInputFile( rURL );
@@ -617,13 +617,13 @@ void XMLFilterTestDialog::import( const OUString& rURL )
                 Sequence< PropertyValue > aSourceData( 3 );
                 int i = 0;
 
-                aSourceData[i  ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "InputStream" ));
+                aSourceData[i  ].Name = OUString( "InputStream" );
                 aSourceData[i++].Value <<= xIS;
 
-                aSourceData[i  ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "FileName" ));
+                aSourceData[i  ].Name = OUString( "FileName" );
                 aSourceData[i++].Value <<= rURL;
 
-                aSourceData[i  ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Indent" ));
+                aSourceData[i  ].Name = OUString( "Indent" );
                 aSourceData[i++].Value <<= (sal_Bool)sal_True;
 
                 Reference< XWriter > xWriter = Writer::create( comphelper::getComponentContext(mxMSF) );
diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx
index 395bc8192d75..eb4336479545 100644
--- a/filter/source/xsltfilter/OleHandler.cxx
+++ b/filter/source/xsltfilter/OleHandler.cxx
@@ -108,8 +108,7 @@ namespace XSLT
         //create an com.sun.star.embed.OLESimpleStorage from the temp stream
         Sequence<Any> args(1);
         args[0] <<= xSeek;
-        Reference<XNameContainer> cont(m_msf->createInstanceWithArguments(OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLESimpleStorage" )), args), UNO_QUERY);
+        Reference<XNameContainer> cont(m_msf->createInstanceWithArguments(OUString( "com.sun.star.embed.OLESimpleStorage" ), args), UNO_QUERY);
         m_storage = cont;
     }