More RTL_CONSTASCII_USTRINGPARAM removals

/sd/.../grf and html

sd/source/filter/grf/sdgrffilter.cxx

@@ -269,7 +269,7 @@ sal_Bool SdGRFFilter::Export()
      uno::Reference< lang::XMultiServiceFactory >
         xSMgr( ::comphelper::getProcessServiceFactory() );
     uno::Reference< uno::XInterface > xComponent
-        ( xSMgr->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GraphicExportFilter" ) ) ),
+        ( xSMgr->createInstance( "com.sun.star.drawing.GraphicExportFilter" ),
             uno::UNO_QUERY );
     if ( xComponent.is() )
     {
@@ -315,8 +315,8 @@ sal_Bool SdGRFFilter::Export()
                             beans::PropertyValues aArgs;
                             TransformItems( SID_SAVEASDOC, *pSet, aArgs );
 
-                            rtl::OUString sInteractionHandler( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ) );
-                            rtl::OUString sFilterName( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ) );
+                            rtl::OUString sInteractionHandler( "InteractionHandler" );
+                            rtl::OUString sFilterName( "FilterName" );
                             rtl::OUString sShortName( rGraphicFilter.GetExportFormatShortName( nFilter ) );
 
                             sal_Bool    bFilterNameFound = sal_False;
@@ -383,7 +383,7 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su
     {
         Reference< XMultiServiceFactory > xSM( ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
 
-        Reference< XGraphicProvider > xProvider( xSM->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.graphic.GraphicProvider" ) ) ), UNO_QUERY_THROW );
+        Reference< XGraphicProvider > xProvider( xSM->createInstance( "com.sun.star.graphic.GraphicProvider" ), UNO_QUERY_THROW );
         Reference< XPropertySet > xShapeSet( xShape, UNO_QUERY_THROW );
 
         // detect mime type of graphic
@@ -391,13 +391,13 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su
         OUString sGraphicURL;
 
         // first try to detect from graphic object
-        Reference< XPropertySet > xGraphicSet( xShapeSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Graphic" ) ) ), UNO_QUERY_THROW );
-        xShapeSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "GraphicURL" ) ) ) >>= sGraphicURL;
+        Reference< XPropertySet > xGraphicSet( xShapeSet->getPropertyValue( "Graphic" ), UNO_QUERY_THROW );
+        xShapeSet->getPropertyValue( "GraphicURL" ) >>= sGraphicURL;
 
-        bool bIsLinked = !sGraphicURL.isEmpty() && (sGraphicURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.GraphicObject:") ) != 0);
+        bool bIsLinked = !sGraphicURL.isEmpty() && sGraphicURL.equals("vnd.sun.star.GraphicObject:");
 
         if( !bIsLinked )
-               xGraphicSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "MimeType" ) ) ) >>= aMimeType;
+               xGraphicSet->getPropertyValue( "MimeType" ) >>= aMimeType;
 
         if( bIsLinked || aMimeType == "image/x-vclgraphic" || aMimeType.isEmpty() )
         {
@@ -405,19 +405,19 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su
             OUString aURL( sGraphicURL );
 
             if( aURL.isEmpty() )
-                xShapeSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "GraphicStreamURL" ) ) ) >>= aURL;
+                xShapeSet->getPropertyValue( "GraphicStreamURL" ) >>= aURL;
 
             {
-                Reference< XInputStream > xGraphStream( xShapeSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "GraphicStream" ) ) ), UNO_QUERY );
+                Reference< XInputStream > xGraphStream( xShapeSet->getPropertyValue( "GraphicStream" ), UNO_QUERY );
                 PropertyValues aDesc(2);
-                aDesc[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
+                aDesc[0].Name = "URL";
                 aDesc[0].Value <<= aURL;
-                aDesc[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "InputStream" ) );
+                aDesc[1].Name = "InputStream";
                 aDesc[1].Value <<= xGraphStream;
 
                 Reference< XPropertySet > xDescSet( xProvider->queryGraphicDescriptor( aDesc ), UNO_QUERY_THROW );
 
-                xDescSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "MimeType" ) ) ) >>= aMimeType;
+                xDescSet->getPropertyValue( "MimeType" ) >>= aMimeType;
             }
         }
 
@@ -429,26 +429,26 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su
             // png for non animated pixel
             // svm for vector format
             sal_Int8 nGraphicType = 0;
-            xGraphicSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "GraphicType" ) ) ) >>= nGraphicType;
+            xGraphicSet->getPropertyValue( "GraphicType" ) >>= nGraphicType;
             switch( nGraphicType )
             {
             case ::com::sun::star::graphic::GraphicType::VECTOR:
-                aMimeType = OUString(RTL_CONSTASCII_USTRINGPARAM( "image/x-svm" ) );
+                aMimeType = "image/x-svm";
                 break;
 
             case ::com::sun::star::graphic::GraphicType::PIXEL:
                 {
                     sal_Bool bAnimated = sal_False;
-                    xGraphicSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Animated" ) ) ) >>= bAnimated;
+                    xGraphicSet->getPropertyValue( "Animated" ) >>= bAnimated;
 
                     if( bAnimated )
                     {
-                        aMimeType = OUString(RTL_CONSTASCII_USTRINGPARAM( "image/gif" ) );
+                        aMimeType = "image/gif";
                         break;
                     }
                 }
             default:
-                aMimeType = OUString(RTL_CONSTASCII_USTRINGPARAM( "image/png" ) );
+                aMimeType = "image/png";
                 break;
             }
         }
@@ -503,7 +503,7 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su
         }
 
         if( aDefaultFormatName.isEmpty() )
-            aDefaultFormatName = OUString( RTL_CONSTASCII_USTRINGPARAM( "PNG - Portable Network Graphic" ) );
+            aDefaultFormatName = "PNG - Portable Network Graphic";
 
         xFltMgr->setCurrentFilter( aDefaultFormatName );
 
@@ -519,21 +519,21 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su
 
             Reference< XInputStream > xGraphStream;
             if( aMimeType == aExportMimeType )
-                xShapeSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "GraphicStream" ) ) ) >>= xGraphStream;
+                xShapeSet->getPropertyValue( "GraphicStream" ) >>= xGraphStream;
 
             if( xGraphStream.is() )
             {
-                Reference< XSimpleFileAccess2 > xFileAccess( xSM->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" ) ) ), UNO_QUERY_THROW );
+                Reference< XSimpleFileAccess2 > xFileAccess( xSM->createInstance("com.sun.star.ucb.SimpleFileAccess" ), UNO_QUERY_THROW );
                 xFileAccess->writeFile( sPath, xGraphStream );
             }
             else
             {
                 PropertyValues aDesc(2);
-                aDesc[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
+                aDesc[0].Name = "URL";
                 aDesc[0].Value <<= sPath;
-                aDesc[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "MimeType" ) );
+                aDesc[1].Name = "MimeType";
                 aDesc[1].Value <<= aExportMimeType;
-                Reference< XGraphic > xGraphic( xShapeSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Graphic" ) ) ), UNO_QUERY_THROW );
+                Reference< XGraphic > xGraphic( xShapeSet->getPropertyValue( "Graphic" ), UNO_QUERY_THROW );
                 xProvider->storeGraphic( xGraphic, aDesc );
             }
         }

sd/source/filter/html/HtmlOptionsDialog.cxx

@@ -118,13 +118,13 @@ Reference< XInterface >
 ::rtl::OUString SdHtmlOptionsDialog_getImplementationName()
     throw( RuntimeException )
 {
-    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.draw.SdHtmlOptionsDialog" ) );
+    return ::rtl::OUString( "com.sun.star.comp.draw.SdHtmlOptionsDialog" );
 }
-#define SERVICE_NAME "com.sun.star.ui.dialog.FilterOptionsDialog"
+
 sal_Bool SAL_CALL SdHtmlOptionsDialog_supportsService( const ::rtl::OUString& ServiceName )
     throw( RuntimeException )
 {
-    return ServiceName == SERVICE_NAME;
+    return ServiceName.equals("com.sun.star.ui.dialog.FilterOptionsDialog");
 }
 
 Sequence< ::rtl::OUString > SAL_CALL SdHtmlOptionsDialog_getSupportedServiceNames()
@@ -132,10 +132,9 @@ Sequence< ::rtl::OUString > SAL_CALL SdHtmlOptionsDialog_getSupportedServiceName
 {
     Sequence< ::rtl::OUString > aRet(1);
     ::rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) );
+    pArray[0] = ::rtl::OUString("com.sun.star.ui.dialog.FilterOptionsDialog");
     return aRet;
 }
-#undef SERVICE_NAME
 
 // -----------------------------------------------------------------------------
 
@@ -203,7 +202,7 @@ Sequence< PropertyValue > SdHtmlOptionsDialog::getPropertyValues()
         maMediaDescriptor.realloc( ++nCount );
 
     // the "FilterData" Property is an Any that will contain our PropertySequence of Values
-    maMediaDescriptor[ i ].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterData" ) );
+    maMediaDescriptor[ i ].Name = "FilterData";
     maMediaDescriptor[ i ].Value <<= maFilterDataSequence;
     return maMediaDescriptor;
 }
@@ -269,12 +268,12 @@ void SdHtmlOptionsDialog::setSourceDocument( const Reference< XComponent >& xDoc
             ( xDoc, UNO_QUERY );
     if ( xServiceInfo.is() )
     {
-        if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ) ) )
+        if ( xServiceInfo->supportsService( "com.sun.star.presentation.PresentationDocument" ) )
         {
             meDocType = DOCUMENT_TYPE_IMPRESS;
             return;
         }
-        else if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) ) )
+        else if ( xServiceInfo->supportsService( "com.sun.star.drawing.DrawingDocument" ) )
         {
             meDocType = DOCUMENT_TYPE_DRAW;
             return;

sd/source/filter/html/htmlex.cxx

@@ -397,12 +397,12 @@ HtmlExport::HtmlExport(
         mpThumbnailFiles(NULL),
         mpPageNames(NULL),
         mpTextFiles(NULL),
-        maIndexUrl(RTL_CONSTASCII_USTRINGPARAM("index")),
+        maIndexUrl("index"),
         meScript( SCRIPT_ASP ),
-        maHTMLHeader( RTL_CONSTASCII_USTRINGPARAM(
+        maHTMLHeader(
             "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"\r\n"
             "     \"http://www.w3.org/TR/html4/transitional.dtd\">\r\n"
-            "<html>\r\n<head>\r\n" ) ),
+            "<html>\r\n<head>\r\n" ),
         mpButtonSet( new ButtonSet() )
 {
     bool bChange = mpDoc->IsChanged();
@@ -953,10 +953,10 @@ bool HtmlExport::SavePresentation()
         if( xStorable.is() )
         {
             uno::Sequence< beans::PropertyValue > aProperties( 2 );
-            aProperties[ 0 ].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("Overwrite"));
+            aProperties[ 0 ].Name = "Overwrite";
             aProperties[ 0 ].Value <<= (sal_Bool)sal_True;
-            aProperties[ 1 ].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName"));
-            aProperties[ 1 ].Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("impress8"));
+            aProperties[ 1 ].Name = "FilterName";
+            aProperties[ 1 ].Value <<= rtl::OUString("impress8");
             xStorable->storeToURL( aURL, aProperties );
 
             mpDocSh->EnableSetModified( false );
@@ -984,7 +984,7 @@ bool HtmlExport::CreateImagesForPresPages( bool bThumbnail)
         if( !xMSF.is() )
             return false;
 
-        Reference< XExporter > xGraphicExporter( xMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GraphicExportFilter") ) ), UNO_QUERY );
+        Reference< XExporter > xGraphicExporter( xMSF->createInstance( "com.sun.star.drawing.GraphicExportFilter" ), UNO_QUERY );
         Reference< XFilter > xFilter( xGraphicExporter, UNO_QUERY );
 
         DBG_ASSERT( xFilter.is(), "no com.sun.star.drawing.GraphicExportFilter?" );
@@ -992,29 +992,29 @@ bool HtmlExport::CreateImagesForPresPages( bool bThumbnail)
             return false;
 
         Sequence< PropertyValue > aFilterData(((meFormat==FORMAT_JPG)&&(mnCompression != -1))? 3 : 2);
-        aFilterData[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("PixelWidth") );
+        aFilterData[0].Name = "PixelWidth";
         aFilterData[0].Value <<= (sal_Int32)(bThumbnail ? PUB_THUMBNAIL_WIDTH : mnWidthPixel );
-        aFilterData[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("PixelHeight") );
+        aFilterData[1].Name = "PixelHeight";
         aFilterData[1].Value <<= (sal_Int32)(bThumbnail ? PUB_THUMBNAIL_HEIGHT : mnHeightPixel);
         if((meFormat==FORMAT_JPG)&&(mnCompression != -1))
         {
-            aFilterData[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("Quality") );
+            aFilterData[2].Name = "Quality";
             aFilterData[2].Value <<= (sal_Int32)mnCompression;
         }
 
         Sequence< PropertyValue > aDescriptor( 3 );
-        aDescriptor[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("URL") );
-        aDescriptor[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("FilterName") );
+        aDescriptor[0].Name = "URL";
+        aDescriptor[1].Name = "FilterName";
         OUString sFormat;
         if( meFormat == FORMAT_PNG )
-            sFormat = OUString( RTL_CONSTASCII_USTRINGPARAM("PNG") );
+            sFormat = "PNG";
         else if( meFormat == FORMAT_GIF )
-            sFormat = OUString( RTL_CONSTASCII_USTRINGPARAM("GIF") );
+            sFormat = "GIF";
         else
-            sFormat = OUString( RTL_CONSTASCII_USTRINGPARAM("JPG") );
+            sFormat = "JPG";
 
         aDescriptor[1].Value <<= sFormat;
-        aDescriptor[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("FilterData") );
+        aDescriptor[2].Name = "FilterData";
         aDescriptor[2].Value <<= aFilterData;
 
         for (sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
@@ -2022,10 +2022,12 @@ bool HtmlExport::CreateNotesPages()
 
         aStr.AppendAscii( "</body>\r\n</html>" );
 
-        String aFileName( RTL_CONSTASCII_USTRINGPARAM("note") );
-        aFileName += String::CreateFromInt32(nSdPage);
+        OUString aFileName( "note" );
+        aFileName += OUString::valueOf(nSdPage);
         bOk = WriteHtml( aFileName, true, aStr );
 
+
+
         if (mpProgress)
             mpProgress->SetState(++mnPagesWritten);
     }
@@ -2088,8 +2090,8 @@ bool HtmlExport::CreateOutlinePages()
 
         aStr.AppendAscii( "</body>\r\n</html>" );
 
-        String aFileName( RTL_CONSTASCII_USTRINGPARAM("outline") );
-        aFileName += String::CreateFromInt32(nPage);
+        OUString aFileName( "outline" );
+        aFileName += OUString::valueOf(nPage);
         bOk = WriteHtml( aFileName, true, aStr );
 
         if (mpProgress)
@@ -2896,7 +2898,7 @@ bool HtmlExport::CopyScript( const String& rPath, const String& rSource, const S
     INetURLObject   aURL( SvtPathOptions().GetConfigPath() );
     String      aScript;
 
-    aURL.Append( String( RTL_CONSTASCII_USTRINGPARAM("webcast") ) );
+    aURL.Append( rtl::OUString("webcast") );
     aURL.Append( rSource );
 
     meEC.SetContext( STR_HTMLEXP_ERROR_OPEN_FILE, rSource );
@@ -3005,10 +3007,10 @@ bool HtmlExport::CreatePERLScripts()
             return false;
     }
 
-    if(!CopyScript(maExportPath, String( RTL_CONSTASCII_USTRINGPARAM("edit.pl")), maIndex, true ))
+    if(!CopyScript(maExportPath, rtl::OUString("edit.pl"), maIndex, true ))
         return false;
 
-    if(!CopyScript(maExportPath, String( RTL_CONSTASCII_USTRINGPARAM("index.pl")), maIndexUrl, true ))
+    if(!CopyScript(maExportPath, rtl::OUString("index.pl"), maIndexUrl, true ))
         return false;
 
     return true;
@@ -3325,8 +3327,8 @@ sal_Bool HtmlErrorContext::GetString( sal_uLong, String& rCtxStr )
 
     rCtxStr = String( SdResId( mnResId ) );
 
-    rCtxStr.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM("$(URL1)")), maURL1 );
-    rCtxStr.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM("$(URL2)")), maURL2 );
+    rCtxStr.SearchAndReplace( rtl::OUString("$(URL1)"), maURL1 );
+    rCtxStr.SearchAndReplace( rtl::OUString("$(URL2)"), maURL2 );
 
     return true;
 }

sd/source/filter/html/pubdlg.cxx

@@ -159,7 +159,7 @@ SdPublishingDesign::SdPublishingDesign()
 
     String  aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/JPG" ) );
     FilterConfigItem aFilterConfigItem( aFilterConfigPath );
-    sal_Int32 nCompression = aFilterConfigItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( KEY_QUALITY ) ), 75 );
+    sal_Int32 nCompression = aFilterConfigItem.ReadInt32( OUString( KEY_QUALITY ), 75 );
     m_aCompression = UniString::CreateFromInt32( nCompression );
     m_aCompression.Append( sal_Unicode('%') );
 
@@ -438,10 +438,10 @@ SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType)
 
     pPage2_ASP->SetClickHdl(LINK(this,SdPublishingDlg,WebServerHdl));
     pPage2_PERL->SetClickHdl(LINK(this,SdPublishingDlg,WebServerHdl));
-    String  aText( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("index")) );
+    String  aText( OUString("index") );
     aText += String(SdResId(STR_HTMLEXP_DEFAULT_EXTENSION));
     pPage2_Index->SetText(aText);
-    pPage2_CGI->SetText( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "/cgi-bin/" ) ) );
+    pPage2_CGI->SetText( OUString( "/cgi-bin/" ) );
 
     pPage3_Png->SetClickHdl(LINK(this,SdPublishingDlg, GfxFormatHdl));
     pPage3_Gif->SetClickHdl(LINK(this,SdPublishingDlg, GfxFormatHdl));
@@ -469,10 +469,10 @@ SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType)
 
     FreeResource();
 
-    pPage3_Quality->InsertEntry( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "25%" ) ) );
-    pPage3_Quality->InsertEntry( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "50%" ) ) );
-    pPage3_Quality->InsertEntry( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "75%" ) ) );
-    pPage3_Quality->InsertEntry( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "100%" ) ) );
+    pPage3_Quality->InsertEntry( OUString( "25%" ) );
+    pPage3_Quality->InsertEntry( OUString( "50%" ) );
+    pPage3_Quality->InsertEntry( OUString( "75%" ) );
+    pPage3_Quality->InsertEntry( OUString( "100%" ) );
 
     pPage5_Buttons->SetColCount( 1 );
     pPage5_Buttons->SetLineCount( 4 );
@@ -808,59 +808,59 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams )
 
 
     // Page 2
-    aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PublishMode" ) );
+    aValue.Name = "PublishMode";
     aValue.Value <<= (sal_Int32)(pPage2_Standard->IsChecked()?PUBLISH_HTML:
                                           pPage2_Frames->IsChecked()?PUBLISH_FRAMES:
                                           pPage2_Kiosk->IsChecked()?PUBLISH_KIOSK:PUBLISH_WEBCAST);
     aProps.push_back( aValue );
 
-    aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsExportContentsPage" ) );
+    aValue.Name = "IsExportContentsPage";
     aValue.Value <<= (sal_Bool)pPage2_Content->IsChecked();
     aProps.push_back( aValue );
 
     if(m_bImpress)
     {
-        aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsExportNotes" ) );
+        aValue.Name = "IsExportNotes";
         aValue.Value <<= (sal_Bool)pPage2_Notes->IsChecked();
         aProps.push_back( aValue );
     }
 
     if( pPage2_WebCast->IsChecked() )
     {
-        aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "WebCastScriptLanguage" ) );
+        aValue.Name = "WebCastScriptLanguage";
         if( pPage2_ASP->IsChecked() )
-            aValue.Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM( "asp" ) );
+            aValue.Value <<= OUString( "asp" );
         else
-            aValue.Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM( "perl" ) );
+            aValue.Value <<= OUString( "perl" );
         aProps.push_back( aValue );
 
-        aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "WebCastCGIURL" ) );
+        aValue.Name = "WebCastCGIURL";
         aValue.Value <<= OUString( pPage2_CGI->GetText() );
         aProps.push_back( aValue );
 
-        aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "WebCastTargetURL" ) );
+        aValue.Name = "WebCastTargetURL";
         aValue.Value <<= OUString( pPage2_URL->GetText() );
         aProps.push_back( aValue );
     }
-    aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "IndexURL" ) );
+    aValue.Name = "IndexURL";
     aValue.Value <<= OUString( pPage2_Index->GetText() );
     aProps.push_back( aValue );
 
 
     if( pPage2_Kiosk->IsChecked() && pPage2_ChgAuto->IsChecked() )
     {
-        aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "KioskSlideDuration" ) );
+        aValue.Name = "KioskSlideDuration";
         aValue.Value <<= (sal_uInt32)pPage2_Duration->GetTime().GetMSFromTime() / 1000;
         aProps.push_back( aValue );
 
-        aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "KioskEndless" ) );
+        aValue.Name = "KioskEndless";
         aValue.Value <<= (sal_Bool)pPage2_Endless->IsChecked();
         aProps.push_back( aValue );
     }
 
     // Page 3
 
-    aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" ) );
+    aValue.Name = "Width";
     sal_Int32 nTmpWidth = 512;
     if( pPage3_Resolution_2->IsChecked() )
         nTmpWidth = 640;
@@ -870,11 +870,11 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams )
     aValue.Value <<= nTmpWidth;
     aProps.push_back( aValue );
 
-    aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Compression" ) );
+    aValue.Name = "Compression";
     aValue.Value <<= OUString( pPage3_Quality->GetText() );
     aProps.push_back( aValue );
 
-    aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Format" ) );
+    aValue.Name = "Format";
     sal_Int32 nFormat;
     if( pPage3_Png->IsChecked() )
         nFormat = static_cast<sal_Int32>(FORMAT_PNG);
@@ -885,20 +885,20 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams )
     aValue.Value <<= nFormat;
     aProps.push_back( aValue );
 
-    aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "SlideSound" ) );
+    aValue.Name = "SlideSound";
     aValue.Value <<= pPage3_SldSound->IsChecked() ? sal_True : sal_False;
     aProps.push_back( aValue );
 
-    aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "HiddenSlides" ) );
+    aValue.Name = "HiddenSlides";
     aValue.Value <<= pPage3_HiddenSlides->IsChecked() ? sal_True : sal_False;
     aProps.push_back( aValue );
 
     // Page 4
-    aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Author" ) );
+    aValue.Name = "Author";
     aValue.Value <<= OUString( pPage4_Author->GetText() );
     aProps.push_back( aValue );
 
-    aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "EMail" ) );
+    aValue.Name = "EMail";
     aValue.Value <<= OUString( pPage4_Email->GetText() );
     aProps.push_back( aValue );
 
@@ -907,17 +907,17 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams )
                             INET_PROT_HTTP,     // default proto is HTTP
                             INetURLObject::ENCODE_ALL );
 
-    aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "HomepageURL" ) );
+    aValue.Name = "HomepageURL";
     aValue.Value <<= OUString( aHomeURL.GetMainURL( INetURLObject::NO_DECODE ) );
     aProps.push_back( aValue );
 
-    aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "UserText" ) );
+    aValue.Name = "UserText";
     aValue.Value <<= OUString( pPage4_Misc->GetText() );
     aProps.push_back( aValue );
 
     if( m_bImpress )
     {
-        aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableDownload" ) );
+        aValue.Name = "EnableDownload";
         aValue.Value <<= (sal_Bool)pPage4_Download->IsChecked();
         aProps.push_back( aValue );
     }
@@ -925,7 +925,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams )
     // Page 5
     if( !pPage5_TextOnly->IsChecked() )
     {
-        aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "UseButtonSet" ) );
+        aValue.Name = "UseButtonSet";
         aValue.Value <<= (sal_Int32)(pPage5_Buttons->GetSelectItemId() - 1);
         aProps.push_back( aValue );
     }
@@ -933,30 +933,30 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams )
     // Page 6
     if( pPage6_User->IsChecked() )
     {
-        aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "BackColor" ) );
+        aValue.Name = "BackColor";
         aValue.Value <<= (sal_Int32)m_aBackColor.GetColor();
         aProps.push_back( aValue );
 
-        aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "TextColor" ) );
+        aValue.Name = "TextColor";
         aValue.Value <<= (sal_Int32)m_aTextColor.GetColor();
         aProps.push_back( aValue );
 
-        aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "LinkColor" ) );
+        aValue.Name = "LinkColor";
         aValue.Value <<= (sal_Int32)m_aLinkColor.GetColor();
         aProps.push_back( aValue );
 
-        aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "VLinkColor" ) );
+        aValue.Name = "VLinkColor";
         aValue.Value <<= (sal_Int32)m_aVLinkColor.GetColor();
         aProps.push_back( aValue );
 
-        aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "ALinkColor" ) );
+        aValue.Name = "ALinkColor";
         aValue.Value <<= (sal_Int32)m_aALinkColor.GetColor();
         aProps.push_back( aValue );
     }
 
     if( pPage6_DocColors->IsChecked() )
     {
-        aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsUseDocumentColors" ) );
+        aValue.Name = "IsUseDocumentColors";
         aValue.Value <<= (sal_Bool)sal_True;
         aProps.push_back( aValue );
     }
@@ -1604,7 +1604,7 @@ sal_Bool SdPublishingDlg::Load()
     m_bDesignListDirty = sal_False;
 
     INetURLObject aURL( SvtPathOptions().GetUserConfigPath() );
-    aURL.Append( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "designs.sod" ) ) );
+    aURL.Append( OUString( "designs.sod" ) );
 
     // check if file exists, SfxMedium shows an errorbox else
     {
@@ -1657,7 +1657,7 @@ sal_Bool SdPublishingDlg::Load()
 sal_Bool SdPublishingDlg::Save()
 {
     INetURLObject aURL( SvtPathOptions().GetUserConfigPath() );
-    aURL.Append( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "designs.sod" ) ) );
+    aURL.Append( OUString( "designs.sod" ) );
     SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC, sal_False );
     aMedium.IsRemote();