remove most use of RTL_CONSTASCII_USTRINGPARAM macro

This is largely unnecessary when working with OUString

Change-Id: I3cf4d68357a43665d01162ef4a2d5346a45da9be

5 files changed, 14 insertions, 14 deletions

diff --git a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
index d1dee34bee36..0ba51e5bb115 100644
--- a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
+++ b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
@@ -111,15 +111,15 @@ class ControllerProperties
     rtl::OUString getMoreString()
     {
         return maLocalizedStrings.Count() >= 4
-               ? rtl::OUString( maLocalizedStrings.GetString( 3 ) )
-               : rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "More" ) );
+               ? OUString( maLocalizedStrings.GetString( 3 ) )
+               : OUString( "More" );
     }
     
     rtl::OUString getPrintSelectionString()
     {
         return maLocalizedStrings.Count() >= 5
-               ? rtl::OUString( maLocalizedStrings.GetString( 4 ) )
-               : rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Print selection only" ) );
+               ? OUString( maLocalizedStrings.GetString( 4 ) )
+               : OUString( "Print selection only" );
     }
     
     void updatePrintJob()
@@ -1267,7 +1267,7 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO
                 
                 // new tab item
                 if( ! aText.getLength() )
-                    aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OOo" ) );
+                    aText = OUString( "OOo" );
                 NSString* pLabel = CreateNSString( aGroupTitle );
                 NSTabViewItem* pItem = [[NSTabViewItem alloc] initWithIdentifier: pLabel ];
                 [pItem setLabel: pLabel];
@@ -1288,7 +1288,7 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO
                 {
                     addBool( pCurParent, nCurX, nCurY, 0,
                              pControllerProperties->getPrintSelectionString(), bSelectionBoxEnabled,
-                             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintContent" ) ), bSelectionBoxChecked,
+                             OUString( "PrintContent" ), bSelectionBoxChecked,
                              aRightColumn, pControllerProperties, pCtrlTarget );
                     bAddSelectionCheckBox = false;
                 }
diff --git a/vcl/unx/gtk/a11y/atkaction.cxx b/vcl/unx/gtk/a11y/atkaction.cxx
index 11f315fcb75b..20183299742e 100644
--- a/vcl/unx/gtk/a11y/atkaction.cxx
+++ b/vcl/unx/gtk/a11y/atkaction.cxx
@@ -116,7 +116,7 @@ action_wrapper_get_localized_name (AtkAction *, gint)
 }
 
 #define ACTION_NAME_PAIR( OOoName, AtkName ) \
-    std::pair< const OUString, const gchar * > ( OUString( RTL_CONSTASCII_USTRINGPARAM( OOoName ) ), AtkName )
+    std::pair< const OUString, const gchar * > ( OUString( OOoName ), AtkName )
 
 static G_CONST_RETURN gchar *
 action_wrapper_get_name (AtkAction *action,
diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx
index 86df48b65739..a990f1fe1cc0 100644
--- a/vcl/unx/kde/UnxFilePicker.cxx
+++ b/vcl/unx/kde/UnxFilePicker.cxx
@@ -541,8 +541,8 @@ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArgumen
     sal_Int16 templateId = -1;
     aAny >>= templateId;
 
-    OUString aTypeOpen(RTL_CONSTASCII_USTRINGPARAM( "setType \"open\"" ));
-    OUString aTypeSaveAs(RTL_CONSTASCII_USTRINGPARAM( "setType \"save\"" ));
+    OUString aTypeOpen( "setType \"open\"" );
+    OUString aTypeSaveAs( "setType \"save\"" );
 
     switch ( templateId )
     {
@@ -647,7 +647,7 @@ void SAL_CALL UnxFilePicker::disposing( const lang::EventObject &rEvent )
 OUString SAL_CALL UnxFilePicker::getImplementationName()
     throw( uno::RuntimeException )
 {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME ));
+    return OUString( FILE_PICKER_IMPL_NAME );
 }
 
 sal_Bool SAL_CALL UnxFilePicker::supportsService( const OUString& ServiceName )
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index 3f1890a00fa4..54a51d9cbcff 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -131,7 +131,7 @@ MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :
     m_aQuitButton( this, 0 )
 {
     m_aListButton.SetPosSizePixel( Point( 10, 10 ), Size( 120, 25 ) );
-    m_aListButton.SetText( String( RTL_CONSTASCII_USTRINGPARAM( "List Elements" ) ) );
+    m_aListButton.SetText( OUString( "List Elements" ) );
     m_aListButton.SetClickHdl( LINK( this, MyWin, ListHdl ) );
     m_aListButton.Show();
 
@@ -144,7 +144,7 @@ MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :
     m_aImage.Show();
 
     m_aQuitButton.SetPosSizePixel( Point( 10, 300 ), Size( 120,25 ) );
-    m_aQuitButton.SetText( String( RTL_CONSTASCII_USTRINGPARAM( "Quit SVP server" ) ) );
+    m_aQuitButton.SetText( OUString( "Quit SVP server" ) );
     m_aQuitButton.SetClickHdl( LINK( this, MyWin, QuitHdl ) );
     m_aQuitButton.Show();
 }
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index af7c7cf02890..841305e854ca 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -141,9 +141,9 @@ void MyWin::Paint( const Rectangle& rRect )
         DrawLine( Point(r.Left()+i, r.Bottom()), Point(r.Right()-i, r.Top()) );
 
     SetTextColor( Color( COL_WHITE ) );
-    Font aFont( String( RTL_CONSTASCII_USTRINGPARAM( "Times" ) ), Size( 0, 25 ) );
+    Font aFont( OUString( "Times" ), Size( 0, 25 ) );
     SetFont( aFont );
-    DrawText( Point( 20, 30 ), String( RTL_CONSTASCII_USTRINGPARAM( "Just a simple test text" ) ) );
+    DrawText( Point( 20, 30 ), OUString( "Just a simple test text" ) );
 }