From 081dc5afdef4a84d60a57ff549f70071b1d26eda Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Sat, 2 Jun 2012 13:13:21 -0500
Subject: targeted string re-work

Change-Id: I0ca912c8b7e485f5ec78422150aedc72ca6df32f
---
 vcl/test/canvasbitmaptest.cxx |  6 +++---
 vcl/test/dndtest.cxx          | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'vcl/test')

diff --git a/vcl/test/canvasbitmaptest.cxx b/vcl/test/canvasbitmaptest.cxx
index 9f753ff44923..d65ddeb10f21 100644
--- a/vcl/test/canvasbitmaptest.cxx
+++ b/vcl/test/canvasbitmaptest.cxx
@@ -77,7 +77,7 @@ SAL_IMPLEMENT_MAIN()
 
     uno::Reference< lang::XMultiServiceFactory > xMS;
     xMS = cppu::createRegistryServiceFactory(
-        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ),
+        rtl::OUString( "applicat.rdb"  ),
         sal_True );
 
     InitVCL( xMS );
@@ -120,7 +120,7 @@ class TestWindow : public Dialog
     public:
         TestWindow() : Dialog( (Window *) NULL )
         {
-            SetText( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CanvasBitmap test harness")) );
+            SetText( rtl::OUString("CanvasBitmap test harness") );
             SetSizePixel( Size( 1024, 1024 ) );
             EnablePaint( true );
             Show();
@@ -1033,7 +1033,7 @@ void Main()
 {
     TestWindow aWindow;
     aWindow.Execute();
-    aWindow.SetText( XubString( RTL_CONSTASCII_USTRINGPARAM( "VCL - canvasbitmaptest" ) ) );
+    aWindow.SetText( XubString( "VCL - canvasbitmaptest"  ) );
 
     Application::Execute();
 }
diff --git a/vcl/test/dndtest.cxx b/vcl/test/dndtest.cxx
index 20c0f1cb5fe4..d35e673fdc6e 100644
--- a/vcl/test/dndtest.cxx
+++ b/vcl/test/dndtest.cxx
@@ -137,7 +137,7 @@ public:
     {
         DataFlavor df;
 
-        df.MimeType = OUString(RTL_CONSTASCII_USTRINGPARAM("text/plain;charset=utf-16"));
+        df.MimeType = OUString("text/plain;charset=utf-16");
         df.DataType = getCppuType( static_cast < OUString * > ( 0 ) );
 
          m_aFlavorList[0] = df;
@@ -161,7 +161,7 @@ void MyApp::Main()
 
         osl_getCommandArg( n, &aArg.pData );
 
-        if( aArg.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("-r")), 2 ) == 0 )
+        if( aArg.compareTo( OUString("-r"), 2 ) == 0 )
         {
             if ( n + 1 < nmax )
                 osl_getCommandArg( ++n, &aRegistry.pData );
@@ -190,7 +190,7 @@ void MyApp::Main()
 
 
     MyWin aMainWin( NULL, WB_APP | WB_STDWORK );
-    aMainWin.SetText( XubString( RTL_CONSTASCII_USTRINGPARAM( "Drag And Drop - Workbench" ) ) );
+    aMainWin.SetText( XubString( "Drag And Drop - Workbench"  ) );
     aMainWin.Show();
 
     // test the clipboard code
@@ -208,7 +208,7 @@ void MyApp::Main()
 
     MyListBox aListBox( &aMainWin );
     aListBox.SetPosSizePixel( 10, 10, 100, 100 );
-    aListBox.InsertEntry( OUString(RTL_CONSTASCII_USTRINGPARAM("TestItem")));
+    aListBox.InsertEntry( OUString("TestItem"));
     aListBox.Show();
 
     Execute();
@@ -294,7 +294,7 @@ void SAL_CALL MyDragAndDropListener::dragGestureRecognized( const DragGestureEve
     printf( "XDragGestureListener::dragGestureRecognized called ( Window: %p, %" SAL_PRIdINT32 ", %" SAL_PRIdINT32 " ).\n", m_pWindow, dge.DragOriginX, dge.DragOriginY );
 
     Reference< XDragSource > xDragSource( dge.DragSource, UNO_QUERY );
-    xDragSource->startDrag( dge, -1, 0, 0, new StringTransferable( OUString(RTL_CONSTASCII_USTRINGPARAM("TestString")) ), this );
+    xDragSource->startDrag( dge, -1, 0, 0, new StringTransferable( OUString("TestString") ), this );
     printf( "XDragSource::startDrag returned.\n" );
 }
 
@@ -383,7 +383,7 @@ void SAL_CALL MyDragAndDropListener::disposing( const EventObject& ) throw(Runti
 // -----------------------------------------------------------------------
 
 MyInfoBox::MyInfoBox( Window* pParent ) : InfoBox( pParent,
-    OUString(RTL_CONSTASCII_USTRINGPARAM("dragging over this box should result in another window id in the drag log.")) )
+    OUString("dragging over this box should result in another window id in the drag log.") )
 {
     Reference< XDropTargetListener > xListener = new MyDragAndDropListener( this );
 
-- 
cgit