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>

11 files changed, 69 insertions, 70 deletions

diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx
index 3a0f78af567e..337316229a8e 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -321,19 +321,19 @@ Reference< XInterface > ConfigurationAccess::OpenConfiguration( bool bReadOnly )
         Reference< lang::XMultiServiceFactory > xProvider = configuration::theDefaultProvider::get( mxMSF );
         Sequence< Any > aCreationArguments( 2 );
         aCreationArguments[0] = makeAny( PropertyValue(
-            OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ), 0,
+            OUString( "nodepath" ), 0,
             makeAny( GetPathToConfigurationRoot() ),
             PropertyState_DIRECT_VALUE ) );
         aCreationArguments[1] = makeAny(beans::PropertyValue(
-            OUString( RTL_CONSTASCII_USTRINGPARAM( "lazywrite" ) ), 0, makeAny( true ),
+            OUString( "lazywrite" ), 0, makeAny( true ),
             PropertyState_DIRECT_VALUE ) );
         OUString sAccessService;
         if ( bReadOnly )
-            sAccessService = OUString( RTL_CONSTASCII_USTRINGPARAM(
-                "com.sun.star.configuration.ConfigurationAccess" ) );
+            sAccessService = OUString(
+                "com.sun.star.configuration.ConfigurationAccess" );
         else
-            sAccessService = OUString( RTL_CONSTASCII_USTRINGPARAM(
-                "com.sun.star.configuration.ConfigurationUpdateAccess" ) );
+            sAccessService = OUString(
+                "com.sun.star.configuration.ConfigurationUpdateAccess" );
 
         xRoot = xProvider->createInstanceWithArguments(
             sAccessService, aCreationArguments );
diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx
index e341b5a2b21a..28c0ba53be97 100644
--- a/sdext/source/minimizer/fileopendialog.cxx
+++ b/sdext/source/minimizer/fileopendialog.cxx
@@ -74,7 +74,7 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxContext
 
     // collecting a list of impress filters
     Reference< XNameAccess > xFilters( rxContext->getServiceManager()->createInstanceWithContext(
-        OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" ) ), rxContext ), UNO_QUERY_THROW );
+        OUString( "com.sun.star.document.FilterFactory" ), rxContext ), UNO_QUERY_THROW );
     Sequence< OUString > aFilterList( xFilters->getElementNames() );
     for ( int i = 0; i < aFilterList.getLength(); i++ )
     {
@@ -119,7 +119,7 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxContext
     }
 
     Reference< XNameAccess > xTypes( rxContext->getServiceManager()->createInstanceWithContext(
-        OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" ) ), rxContext ), UNO_QUERY_THROW );
+        OUString( "com.sun.star.document.TypeDetection" ), rxContext ), UNO_QUERY_THROW );
     Sequence< OUString > aTypeList( xFilters->getElementNames() );
 
 //  mxFilePicker->setDefaultName( );
diff --git a/sdext/source/minimizer/pppoptimizer.cxx b/sdext/source/minimizer/pppoptimizer.cxx
index e72bb272a4df..4d58933248be 100644
--- a/sdext/source/minimizer/pppoptimizer.cxx
+++ b/sdext/source/minimizer/pppoptimizer.cxx
@@ -181,7 +181,7 @@ sal_Int64 PPPOptimizer::GetFileSize( const rtl::OUString& rURL )
 
 OUString PPPOptimizer_getImplementationName()
 {
-    return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.PPPOptimizerImp" ) );
+    return OUString( "com.sun.star.comp.PPPOptimizerImp" );
 }
 
 Sequence< OUString > PPPOptimizer_getSupportedServiceNames()
diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx
index c80145ead648..d7632d299e37 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.cxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.cxx
@@ -185,7 +185,7 @@ void SAL_CALL PPPOptimizerDialog::removeStatusListener( const Reference< XStatus
 
 OUString PPPOptimizerDialog_getImplementationName()
 {
-    return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.SunPresentationMinimizerImp" ) );
+    return OUString( "com.sun.star.comp.SunPresentationMinimizerImp" );
 }
 
 Sequence< OUString > PPPOptimizerDialog_getSupportedServiceNames()
diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx
index bb28f1127638..62859f82ca9c 100644
--- a/sdext/source/minimizer/unodialog.cxx
+++ b/sdext/source/minimizer/unodialog.cxx
@@ -46,16 +46,16 @@ using namespace ::com::sun::star::script;
 UnoDialog::UnoDialog( const Reference< XComponentContext > &rxMSF, Reference< XFrame >& rxFrame ) :
     mxMSF( rxMSF ),
     mxController( rxFrame->getController() ),
-    mxDialogModel( mxMSF->getServiceManager()->createInstanceWithContext( OUString( RTL_CONSTASCII_USTRINGPARAM(
-        "com.sun.star.awt.UnoControlDialogModel" ) ), mxMSF ), UNO_QUERY_THROW ),
+    mxDialogModel( mxMSF->getServiceManager()->createInstanceWithContext( OUString(
+        "com.sun.star.awt.UnoControlDialogModel" ), mxMSF ), UNO_QUERY_THROW ),
     mxDialogModelMultiPropertySet( mxDialogModel, UNO_QUERY_THROW ),
     mxDialogModelPropertySet( mxDialogModel, UNO_QUERY_THROW ),
     mxDialogModelMSF( mxDialogModel, UNO_QUERY_THROW ),
     mxDialogModelNameContainer( mxDialogModel, UNO_QUERY_THROW ),
     mxDialogModelNameAccess( mxDialogModel, UNO_QUERY_THROW ),
     mxControlModel( mxDialogModel, UNO_QUERY_THROW ),
-    mxDialog( mxMSF->getServiceManager()->createInstanceWithContext( OUString( RTL_CONSTASCII_USTRINGPARAM(
-        "com.sun.star.awt.UnoControlDialog" ) ), mxMSF ), UNO_QUERY_THROW ),
+    mxDialog( mxMSF->getServiceManager()->createInstanceWithContext( OUString(
+        "com.sun.star.awt.UnoControlDialog" ), mxMSF ), UNO_QUERY_THROW ),
     mxControl( mxDialog, UNO_QUERY_THROW ),
     mbStatus( sal_False )
 {
@@ -149,10 +149,10 @@ Reference< XButton > UnoDialog::insertButton( const OUString& rName, Reference<
     Reference< XButton > xButton;
     try
     {
-        Reference< XInterface > xButtonModel( insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlButtonModel" ) ),
+        Reference< XInterface > xButtonModel( insertControlModel( OUString( "com.sun.star.awt.UnoControlButtonModel" ),
             rName, rPropertyNames, rPropertyValues ) );
         Reference< XPropertySet > xPropertySet( xButtonModel, UNO_QUERY_THROW );
-        xPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), Any( rName ) );
+        xPropertySet->setPropertyValue( OUString( "Name" ), Any( rName ) );
         xButton = Reference< XButton >( mxDialogControlContainer->getControl( rName ), UNO_QUERY_THROW );
 
         if ( xActionListener.is() )
@@ -175,9 +175,9 @@ Reference< XFixedText > UnoDialog::insertFixedText( const OUString& rName, const
     Reference< XFixedText > xFixedText;
     try
     {
-        Reference< XPropertySet > xPropertySet( insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlFixedTextModel" ) ),
+        Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlFixedTextModel" ),
             rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW );
-        xPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), Any( rName ) );
+        xPropertySet->setPropertyValue( OUString( "Name" ), Any( rName ) );
         xFixedText = Reference< XFixedText >( mxDialogControlContainer->getControl( rName ), UNO_QUERY_THROW );
     }
     catch ( Exception& )
@@ -193,9 +193,9 @@ Reference< XCheckBox > UnoDialog::insertCheckBox( const OUString& rName, const S
     Reference< XCheckBox > xCheckBox;
     try
     {
-        Reference< XPropertySet > xPropertySet( insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlCheckBoxModel" ) ),
+        Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlCheckBoxModel" ),
             rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW );
-        xPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), Any( rName ) );
+        xPropertySet->setPropertyValue( OUString( "Name" ), Any( rName ) );
         xCheckBox = Reference< XCheckBox >( mxDialogControlContainer->getControl( rName ), UNO_QUERY_THROW );
     }
     catch ( Exception& )
@@ -211,9 +211,9 @@ Reference< XControl > UnoDialog::insertFormattedField( const OUString& rName, co
     Reference< XControl > xControl;
     try
     {
-        Reference< XPropertySet > xPropertySet( insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlFormattedFieldModel" ) ),
+        Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlFormattedFieldModel" ),
             rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW );
-        xPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), Any( rName ) );
+        xPropertySet->setPropertyValue( OUString( "Name" ), Any( rName ) );
         xControl = Reference< XControl >( mxDialogControlContainer->getControl( rName ), UNO_QUERY_THROW );
     }
     catch ( Exception& )
@@ -229,9 +229,9 @@ Reference< XComboBox > UnoDialog::insertComboBox( const OUString& rName, const S
     Reference< XComboBox > xControl;
     try
     {
-        Reference< XPropertySet > xPropertySet( insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlComboBoxModel" ) ),
+        Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlComboBoxModel" ),
             rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW );
-        xPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), Any( rName ) );
+        xPropertySet->setPropertyValue( OUString( "Name" ), Any( rName ) );
         xControl = Reference< XComboBox >( mxDialogControlContainer->getControl( rName ), UNO_QUERY_THROW );
     }
     catch ( Exception& )
@@ -247,9 +247,9 @@ Reference< XRadioButton > UnoDialog::insertRadioButton( const OUString& rName, c
     Reference< XRadioButton > xControl;
     try
     {
-        Reference< XPropertySet > xPropertySet( insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlRadioButtonModel" ) ),
+        Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlRadioButtonModel" ),
             rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW );
-        xPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), Any( rName ) );
+        xPropertySet->setPropertyValue( OUString( "Name" ), Any( rName ) );
         xControl = Reference< XRadioButton >( mxDialogControlContainer->getControl( rName ), UNO_QUERY_THROW );
     }
     catch ( Exception& )
@@ -265,9 +265,9 @@ Reference< XListBox > UnoDialog::insertListBox( const OUString& rName, const Seq
     Reference< XListBox > xControl;
     try
     {
-        Reference< XPropertySet > xPropertySet( insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlListBoxModel" ) ),
+        Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlListBoxModel" ),
             rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW );
-        xPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), Any( rName ) );
+        xPropertySet->setPropertyValue( OUString( "Name" ), Any( rName ) );
         xControl = Reference< XListBox >( mxDialogControlContainer->getControl( rName ), UNO_QUERY_THROW );
     }
     catch ( Exception& )
@@ -283,9 +283,9 @@ Reference< XControl > UnoDialog::insertImage( const OUString& rName, const Seque
     Reference< XControl > xControl;
     try
     {
-        Reference< XPropertySet > xPropertySet( insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlImageControlModel" ) ),
+        Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlImageControlModel" ),
             rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW );
-        xPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), Any( rName ) );
+        xPropertySet->setPropertyValue( OUString( "Name" ), Any( rName ) );
         xControl = Reference< XControl >( mxDialogControlContainer->getControl( rName ), UNO_QUERY_THROW );
     }
     catch ( Exception& )
diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx
index 235a9d38ff75..503971629ab8 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -98,50 +98,50 @@ namespace {
                            const rtl::OUString&                          rFilename )
         {
             m_xListbox.set(xControls->getControl(
-                           rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListBox" ))),
+                           rtl::OUString( "ListBox" )),
                            uno::UNO_QUERY_THROW );
             m_xWriterText.set(xControls->getControl(
-                               rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InfoWriter" ))),
+                               rtl::OUString( "InfoWriter" )),
                                uno::UNO_QUERY_THROW );
             m_xImpressText.set(xControls->getControl(
-                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InfoImpress" ))),
+                                rtl::OUString( "InfoImpress" )),
                                 uno::UNO_QUERY_THROW );
             m_xDrawText.set(xControls->getControl(
-                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InfoDraw" ))),
+                                rtl::OUString( "InfoDraw" )),
                                 uno::UNO_QUERY_THROW );
 
             uno::Reference<awt::XWindow> xControl;
             xControl.set(xControls->getControl(
-                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListBoxWriter" ))),
+                                rtl::OUString( "ListBoxWriter" )),
                                 uno::UNO_QUERY_THROW );
             xControl->setVisible(sal_False);
             xControl.set(xControls->getControl(
-                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListBoxImpress" ))),
+                                rtl::OUString( "ListBoxImpress" )),
                                 uno::UNO_QUERY_THROW );
             xControl->setVisible(sal_False);
             xControl.set(xControls->getControl(
-                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListBoxDraw" ))),
+                                rtl::OUString( "ListBoxDraw" )),
                                 uno::UNO_QUERY_THROW );
             xControl->setVisible(sal_False);
             uno::Reference<beans::XPropertySet> xPropSet(
                 xControls->getControl(
-                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ComboLabel" )))->getModel(),
+                                rtl::OUString( "ComboLabel" ))->getModel(),
                                 uno::UNO_QUERY_THROW );
             rtl::OUString aFilename( rFilename.copy(rFilename.lastIndexOf('/')+1) );
             rtl::OUString aLabel;
-            xPropSet->getPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Label" ))) >>= aLabel;
+            xPropSet->getPropertyValue(rtl::OUString( "Label" )) >>= aLabel;
             const char pFileName[] = "%FILENAME";
             aLabel = aLabel.replaceAt(
                 aLabel.indexOfAsciiL(pFileName,SAL_N_ELEMENTS(pFileName)-1),
                 SAL_N_ELEMENTS(pFileName)-1,
                 aFilename );
-            xPropSet->setPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Label" )),
+            xPropSet->setPropertyValue(rtl::OUString( "Label" ),
                                        uno::makeAny(aLabel));
 
             uno::Sequence<rtl::OUString> aListboxItems(3);
-            aListboxItems[DRAW_INDEX]    = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Drawing" ));
-            aListboxItems[IMPRESS_INDEX] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Presentation" ));
-            aListboxItems[WRITER_INDEX]  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text Document" ));
+            aListboxItems[DRAW_INDEX]    = rtl::OUString( "Drawing" );
+            aListboxItems[IMPRESS_INDEX] = rtl::OUString( "Presentation" );
+            aListboxItems[WRITER_INDEX]  = rtl::OUString( "Text Document" );
 
             m_xListbox->addItems(aListboxItems,0);
             m_xListbox->selectItemPos(0,sal_True);
@@ -167,7 +167,7 @@ namespace {
         virtual uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedMethodNames(  ) throw (uno::RuntimeException)
         {
             uno::Sequence< ::rtl::OUString > aMethods(1);
-            aMethods[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SelectionChanged" ));
+            aMethods[0] = rtl::OUString( "SelectionChanged" );
             return aMethods;
         }
     };
@@ -434,14 +434,14 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue
         {
             if( aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.text" ) )
                 || aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.text-master" ) ) )
-                aOutFilterName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "writer_pdf_addstream_import" ) );
+                aOutFilterName = rtl::OUString( "writer_pdf_addstream_import" );
             else if ( aEmbedMimetype == "application/vnd.oasis.opendocument.presentation" )
-                aOutFilterName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "impress_pdf_addstream_import" ) );
+                aOutFilterName = rtl::OUString( "impress_pdf_addstream_import" );
             else if( aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.graphics" ) )
                      || aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.drawing" ) ) )
-                aOutFilterName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "draw_pdf_addstream_import" ) );
+                aOutFilterName = rtl::OUString( "draw_pdf_addstream_import" );
             else if ( aEmbedMimetype == "application/vnd.oasis.opendocument.spreadsheet" )
-                aOutFilterName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "calc_pdf_addstream_import" ) );
+                aOutFilterName = rtl::OUString( "calc_pdf_addstream_import" );
         }
     }
 
@@ -454,9 +454,9 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue
                 nFilterNamePos = nAttribs;
                 rFilterData.realloc( ++nAttribs );
                 rFilterData[ nFilterNamePos ].Name =
-                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ) );
+                    rtl::OUString( "FilterName" );
             }
-            aOutTypeName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("pdf_Portable_Document_Format") );
+            aOutTypeName = rtl::OUString("pdf_Portable_Document_Format");
 
             OSL_TRACE( "setting filter name %s, input stream %s\n",
                        rtl::OUStringToOString( aOutFilterName, RTL_TEXTENCODING_UTF8 ).getStr(),
@@ -466,7 +466,7 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue
             if( xEmbedStream.is() )
             {
                 rFilterData.realloc( ++nAttribs );
-                rFilterData[nAttribs-1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EmbeddedSubstream" ) );
+                rFilterData[nAttribs-1].Name = rtl::OUString( "EmbeddedSubstream" );
                 rFilterData[nAttribs-1].Value <<= xEmbedStream;
             }
             if( !aPwd.isEmpty() )
@@ -475,7 +475,7 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue
                 {
                     nPwdPos = nAttribs;
                     rFilterData.realloc( ++nAttribs );
-                    rFilterData[ nPwdPos ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Password" ) );
+                    rFilterData[ nPwdPos ].Name = rtl::OUString( "Password" );
                 }
                 rFilterData[ nPwdPos ].Value <<= aPwd;
             }
@@ -486,7 +486,7 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue
             {
                 nFilterNamePos = nAttribs;
                 rFilterData.realloc( ++nAttribs );
-                rFilterData[ nFilterNamePos ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ) );
+                rFilterData[ nFilterNamePos ].Name = rtl::OUString( "FilterName" );
             }
 
             const sal_Int32 nDocumentType = 0; //const sal_Int32 nDocumentType = queryDocumentTypeDialog(m_xContext,aURL);
@@ -497,22 +497,22 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue
             else switch( nDocumentType )
             {
                 case 0:
-                    rFilterData[nFilterNamePos].Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "draw_pdf_import" ) );
+                    rFilterData[nFilterNamePos].Value <<= rtl::OUString( "draw_pdf_import" );
                     break;
 
                 case 1:
-                    rFilterData[nFilterNamePos].Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "impress_pdf_import" ) );
+                    rFilterData[nFilterNamePos].Value <<= rtl::OUString( "impress_pdf_import" );
                     break;
 
                 case 2:
-                    rFilterData[nFilterNamePos].Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "writer_pdf_import" ) );
+                    rFilterData[nFilterNamePos].Value <<= rtl::OUString( "writer_pdf_import" );
                     break;
 
                 default:
                     OSL_FAIL("Unexpected case");
             }
 
-            aOutTypeName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("pdf_Portable_Document_Format") );
+            aOutTypeName = rtl::OUString("pdf_Portable_Document_Format");
         }
     }
 
diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx
index 60080cfe9aac..609dc3d8424d 100644
--- a/sdext/source/pdfimport/pdfiadaptor.cxx
+++ b/sdext/source/pdfimport/pdfiadaptor.cxx
@@ -148,7 +148,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert
             try {
                 xSubFilter = uno::Reference<document::XFilter>(
                     m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
-                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.OwnSubFilter" ) ),
+                        rtl::OUString( "com.sun.star.document.OwnSubFilter" ),
                         aArgs,
                         m_xContext ),
                     uno::UNO_QUERY );
@@ -169,8 +169,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert
                     {
                         nPwPos = aFilterData.getLength();
                         aFilterData.realloc( nPwPos+1 );
-                        aFilterData[nPwPos].Name = rtl::OUString(
-                            RTL_CONSTASCII_USTRINGPARAM( "Password" ) );
+                        aFilterData[nPwPos].Name = rtl::OUString( "Password" );
                     }
                     aFilterData[nPwPos].Value <<= aPwd;
                     bRet = xSubFilter->filter( aFilterData );
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index 56e29c0f0971..9f55a2298912 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -780,7 +780,7 @@ void PDFIProcessor::startPage( const geometry::RealSize2D& rSize )
     if( m_xStatusIndicator.is() )
     {
         if( nNextPageNr == 1 )
-            startIndicator( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " ) ) );
+            startIndicator( rtl::OUString( " " ) );
         m_xStatusIndicator->setValue( nNextPageNr );
     }
     m_pCurPage = m_pElFactory->createPageElement(m_pDocument.get(), nNextPageNr);
@@ -802,7 +802,7 @@ void PDFIProcessor::emit( XmlEmitter&               rEmitter,
     ElementTreeVisitorSharedPtr optimizingVisitor(
         rVisitorFactory.createOptimizingVisitor(*this));
     // FIXME: localization
-    startIndicator( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " ) ) );
+    startIndicator( rtl::OUString( " " ) );
     m_pDocument->visitedBy( *optimizingVisitor, std::list<Element*>::const_iterator());
 
 #if OSL_DEBUG_LEVEL > 1
@@ -1015,7 +1015,7 @@ rtl::OUString PDFIProcessor::mirrorString( const rtl::OUString& i_rString )
     {
         m_bMirrorMapperTried = true;
         uno::Reference< lang::XMultiComponentFactory > xMSF(  m_xContext->getServiceManager(), uno::UNO_SET_THROW );
-        uno::Reference < uno::XInterface > xInterface = xMSF->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.StringMirror")), m_xContext);
+        uno::Reference < uno::XInterface > xInterface = xMSF->createInstanceWithContext(::rtl::OUString("com.sun.star.awt.StringMirror"), m_xContext);
         m_xMirrorMapper = uno::Reference< util::XStringMapping >( xInterface, uno::UNO_QUERY );
         #if OSL_DEBUG_LEVEL > 1
         if( m_xMirrorMapper.is() )
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx
index d9076290ba1a..487bc7a5a6dd 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx
@@ -64,7 +64,7 @@ void WriterXmlEmitter::visit( TextElement& elem, const std::list< Element* >::co
     PropertyMap aProps;
     if( elem.StyleId != -1 )
     {
-        aProps[ rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text:style-name" ) ) ] =
+        aProps[ rtl::OUString( "text:style-name" ) ] =
             m_rEmitContext.rStyles.getStyleName( elem.StyleId );
     }
 
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
index 4df8067ba64f..18500ee0e2ab 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -330,8 +330,8 @@ void PresenterProtocolHandler::ThrowIfDisposed (void) const
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
         throw lang::DisposedException (
-            OUString(RTL_CONSTASCII_USTRINGPARAM(
-                "PresenterProtocolHandler object has already been disposed")),
+            OUString(
+                "PresenterProtocolHandler object has already been disposed"),
             const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this)));
     }
 }
@@ -486,8 +486,8 @@ void PresenterProtocolHandler::Dispatch::ThrowIfDisposed (void) const
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
         throw lang::DisposedException (
-            OUString(RTL_CONSTASCII_USTRINGPARAM(
-                "PresenterProtocolHandler::Dispatch object has already been disposed")),
+            OUString(
+                "PresenterProtocolHandler::Dispatch object has already been disposed"),
             const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this)));
     }
 }
diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx
index bb5ec1aa5bcb..46c763a08cfd 100644
--- a/sdext/source/presenter/PresenterViewFactory.cxx
+++ b/sdext/source/presenter/PresenterViewFactory.cxx
@@ -543,8 +543,8 @@ void PresenterViewFactory::ThrowIfDisposed (void) const
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
         throw lang::DisposedException (
-            OUString(RTL_CONSTASCII_USTRINGPARAM(
-                "PresenterViewFactory object has already been disposed")),
+            OUString(
+                "PresenterViewFactory object has already been disposed"),
             const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this)));
     }
 }