More RTL_CONSTASCII_USTRINGPARAM removals

6 files changed, 18 insertions, 19 deletions

diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx
index 897bf0bb79df..09aacc399819 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -265,7 +265,7 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma
         // except in a few cases (?)
         if( pObj )
         {
-            String sLabel( mpViewShell->GetViewShellBase().RetrieveLabelFromCommand( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormatPaintbrush" ) ) ) );
+            rtl::OUString sLabel( mpViewShell->GetViewShellBase().RetrieveLabelFromCommand(".uno:FormatPaintbrush" ) );
             mpDoc->BegUndo( sLabel );
             mpDoc->AddUndo( mpDoc->GetSdrUndoFactory().CreateUndoAttrObject( *pObj, sal_False, sal_True ) );
         }
diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx
index 953d0e7cb0e3..c5eff51ab8f6 100644
--- a/sd/source/ui/func/fuhhconv.cxx
+++ b/sd/source/ui/func/fuhhconv.cxx
@@ -226,8 +226,7 @@ void FuHangulHanjaConversion::StartChineseConversion()
         if(xMCF.is())
         {
             Reference< ui::dialogs::XExecutableDialog > xDialog(
-                    xMCF->createInstanceWithContext(
-                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.ChineseTranslationDialog"))
+                    xMCF->createInstanceWithContext("com.sun.star.linguistic2.ChineseTranslationDialog"
                         , xContext), UNO_QUERY);
             Reference< lang::XInitialization > xInit( xDialog, UNO_QUERY );
             if( xInit.is() )
@@ -237,7 +236,7 @@ void FuHangulHanjaConversion::StartChineseConversion()
                 Sequence<Any> aSeq(1);
                 Any* pArray = aSeq.getArray();
                 PropertyValue aParam;
-                aParam.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow"));
+                aParam.Name = "ParentWindow";
                 aParam.Value <<= makeAny(xDialogParentWindow);
                 pArray[0] <<= makeAny(aParam);
                 xInit->initialize( aSeq );
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index da2e35f5b0f0..7c53bb32d199 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -380,15 +380,15 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
             {
                 if (nSlotId == SID_INSERT_DIAGRAM)
                 {
-                    pOleObj->SetProgName( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "StarChart" ) ) );
+                    pOleObj->SetProgName( rtl::OUString( "StarChart" ));
                 }
                 else if (nSlotId == SID_ATTR_TABLE)
                 {
-                    pOleObj->SetProgName( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "StarCalc" ) ) );
+                    pOleObj->SetProgName( rtl::OUString( "StarCalc" ) );
                 }
                 else if (nSlotId == SID_INSERT_MATH)
                 {
-                    pOleObj->SetProgName( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "StarMath" ) ) );
+                    pOleObj->SetProgName( rtl::OUString( "StarMath" ) );
                 }
 
                 pOleObj->SetLogicRect(aRect);
@@ -503,7 +503,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
                                 uno::Reference < beans::XPropertySet > xSet( xSup->getComponent(), uno::UNO_QUERY );
                                 if ( xSet.is() )
                                 {
-                                    xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginURL")),
+                                    xSet->setPropertyValue("PluginURL",
                                             uno::makeAny( ::rtl::OUString( aURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) );
                                 }
                             }
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index bc9d9dd0f5a7..dce5dd67e2d1 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -120,21 +120,21 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
                 SFXWB_INSERT );
         Reference< XFilePicker >    xFilePicker( aFileDialog.GetFilePicker(), UNO_QUERY );
         Reference< XFilterManager > xFilterManager( xFilePicker, UNO_QUERY );
-        String aOwnCont;
-        String aOtherCont;
+        rtl::OUString aOwnCont;
+        rtl::OUString aOtherCont;
         const SfxFilter*            pFilter = NULL;
 
         aFileDialog.SetTitle( String( SdResId(STR_DLG_INSERT_PAGES_FROM_FILE ) ) );
 
         if( mpDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS )
         {
-            aOwnCont = String( RTL_CONSTASCII_USTRINGPARAM( "simpress" ) );
-            aOtherCont = String( RTL_CONSTASCII_USTRINGPARAM( "sdraw" ) ) ;
+            aOwnCont = "simpress";
+            aOtherCont = "sdraw";
         }
         else
         {
-            aOtherCont = String( RTL_CONSTASCII_USTRINGPARAM( "simpress" ) );
-            aOwnCont = String( RTL_CONSTASCII_USTRINGPARAM( "sdraw" ) ) ;
+            aOtherCont = "simpress";
+            aOwnCont = "sdraw" ;
         }
 
         SfxFilterMatcher aMatch( aOwnCont );
@@ -752,13 +752,13 @@ void FuInsertFile::GetSupportedFilterVector( ::std::vector< OUString >& rFilterV
 
     rFilterVector.clear();
 
-    if( ( pSearchFilter = rMatcher.GetFilter4Mime( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "text/plain" ) ) ) ) != NULL )
+    if( ( pSearchFilter = rMatcher.GetFilter4Mime( "text/plain" )) != NULL )
         rFilterVector.push_back( pSearchFilter->GetMimeType() );
 
-    if( ( pSearchFilter = rMatcher.GetFilter4Mime( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "application/rtf" ) ) ) ) != NULL )
+    if( ( pSearchFilter = rMatcher.GetFilter4Mime( "application/rtf" ) ) != NULL )
         rFilterVector.push_back( pSearchFilter->GetMimeType() );
 
-    if( ( pSearchFilter = rMatcher.GetFilter4Mime( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "text/html" ) ) ) ) != NULL )
+    if( ( pSearchFilter = rMatcher.GetFilter4Mime( "text/html" ) ) != NULL )
         rFilterVector.push_back( pSearchFilter->GetMimeType() );
 }
 
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 69f667cf7e2a..ceb4b9e8519b 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -312,7 +312,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
 
                 // MigrateItemSet makes sure the XFillBitmapItem will have a unique name
                 SfxItemSet aMigrateSet( mpDoc->GetPool(), XATTR_FILLBITMAP, XATTR_FILLBITMAP );
-                aMigrateSet.Put( XFillBitmapItem( String(RTL_CONSTASCII_USTRINGPARAM("background")), XOBitmap(aGraphic) ) );
+                aMigrateSet.Put( XFillBitmapItem( rtl::OUString("background") , XOBitmap(aGraphic) ) );
                 mpDoc->MigrateItemSet( &aMigrateSet, pTempSet.get(), NULL );
 
                 pTempSet->Put( XFillBmpStretchItem( sal_True ));
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 8c5c4c67f544..73b24dfd08df 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -161,7 +161,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
                     Reference< XPropertySet > xInfo( xStyles->getByName( pNameItem->GetValue() ), UNO_QUERY_THROW );
 
                     OUString aUIName;
-                    xInfo->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayName")) ) >>= aUIName;
+                    xInfo->getPropertyValue( "DisplayName" ) >>= aUIName;
                     if ( !aUIName.isEmpty() )
                         rReq.AppendItem( SfxStringItem( nSId, aUIName ) );
                 }