RTL_CONSTASCII_(U)STRINGPARAM removed in vcl/[source,null]

Change-Id: Icedb5ad5c1023829689d56367043451b8fe95eed

11 files changed, 82 insertions, 83 deletions

diff --git a/vcl/null/printerinfomanager.cxx b/vcl/null/printerinfomanager.cxx
index a92246ba7e5a..3af6955cbe7c 100644
--- a/vcl/null/printerinfomanager.cxx
+++ b/vcl/null/printerinfomanager.cxx
@@ -49,7 +49,7 @@ PrinterInfoManager::PrinterInfoManager( Type eType ) :
     m_eType( eType ),
     m_bUseIncludeFeature( false ),
     m_bUseJobPatch( true ),
-    m_aSystemDefaultPaper( RTL_CONSTASCII_USTRINGPARAM( "A4" ) ),
+    m_aSystemDefaultPaper( "A4" ),
 #ifdef LIBO_HEADLESS
     m_bDisableCUPS( true )
 #else
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index a488516aa098..879a548faab2 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -510,7 +510,7 @@ DbgWindow::DbgWindow() :
         SetWindowState( aState );
     }
 
-    SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StarView Debug Window")));
+    SetText("StarView Debug Window");
     Show();
     Update();
 }
@@ -595,7 +595,7 @@ long DbgWindow::PreNotify( NotifyEvent& rNEvt )
                     // build the string to copy to the clipboard
                     rtl::OUStringBuffer sAssertion;
                     rtl::OUString sLineFeed = convertLineEnd(
-                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")),
+                        rtl::OUString("\n"),
                         GetSystemLineEnd());
                     while ( nAssertionFirst < nAssertionLast )
                     {
@@ -686,7 +686,7 @@ DbgDialog::DbgDialog() :
 
     {
     maXtorThis.Show();
-    maXtorThis.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("T~his" )));
+    maXtorThis.SetText("T~his");
     if ( pData->nTestFlags & DBG_TEST_XTOR_THIS )
         maXtorThis.Check( sal_True );
     maXtorThis.SetPosSizePixel( LogicToPixel( Point( 10, 15 ), aAppMap ),
@@ -695,7 +695,7 @@ DbgDialog::DbgDialog() :
 
     {
     maXtorFunc.Show();
-    maXtorFunc.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Function")));
+    maXtorFunc.SetText("~Function");
     if ( pData->nTestFlags & DBG_TEST_XTOR_FUNC )
         maXtorFunc.Check( sal_True );
     maXtorFunc.SetPosSizePixel( LogicToPixel( Point( 75, 15 ), aAppMap ),
@@ -704,7 +704,7 @@ DbgDialog::DbgDialog() :
 
     {
     maXtorExit.Show();
-    maXtorExit.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("E~xit")));
+    maXtorExit.SetText("E~xit");
     if ( pData->nTestFlags & DBG_TEST_XTOR_EXIT )
         maXtorExit.Check( sal_True );
     maXtorExit.SetPosSizePixel( LogicToPixel( Point( 140, 15 ), aAppMap ),
@@ -713,7 +713,7 @@ DbgDialog::DbgDialog() :
 
     {
     maXtorReport.Show();
-    maXtorReport.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Report")));
+    maXtorReport.SetText("~Report");
     if ( pData->nTestFlags & DBG_TEST_XTOR_REPORT )
         maXtorReport.Check( sal_True );
     maXtorReport.SetPosSizePixel( LogicToPixel( Point( 205, 15 ), aAppMap ),
@@ -722,7 +722,7 @@ DbgDialog::DbgDialog() :
 
     {
     maXtorTrace.Show();
-    maXtorTrace.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Trace")));
+    maXtorTrace.SetText("~Trace");
     if ( pData->nTestFlags & DBG_TEST_XTOR_TRACE )
         maXtorTrace.Check( sal_True );
     maXtorTrace.SetPosSizePixel( LogicToPixel( Point( 270, 15 ), aAppMap ),
@@ -731,14 +731,14 @@ DbgDialog::DbgDialog() :
 
     {
     maBox1.Show();
-    maBox1.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Object Tests")));
+    maBox1.SetText("Object Tests");
     maBox1.SetPosSizePixel( LogicToPixel( Point( 5, 5 ), aAppMap ),
                             LogicToPixel( Size( 330, 30 ), aAppMap ) );
     }
 
     {
     maProf.Show();
-    maProf.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Profiling")));
+    maProf.SetText("~Profiling");
     if ( pData->nTestFlags & DBG_TEST_PROFILING )
         maProf.Check( sal_True );
     maProf.SetPosSizePixel( LogicToPixel( Point( 10, 95 ), aAppMap ),
@@ -747,7 +747,7 @@ DbgDialog::DbgDialog() :
 
     {
     maRes.Show();
-    maRes.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Resourcen")));
+    maRes.SetText("~Resourcen");
     if ( pData->nTestFlags & DBG_TEST_RESOURCE )
         maRes.Check( sal_True );
     maRes.SetPosSizePixel( LogicToPixel( Point( 75, 95 ), aAppMap ),
@@ -756,7 +756,7 @@ DbgDialog::DbgDialog() :
 
     {
     maDialog.Show();
-    maDialog.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Dialog")));
+    maDialog.SetText("~Dialog");
     if ( pData->nTestFlags & DBG_TEST_DIALOG )
         maDialog.Check( sal_True );
     maDialog.SetPosSizePixel( LogicToPixel( Point( 140, 95 ), aAppMap ),
@@ -765,7 +765,7 @@ DbgDialog::DbgDialog() :
 
     {
     maBoldAppFont.Show();
-    maBoldAppFont.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Bold AppFont")));
+    maBoldAppFont.SetText("~Bold AppFont");
     if ( pData->nTestFlags & DBG_TEST_BOLDAPPFONT )
         maBoldAppFont.Check( sal_True );
     maBoldAppFont.SetPosSizePixel( LogicToPixel( Point( 205, 95 ), aAppMap ),
@@ -775,7 +775,7 @@ DbgDialog::DbgDialog() :
 
     {
     maBox3.Show();
-    maBox3.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Test Options")));
+    maBox3.SetText("Test Options");
     maBox3.SetPosSizePixel( LogicToPixel( Point( 5, 85 ), aAppMap ),
                             LogicToPixel( Size( 330, 30 ), aAppMap ) );
     }
@@ -790,7 +790,7 @@ DbgDialog::DbgDialog() :
 
     {
     maOverwrite.Show();
-    maOverwrite.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Overwrite ~File")));
+    maOverwrite.SetText("Overwrite ~File");
     if ( pData->bOverwrite )
         maOverwrite.Check( sal_True );
     maOverwrite.SetPosSizePixel( LogicToPixel( Point( 205, 130 ), aAppMap ),
@@ -799,7 +799,7 @@ DbgDialog::DbgDialog() :
 
     {
     maHookOSLBox.Show();
-    maHookOSLBox.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Reroute osl debug ~messages")));
+    maHookOSLBox.SetText("Reroute osl debug ~messages");
     if ( pData->bHookOSLAssert )
         maHookOSLBox.Check( sal_True );
     maHookOSLBox.SetPosSizePixel( LogicToPixel( Point( 10, 240 ), aAppMap ),
@@ -808,7 +808,7 @@ DbgDialog::DbgDialog() :
 
     {
     maInclClassText.Show();
-    maInclClassText.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Include-ObjectTest-Filter")));
+    maInclClassText.SetText("~Include-ObjectTest-Filter");
     maInclClassText.SetPosSizePixel( LogicToPixel( Point( 10, 150 ), aAppMap ),
                                      LogicToPixel( Size( 95, 9 ), aAppMap ) );
     }
@@ -823,7 +823,7 @@ DbgDialog::DbgDialog() :
 
     {
     maExclClassText.Show();
-    maExclClassText.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Exclude-ObjectTest-Filter")));
+    maExclClassText.SetText("~Exclude-ObjectTest-Filter");
     maExclClassText.SetPosSizePixel( LogicToPixel( Point( 115, 150 ), aAppMap ),
                                      LogicToPixel( Size( 95, 9 ), aAppMap ) );
     }
@@ -838,7 +838,7 @@ DbgDialog::DbgDialog() :
 
     {
     maInclText.Show();
-    maInclText.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Include-Filter")));
+    maInclText.SetText("~Include-Filter");
     maInclText.SetPosSizePixel( LogicToPixel( Point( 10, 180 ), aAppMap ),
                                 LogicToPixel( Size( 95, 9 ), aAppMap ) );
     }
@@ -853,7 +853,7 @@ DbgDialog::DbgDialog() :
 
     {
     maExclText.Show();
-    maExclText.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Exclude-Filter")));
+    maExclText.SetText("~Exclude-Filter");
     maExclText.SetPosSizePixel( LogicToPixel( Point( 115, 180 ), aAppMap ),
                                 LogicToPixel( Size( 95, 9 ), aAppMap ) );
     }
@@ -868,20 +868,20 @@ DbgDialog::DbgDialog() :
 
     {
     maTraceText.Show();
-    maTraceText.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Trace" )));
+    maTraceText.SetText("~Trace");
     maTraceText.SetPosSizePixel( LogicToPixel( Point( 10, 210 ), aAppMap ),
                                  LogicToPixel( Size( 95, 9 ), aAppMap ) );
     }
 
     {
-    maTraceBox.InsertEntry(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("None" )));
-    maTraceBox.InsertEntry(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("File")));
-    maTraceBox.InsertEntry(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Window")));
-    maTraceBox.InsertEntry(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Shell")));
-    maTraceBox.InsertEntry(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MessageBox")));
-    maTraceBox.InsertEntry(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestTool")));
-    maTraceBox.InsertEntry(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Debugger")));
-    maTraceBox.InsertEntry(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Abort")));
+    maTraceBox.InsertEntry("None");
+    maTraceBox.InsertEntry("File");
+    maTraceBox.InsertEntry("Window");
+    maTraceBox.InsertEntry("Shell");
+    maTraceBox.InsertEntry("MessageBox");
+    maTraceBox.InsertEntry("TestTool");
+    maTraceBox.InsertEntry("Debugger");
+    maTraceBox.InsertEntry("Abort");
     ImplAppendUserDefinedChannels( maTraceBox );
     ImplSelectChannel( maTraceBox, pData->nTraceOut, 0 );
     maTraceBox.Show();
@@ -891,20 +891,20 @@ DbgDialog::DbgDialog() :
 
     {
     maWarningText.Show();
-    maWarningText.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Warning")));
+    maWarningText.SetText("~Warning");
     maWarningText.SetPosSizePixel( LogicToPixel( Point( 115, 210 ), aAppMap ),
                                    LogicToPixel( Size( 95, 9 ), aAppMap ) );
     }
 
     {
-    maWarningBox.InsertEntry(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("None")));
-    maWarningBox.InsertEntry(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "File" ) ) );
-    maWarningBox.InsertEntry(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Window" ) ) );
-    maWarningBox.InsertEntry(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Shell" ) ) );
-    maWarningBox.InsertEntry(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MessageBox" ) ) );
-    maWarningBox.InsertEntry(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TestTool" ) ) );
-    maWarningBox.InsertEntry(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Debugger" ) ) );
-    maWarningBox.InsertEntry(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Abort" ) ) );
+    maWarningBox.InsertEntry("None");
+    maWarningBox.InsertEntry("File");
+    maWarningBox.InsertEntry("Window");
+    maWarningBox.InsertEntry("Shell");
+    maWarningBox.InsertEntry("MessageBox");
+    maWarningBox.InsertEntry("TestTool");
+    maWarningBox.InsertEntry("Debugger");
+    maWarningBox.InsertEntry("Abort");
     ImplAppendUserDefinedChannels( maWarningBox );
     ImplSelectChannel( maWarningBox, pData->nWarningOut, 0 );
     maWarningBox.Show();
@@ -914,7 +914,7 @@ DbgDialog::DbgDialog() :
 
     {
     maErrorText.Show();
-    maErrorText.SetText( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "~Error" ) ) );
+    maErrorText.SetText( "~Error");
     maErrorText.SetPosSizePixel( LogicToPixel( Point( 220, 210 ), aAppMap ),
                                  LogicToPixel( Size( 95, 9 ), aAppMap ) );
     }
@@ -922,18 +922,18 @@ DbgDialog::DbgDialog() :
     {
     if ( DbgIsAllErrorOut() )
     {
-        maErrorBox.InsertEntry( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "None" ) ) );
-        maErrorBox.InsertEntry( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "File" ) ) );
-        maErrorBox.InsertEntry( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Window" ) ) );
-        maErrorBox.InsertEntry( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Shell" ) ) );
+        maErrorBox.InsertEntry( "None" );
+        maErrorBox.InsertEntry( "File" );
+        maErrorBox.InsertEntry( "Window" );
+        maErrorBox.InsertEntry( "Shell" );
         mnErrorOff = 0;
     }
     else
         mnErrorOff = 4;
-    maErrorBox.InsertEntry( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MessageBox" ) ) );
-    maErrorBox.InsertEntry( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TestTool" ) ) );
-    maErrorBox.InsertEntry( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Debugger" ) ) );
-    maErrorBox.InsertEntry( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Abort" ) ) );
+    maErrorBox.InsertEntry( "MessageBox" );
+    maErrorBox.InsertEntry( "TestTool" );
+    maErrorBox.InsertEntry( "Debugger" );
+    maErrorBox.InsertEntry( "Abort" );
     ImplAppendUserDefinedChannels( maErrorBox );
     ImplSelectChannel( maErrorBox, pData->nErrorOut, mnErrorOff );
     maErrorBox.Show();
@@ -943,7 +943,7 @@ DbgDialog::DbgDialog() :
 
     {
     maBox4.Show();
-    maBox4.SetText( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Output" ) ) );
+    maBox4.SetText( "Output" );
     maBox4.SetPosSizePixel( LogicToPixel( Point( 5, 120 ), aAppMap ),
                             LogicToPixel( Size( 330, 135 ), aAppMap ) );
     }
@@ -962,7 +962,7 @@ DbgDialog::DbgDialog() :
     {
     maInfoButton.Show();
     maInfoButton.SetClickHdl( LINK( this, DbgDialog, ClickHdl ) );
-    maInfoButton.SetText( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "~Info..." ) ) );
+    maInfoButton.SetText( "~Info..." );
     maInfoButton.SetPosSizePixel( LogicToPixel( Point( 130, 260 ), aAppMap ),
                                   LogicToPixel( Size( 50, 15 ), aAppMap ) );
     }
@@ -973,7 +973,7 @@ DbgDialog::DbgDialog() :
     }
 
     {
-    SetText( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VCL Debug Options" ) ) );
+    SetText( "VCL Debug Options" );
     SetOutputSizePixel( LogicToPixel( Size( 340, 280 ), aAppMap ) );
     }
 }
@@ -1080,7 +1080,7 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton )
         aDbgInfoBuf[0] = '\0';
         DbgXtorInfo( aDbgInfoBuf );
         XubString aInfoText( aDbgInfoBuf, RTL_TEXTENCODING_UTF8 );
-        aInfoDialog.SetText( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Debug InfoReport" ) ) );
+        aInfoDialog.SetText( "Debug InfoReport" );
         aInfoDialog.SetInfoText( aInfoText );
         aInfoDialog.Execute();
     }
@@ -1102,7 +1102,7 @@ void DbgDialog::RequestHelp( const HelpEvent& rHEvt )
             aHelpText.AppendAscii( *pHelpStrs );
             pHelpStrs++;
         }
-        aInfoDialog.SetText( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Debug Hilfe" ) ) );
+        aInfoDialog.SetText( "Debug Hilfe" );
         aInfoDialog.SetInfoText( aHelpText );
         aInfoDialog.Execute();
     }
@@ -1677,7 +1677,7 @@ void DbgPrintMsgBox( const char* pLine )
     if ( aMessageBox.didTimeout() )
         DbgPrintShell( pLine );
     else if ( nResult == RET_YES )
-        GetpApp()->Abort( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Debug-Utilities-Error" ) ) );
+        GetpApp()->Abort( "Debug-Utilities-Error" );
     else if ( nResult == RET_CANCEL )
         DbgCoreDump();
 }
@@ -1791,8 +1791,7 @@ void DbgGUIStart()
     }
     else
     {
-        ErrorBox( 0, WB_OK,
-                  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TOOLS Library has no Debug-Routines" ) ) ).Execute();
+        ErrorBox( 0, WB_OK, "TOOLS Library has no Debug-Routines" ).Execute();
     }
 }
 
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 32366face1bc..9991b9008f93 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -624,10 +624,10 @@ sal_uLong StyleSettings::GetAutoSymbolsStyle() const
     rtl::OUString const & env = Application::GetDesktopEnvironment();
 
     sal_uLong nRet;
-    if ( env.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("tde")) ||
-         env.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")) )
+    if ( env.equalsIgnoreAsciiCase("tde") ||
+         env.equalsIgnoreAsciiCase("kde") )
         nRet = STYLE_SYMBOLS_CRYSTAL;
-    else if ( env.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde4")) )
+    else if ( env.equalsIgnoreAsciiCase("kde4") )
         nRet = STYLE_SYMBOLS_OXYGEN;
     else
         nRet = STYLE_SYMBOLS_TANGO;
@@ -1057,7 +1057,7 @@ sal_Bool MiscSettings::GetDisablePrinting() const
             vcl::SettingsConfigItem::get()->
             getValue( rtl::OUString( "DesktopManagement"  ),
                       rtl::OUString( "DisablePrinting"  ) );
-        mpData->mnDisablePrinting = aEnable.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ? 1 : 0;
+        mpData->mnDisablePrinting = aEnable.equalsIgnoreAsciiCase("true") ? 1 : 0;
     }
 
     return (sal_Bool)mpData->mnDisablePrinting;
@@ -1113,7 +1113,7 @@ sal_Bool MiscSettings::GetEnableATToolSupport() const
                 vcl::SettingsConfigItem::get()->
                 getValue( rtl::OUString( "Accessibility"  ),
                           rtl::OUString( "EnableATToolSupport"  ) );
-            mpData->mnEnableATT = aEnable.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ? 1 : 0;
+            mpData->mnEnableATT = aEnable.equalsIgnoreAsciiCase("true") ? 1 : 0;
         }
         else
         {
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index c6c6c5abd53f..73530fd0e11d 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1563,7 +1563,7 @@ UnoWrapperBase* Application::GetUnoWrapper( sal_Bool bCreateIfNotExist )
             &thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT );
         if ( hTkLib )
         {
-            ::rtl::OUString aFunctionName( RTL_CONSTASCII_USTRINGPARAM( "CreateUnoWrapper" ) );
+            OUString aFunctionName( "CreateUnoWrapper" );
             FN_TkCreateUnoWrapper fnCreateWrapper = (FN_TkCreateUnoWrapper)osl_getFunctionSymbol( hTkLib, aFunctionName.pData );
             if ( fnCreateWrapper )
             {
diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx
index 8fb3b1cfaea0..e4187ccf7325 100644
--- a/vcl/source/components/fontident.cxx
+++ b/vcl/source/components/fontident.cxx
@@ -158,14 +158,14 @@ Any SAL_CALL FontIdentificator::getMaterial() throw(RuntimeException)
 
 Sequence< OUString > FontIdentificator_getSupportedServiceNames()
 {
-    static OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.FontIdentificator" ) );
+    static OUString aServiceName( "com.sun.star.awt.FontIdentificator" );
     static Sequence< OUString > aServiceNames( &aServiceName, 1 );
     return aServiceNames;
 }
 
 OUString FontIdentificator_getImplementationName()
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( "vcl::FontIdentificator" ) );
+    return OUString( "vcl::FontIdentificator" );
 }
 
 Reference< XInterface > SAL_CALL FontIdentificator_createInstance( const Reference< XMultiServiceFactory >&  )
diff --git a/vcl/source/components/stringmirror.cxx b/vcl/source/components/stringmirror.cxx
index 43d478acb124..2c10976018c0 100644
--- a/vcl/source/components/stringmirror.cxx
+++ b/vcl/source/components/stringmirror.cxx
@@ -72,14 +72,14 @@ public:
 
 Sequence< OUString > StringMirror_getSupportedServiceNames()
 {
-    static OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.StringMirror" ) );
+    static OUString aServiceName( "com.sun.star.awt.StringMirror" );
     static Sequence< OUString > aServiceNames( &aServiceName, 1 );
     return aServiceNames;
 }
 
 OUString StringMirror_getImplementationName()
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( "vcl::StringMirror" ) );
+    return OUString( "vcl::StringMirror" );
 }
 
 Reference< XInterface > SAL_CALL StringMirror_createInstance( const Reference< XMultiServiceFactory >&  )
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 9e5e99d04d9a..8d0a3403a5e9 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -805,7 +805,7 @@ NumericField::NumericField( Window* pParent, const ResId& rResId ) :
 
 bool NumericField::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
 {
-    if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("digits")))
+    if (rKey == "digits")
         SetDecimalDigits(rValue.toInt32());
     else
         return SpinField::set_property(rKey, rValue);
@@ -1721,12 +1721,12 @@ Size MetricField::CalcMinimumSize() const
 
 bool MetricField::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
 {
-    if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("format")))
+    if (rKey == "format")
     {
         maCustomUnitText = rtl::OStringToOUString(rValue, RTL_TEXTENCODING_UTF8);
         meUnit = FUNIT_CUSTOM;
     }
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("digits")))
+    else if (rKey == "digits")
         SetDecimalDigits(rValue.toInt32());
     else
         return SpinField::set_property(rKey, rValue);
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index cdc358a598bb..4193b1416d2a 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -2479,9 +2479,9 @@ sal_Bool TimeFormatter::ImplTimeReformat( const XubString& rStr, XubString& rOut
             }
             // Don't use LocaleDataWrapper, we want AM/PM
             if ( aTempTime.GetHour() < 12 )
-                rOutStr += String( RTL_CONSTASCII_USTRINGPARAM( "AM" ) ); // ImplGetLocaleDataWrapper().getTimeAM();
+                rOutStr += "AM"; // ImplGetLocaleDataWrapper().getTimeAM();
             else
-                rOutStr += String( RTL_CONSTASCII_USTRINGPARAM( "PM" ) ); // ImplGetLocaleDataWrapper().getTimePM();
+                rOutStr += "PM"; // ImplGetLocaleDataWrapper().getTimePM();
         }
     }
 
@@ -2777,9 +2777,9 @@ void TimeFormatter::ImplSetUserTime( const Time& rNewTime, Selection* pNewSelect
                 }
                 // Don't use LocaleDataWrapper, we want AM/PM
                 if ( aNewTime.GetHour() < 12 )
-                    aStr += String( RTL_CONSTASCII_USTRINGPARAM( "AM" ) ); // ImplGetLocaleDataWrapper().getTimeAM();
+                    aStr += "AM"; // ImplGetLocaleDataWrapper().getTimeAM();
                 else
-                    aStr += String( RTL_CONSTASCII_USTRINGPARAM( "PM" ) ); // ImplGetLocaleDataWrapper().getTimePM();
+                    aStr += "PM"; // ImplGetLocaleDataWrapper().getTimePM();
             }
         }
 
diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx
index 142631f6103c..712ca1d10ec1 100644
--- a/vcl/source/control/throbber.cxx
+++ b/vcl/source/control/throbber.cxx
@@ -86,12 +86,12 @@ Throbber::~Throbber()
 namespace
 {
     //..................................................................................................................
-    ::rtl::OUString lcl_getHighContrastURL( ::rtl::OUString const& i_imageURL )
+    ::rtl::OUString lcl_getHighContrastURL( OUString const& i_imageURL )
     {
         INetURLObject aURL( i_imageURL );
         if ( aURL.GetProtocol() != INET_PROT_PRIV_SOFFICE )
         {
-            OSL_VERIFY( aURL.insertName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "hicontrast" ) ), false, 0 ) );
+            OSL_VERIFY( aURL.insertName( "hicontrast", false, 0 ) );
             return aURL.GetMainURL( INetURLObject::NO_DECODE );
         }
         // the private: scheme is not considered to be hierarchical by INetURLObject, so manually insert the
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 5d326452c40a..cf7fcc785955 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -638,7 +638,7 @@ uno::Reference < i18n::XExtendedInputSequenceChecker > TextEngine::GetInputSeque
 //    if ( !xISC.is() )
     {
         uno::Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
-        uno::Reference< uno::XInterface > xI = xMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.InputSequenceChecker" )) );
+        uno::Reference< uno::XInterface > xI = xMSF->createInstance( OUString( "com.sun.star.i18n.InputSequenceChecker" ) );
         if ( xI.is() )
         {
             Any x = xI->queryInterface( ::getCppuType((const uno::Reference< i18n::XExtendedInputSequenceChecker >*)0) );
@@ -2625,12 +2625,12 @@ sal_Bool TextEngine::Write( SvStream& rOutput, const TextSelection* pSel, sal_Bo
         }
         else
         {
-            aText.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "<P STYLE=\"margin-bottom: 0cm\">" ) );
+            aText.AssignAscii( "<P STYLE=\"margin-bottom: 0cm\">" );
 
             if ( nStartPos == nEndPos )
             {
-                // Leerzeilen werden von Writer wegoptimiert
-                aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "<BR>" ) );
+                // Empty lines will be removed by Writer
+                aText.AppendAscii( "<BR>" );
             }
             else
             {
@@ -2649,19 +2649,19 @@ sal_Bool TextEngine::Write( SvStream& rOutput, const TextSelection* pSel, sal_Bo
                         nTmpEnd = Min( pAttr->GetEnd(), nEndPos );
 
                         // z.B. <A HREF="http://www.mopo.de/">Morgenpost</A>
-                        aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "<A HREF=\"" ) );
+                        aText.AppendAscii( "<A HREF=\"" );
                         aText += ((const TextAttribHyperLink&) pAttr->GetAttr() ).GetURL();
-                        aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "\">" ) );
+                        aText.AppendAscii( "\">" );
                         nTmpStart = pAttr->GetStart();
                         aText += pNode->GetText().Copy( nTmpStart, nTmpEnd-nTmpStart );
-                        aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "</A>" ) );
+                        aText.AppendAscii( "</A>" );
 
                         nTmpStart = pAttr->GetEnd();
                     }
                 } while ( nTmpEnd < nEndPos );
             }
 
-            aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "</P>" ) );
+            aText.AppendAscii( "</P>" );
         }
         rOutput.WriteLine(rtl::OUStringToOString(aText,
             rOutput.GetStreamCharSet()));
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index d901df00c6e6..23109d612ada 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -1567,7 +1567,7 @@ void VclMultiLineEdit::EnableCursor( sal_Bool bEnable )
 
 bool VclMultiLineEdit::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
 {
-    if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("cursor-visible")))
+    if (rKey == "cursor-visible")
         EnableCursor(toBool(rValue));
     else
         return Edit::set_property(rKey, rValue);