From 5d7bf132bda6e870e5333675c1897960d2c0134c Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Thu, 31 Oct 2013 15:43:06 +0200
Subject: remove unnecessary use of OUString constructor in TOOLKIT module

Change-Id: I0cc8c507ede20d5db1942b75e0c4b660dcd66c97
---
 toolkit/source/awt/vclxaccessiblecomponent.cxx |  2 +-
 toolkit/source/awt/vclxwindow1.cxx             |  4 ++--
 toolkit/source/controls/roadmapentry.cxx       |  2 +-
 toolkit/source/controls/unocontrol.cxx         |  2 +-
 toolkit/source/controls/unocontrols.cxx        | 10 +++++-----
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'toolkit')

diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index 341d829d67f7..e1be4c15f190 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -103,7 +103,7 @@ sal_Bool VCLXAccessibleComponent::supportsService( const OUString& rServiceName
 uno::Sequence< OUString > VCLXAccessibleComponent::getSupportedServiceNames() throw (uno::RuntimeException)
 {
     uno::Sequence< OUString > aNames(1);
-    aNames[0] = OUString("com.sun.star.awt.AccessibleWindow");
+    aNames[0] = "com.sun.star.awt.AccessibleWindow";
     return aNames;
 }
 
diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx
index 12022d13cff5..9476b37f7df9 100644
--- a/toolkit/source/awt/vclxwindow1.cxx
+++ b/toolkit/source/awt/vclxwindow1.cxx
@@ -43,7 +43,7 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle )
     if ( pWindow->GetType() != WINDOW_WORKWINDOW )
     {
         com::sun::star::uno::Exception aException;
-        aException.Message = OUString("not a work window");
+        aException.Message = "not a work window";
         throw aException;
     }
 
@@ -73,7 +73,7 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle )
     if( bThrow )
     {
         com::sun::star::uno::Exception aException;
-        aException.Message = OUString("incorrect window handle type");
+        aException.Message = "incorrect window handle type";
         throw aException;
     }
     // create system parent data
diff --git a/toolkit/source/controls/roadmapentry.cxx b/toolkit/source/controls/roadmapentry.cxx
index 4bf6a48272b0..e636552e628c 100644
--- a/toolkit/source/controls/roadmapentry.cxx
+++ b/toolkit/source/controls/roadmapentry.cxx
@@ -93,7 +93,7 @@ sal_Bool SAL_CALL ORoadmapEntry::supportsService( const OUString& ServiceName )
 {
     ::com::sun::star::uno::Sequence< OUString > aRet(1);
     OUString* pArray = aRet.getArray();
-    pArray[0] = OUString("com.sun.star.awt.RoadmapItem");
+    pArray[0] = "com.sun.star.awt.RoadmapItem";
     return aRet;
 }
 //--------------------------------------------------------------------------
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index 3830c24285fd..f597c6457dfb 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -1090,7 +1090,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
     if ( !mxModel.is() )
     {
         RuntimeException aException;
-        aException.Message = OUString("createPeer: no model!");
+        aException.Message = "createPeer: no model!";
         aException.Context = (XAggregation*)(::cppu::OWeakAggObject*)this;
         throw( aException );
     }
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index e2503cfc2001..3a4c59ab4af2 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -107,7 +107,7 @@ ImageHelper::getGraphicFromURL_nothrow( const OUString& _rURL )
         uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
         uno::Reference< graphic::XGraphicProvider > xProvider( graphic::GraphicProvider::create(xContext) );
         uno::Sequence< beans::PropertyValue > aMediaProperties(1);
-        aMediaProperties[0].Name = OUString( "URL" );
+        aMediaProperties[0].Name = "URL";
         aMediaProperties[0].Value <<= _rURL;
         xGraphic = xProvider->queryGraphic( aMediaProperties );
     }
@@ -221,7 +221,7 @@ OUString UnoEditControl::GetComponentServiceName()
     uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_MULTILINE ) );
     sal_Bool b = sal_Bool();
     if ( ( aVal >>= b ) && b )
-        sName= OUString("MultiLineEdit");
+        sName = "MultiLineEdit";
 
     return sName;
 }
@@ -711,11 +711,11 @@ OUString UnoButtonControl::GetComponentServiceName()
         // Use PushButtonType later when available...
         switch ( n )
         {
-            case 1 /*PushButtonType::OK*/:      aName= OUString("okbutton");
+            case 1 /*PushButtonType::OK*/:      aName = "okbutton";
                                                 break;
-            case 2 /*PushButtonType::CANCEL*/:  aName= OUString("cancelbutton");
+            case 2 /*PushButtonType::CANCEL*/:  aName = "cancelbutton";
                                                 break;
-            case 3 /*PushButtonType::HELP*/:    aName= OUString("helpbutton");
+            case 3 /*PushButtonType::HELP*/:    aName = "helpbutton";
                                                 break;
             default:
             {
-- 
cgit