convert svtools/source/uno/* from String to OUString

Change-Id: I40e50b3d2e659c30a3456aab17a45f5e79365bfd

6 files changed, 26 insertions, 28 deletions

diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx
index 7f0af4f1348e..ca99192f9fcd 100644
--- a/svtools/source/table/gridtablerenderer.cxx
+++ b/svtools/source/table/gridtablerenderer.cxx
@@ -250,7 +250,7 @@ namespace svt { namespace table
     {
         _rDevice.Push( PUSH_LINECOLOR);
 
-        String sHeaderText;
+        OUString sHeaderText;
         PColumnModel const pColumn = m_pImpl->rModel.getColumnModel( _nCol );
         DBG_ASSERT( !!pColumn, "GridTableRenderer::PaintColumnHeader: invalid column model object!" );
         if ( !!pColumn )
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index e3e0af5ef953..befd57b336d2 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -182,7 +182,7 @@ bool OGenericUnoDialog::impl_ensureDialog_lck()
         pParent = pImplementation->GetWindow();
 
     // the title
-    String sTitle = m_sTitle;
+    OUString sTitle = m_sTitle;
 
     Dialog* pDialog = createDialog( pParent );
     OSL_ENSURE( pDialog, "OGenericUnoDialog::impl_ensureDialog_lck: createDialog returned nonsense!" );
diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx
index 2f6fbba437b5..d7c700aeb4f0 100644
--- a/svtools/source/uno/statusbarcontroller.cxx
+++ b/svtools/source/uno/statusbarcontroller.cxx
@@ -294,7 +294,7 @@ throw ( RuntimeException )
         if ( Event.State >>= aStrValue )
             pStatusBar->SetItemText( m_nID, aStrValue );
         else if ( !Event.State.hasValue() )
-            pStatusBar->SetItemText( m_nID, String() );
+            pStatusBar->SetItemText( m_nID, "" );
     }
 }
 
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index b9364c4cc606..465a38e044ee 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -808,7 +808,7 @@ bool ToolboxController::getToolboxId( sal_uInt16& rItemId, ToolBox** ppToolBox )
         for ( sal_uInt16 nPos = 0; nPos < nCount; ++nPos )
         {
             const sal_uInt16 nItemId = pToolBox->GetItemId( nPos );
-            if ( pToolBox->GetItemCommand( nItemId ) == String( m_aCommandURL ) )
+            if ( pToolBox->GetItemCommand( nItemId ) == m_aCommandURL )
             {
                 m_nToolBoxId = nItemId;
                 break;
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index bc434ae10003..855ecb491c16 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -62,8 +62,8 @@ extern "C" {
 SAL_DLLPUBLIC_EXPORT Window* CreateWindow( VCLXWindow** ppNewComp, const ::com::sun::star::awt::WindowDescriptor* pDescriptor, Window* pParent, WinBits nWinBits )
 {
     Window* pWindow = NULL;
-    String aServiceName( pDescriptor->WindowServiceName );
-    if ( aServiceName.EqualsIgnoreCaseAscii( "MultiLineEdit" ) )
+    OUString aServiceName( pDescriptor->WindowServiceName );
+    if ( aServiceName.equalsIgnoreAsciiCaseAscii( "MultiLineEdit" ) )
     {
         if ( pParent )
         {
@@ -77,7 +77,7 @@ SAL_DLLPUBLIC_EXPORT Window* CreateWindow( VCLXWindow** ppNewComp, const ::com::
             return NULL;
         }
     }
-    else if ( aServiceName.EqualsIgnoreCaseAscii( "FileControl" ) )
+    else if ( aServiceName.equalsIgnoreAsciiCaseAscii( "FileControl" ) )
     {
         if ( pParent )
         {
@@ -90,22 +90,22 @@ SAL_DLLPUBLIC_EXPORT Window* CreateWindow( VCLXWindow** ppNewComp, const ::com::
             return NULL;
         }
     }
-    else if (aServiceName.EqualsIgnoreCaseAscii("FormattedField") )
+    else if (aServiceName.equalsIgnoreAsciiCaseAscii("FormattedField") )
     {
         pWindow = new FormattedField( pParent, nWinBits );
         *ppNewComp = new SVTXFormattedField;
     }
-    else if (aServiceName.EqualsIgnoreCaseAscii("NumericField") )
+    else if (aServiceName.equalsIgnoreAsciiCaseAscii("NumericField") )
     {
         pWindow = new DoubleNumericField( pParent, nWinBits );
         *ppNewComp = new SVTXNumericField;
     }
-    else if (aServiceName.EqualsIgnoreCaseAscii("LongCurrencyField") )
+    else if (aServiceName.equalsIgnoreAsciiCaseAscii("LongCurrencyField") )
     {
         pWindow = new DoubleCurrencyField( pParent, nWinBits );
         *ppNewComp = new SVTXCurrencyField;
     }
-    else if (aServiceName.EqualsIgnoreCaseAscii("datefield") )
+    else if (aServiceName.equalsIgnoreAsciiCaseAscii("datefield") )
     {
         pWindow = new CalendarField( pParent, nWinBits);
         static_cast<CalendarField*>(pWindow)->EnableToday();
@@ -114,12 +114,12 @@ SAL_DLLPUBLIC_EXPORT Window* CreateWindow( VCLXWindow** ppNewComp, const ::com::
         *ppNewComp = new SVTXDateField;
         ((VCLXFormattedSpinField*)*ppNewComp)->SetFormatter( (FormatterBase*)(DateField*)pWindow );
     }
-    else if (aServiceName.EqualsIgnoreCaseAscii("roadmap") )
+    else if (aServiceName.equalsIgnoreAsciiCaseAscii("roadmap") )
     {
         pWindow = new ::svt::ORoadmap( pParent, WB_TABSTOP );
         *ppNewComp = new SVTXRoadmap;
     }
-    else if ( aServiceName.EqualsIgnoreCaseAscii( "ProgressBar" ) )
+    else if ( aServiceName.equalsIgnoreAsciiCaseAscii( "ProgressBar" ) )
     {
         if ( pParent )
         {
@@ -132,13 +132,13 @@ SAL_DLLPUBLIC_EXPORT Window* CreateWindow( VCLXWindow** ppNewComp, const ::com::
             return NULL;
         }
     }
-    else if ( aServiceName.EqualsIgnoreCaseAscii( "Tree" ) )
+    else if ( aServiceName.equalsIgnoreAsciiCaseAscii( "Tree" ) )
     {
         TreeControlPeer* pPeer = new TreeControlPeer;
         *ppNewComp = pPeer;
         pWindow = pPeer->createVclControl( pParent, nWinBits );
     }
-    else if ( aServiceName.EqualsIgnoreCaseAscii( "FixedHyperlink" ) )
+    else if ( aServiceName.equalsIgnoreAsciiCaseAscii( "FixedHyperlink" ) )
     {
         if ( pParent )
         {
@@ -151,7 +151,7 @@ SAL_DLLPUBLIC_EXPORT Window* CreateWindow( VCLXWindow** ppNewComp, const ::com::
             return NULL;
         }
     }
-    else if ( aServiceName.EqualsIgnoreCaseAscii( "Grid" ) )
+    else if ( aServiceName.equalsIgnoreAsciiCaseAscii( "Grid" ) )
     {
         if ( pParent )
         {
@@ -1060,7 +1060,6 @@ void SVTXFormattedField::setProperty( const OUString& PropertyName, const ::com:
         {
             OUString aStr;
             rValue >>= aStr;
-            String sValue = aStr;
             if (pField->TreatingAsNumber())
             {
                 SvNumberFormatter* pFormatter = pField->GetFormatter();
@@ -1069,9 +1068,9 @@ void SVTXFormattedField::setProperty( const OUString& PropertyName, const ::com:
 
                 double dVal;
                 sal_uInt32 nTestFormat(0);
-                if (!pFormatter->IsNumberFormat(sValue, nTestFormat, dVal))
+                if (!pFormatter->IsNumberFormat(aStr, nTestFormat, dVal))
                     aReturn.clear();
-                aReturn <<=dVal;
+                aReturn <<= dVal;
             }
             else
                 aReturn <<= aStr;
@@ -1262,7 +1261,7 @@ void SVTXFormattedField::SetValue(const ::com::sun::star::uno::Any& rValue)
 
     if (!rValue.hasValue())
     {
-        pField->SetText(String());
+        pField->SetText("");
     }
     else
     {
@@ -1278,11 +1277,10 @@ void SVTXFormattedField::SetValue(const ::com::sun::star::uno::Any& rValue)
 
             OUString sText;
             rValue >>= sText;
-            String aStr( sText );
             if (!pField->TreatingAsNumber())
-                pField->SetTextFormatted(aStr);
+                pField->SetTextFormatted(sText);
             else
-                pField->SetTextValue(aStr);
+                pField->SetTextValue(sText);
         }
     }
 //  NotifyTextListeners();
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index d08a734e26f3..01e8b462e8c6 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -264,11 +264,11 @@ SvUnoImageMapObject::~SvUnoImageMapObject() throw()
 
 IMapObject* SvUnoImageMapObject::createIMapObject() const
 {
-    const String aURL( maURL );
-    const String aAltText( maAltText );
-    const String aDesc( maDesc );
-    const String aTarget( maTarget );
-    const String aName( maName );
+    const OUString aURL( maURL );
+    const OUString aAltText( maAltText );
+    const OUString aDesc( maDesc );
+    const OUString aTarget( maTarget );
+    const OUString aName( maName );
 
     IMapObject* pNewIMapObject;