convert FORMS modules from String to OUString

Change-Id: Iadb3638b03e1a9712553ea5e4c041493d4e1656a

7 files changed, 23 insertions, 23 deletions

diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index 2db7139db17e..5345b348fbcb 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -104,19 +104,19 @@ void OCurrencyModel::implConstruct()
             switch ( aLocaleInfo.getCurrPositiveFormat() )
             {
                 case 0: // $1
-                    sCurrencySymbol = String(aLocaleInfo.getCurrSymbol());
+                    sCurrencySymbol = aLocaleInfo.getCurrSymbol();
                     bPrependCurrencySymbol = sal_True;
                     break;
                 case 1: // 1$
-                    sCurrencySymbol = String(aLocaleInfo.getCurrSymbol());
+                    sCurrencySymbol = aLocaleInfo.getCurrSymbol();
                     bPrependCurrencySymbol = sal_False;
                     break;
                 case 2: // $ 1
-                    sCurrencySymbol = OUString(String(aLocaleInfo.getCurrSymbol())) + OUString(" ");
+                    sCurrencySymbol = aLocaleInfo.getCurrSymbol() + " ";
                     bPrependCurrencySymbol = sal_True;
                     break;
                 case 3: // 1 $
-                    sCurrencySymbol = OUString(" ") + OUString(String(aLocaleInfo.getCurrSymbol()));
+                    sCurrencySymbol = " " + aLocaleInfo.getCurrSymbol();
                     bPrependCurrencySymbol = sal_False;
                     break;
             }
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index 9716c532912b..1c1df4626a5c 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -535,7 +535,7 @@ namespace frm
                 {
                     // display the error and outta here
                     SQLContext aError;
-                    aError.Message = String( FRM_RES_STRING( RID_STR_SYNTAXERROR ) );
+                    aError.Message = FRM_RES_STRING( RID_STR_SYNTAXERROR );
                     aError.Details = sErrorMessage;
                     displayException( aError );
                     return sal_False;
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index 20689d368b52..cf9b27201de3 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -688,7 +688,7 @@ namespace frm
                 pImgProd->SetImage( sURL );
             else
                 // caution: the medium may be NULL if somebody gave us a invalid URL to work with
-                pImgProd->SetImage(String());
+                pImgProd->SetImage(OUString());
             m_bDownloading = sal_False;
             return;
         }
@@ -702,7 +702,7 @@ namespace frm
         }
         else
         {
-            pImgProd->SetImage(String());
+            pImgProd->SetImage(OUString());
             delete m_pMedium;
             m_pMedium = 0;
             m_bDownloading = sal_False;
@@ -715,7 +715,7 @@ namespace frm
         if (m_pMedium || rURL.isEmpty())
         {
             // Den Stream am Producer freigeben, bevor das Medium geloscht wird.
-            GetImageProducer()->SetImage(String());
+            GetImageProducer()->SetImage(OUString());
             delete m_pMedium;
             m_pMedium = NULL;
         }
diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx
index 6b045babb247..25f1b185e67b 100644
--- a/forms/source/richtext/richtextengine.cxx
+++ b/forms/source/richtext/richtextengine.cxx
@@ -59,8 +59,8 @@ namespace frm
 
         // defaults
         Font aFont = Application::GetSettings().GetStyleSettings().GetAppFont();
-        aFont.SetName( String( "Times New Roman" ) );
-        pPool->SetPoolDefaultItem( SvxFontItem( aFont.GetFamily(), aFont.GetName(), String(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO ) );
+        aFont.SetName( "Times New Roman" );
+        pPool->SetPoolDefaultItem( SvxFontItem( aFont.GetFamily(), aFont.GetName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO ) );
 
         // 12 pt font size
         MapMode aPointMapMode( MAP_POINT );
diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx
index 71a5c7e2cdc1..a039aa06c6f4 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -468,7 +468,7 @@ namespace frm
             {
                 m_pViewport->Push( PUSH_FONT );
                 m_pViewport->SetFont( m_pEngine->GetStandardFont(0) );
-                nFontWidth = m_pViewport->GetTextWidth( String( "x" ) );
+                nFontWidth = m_pViewport->GetTextWidth( "x" );
                 m_pViewport->Pop();
             }
             // ... is the scroll size for the horizontal scrollbar
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index 2f4349b247c6..c0e5828a83de 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -249,17 +249,17 @@ namespace frm
                     ErrCode nResult = aFP.Execute();
                     if ( nResult == 0 )
                     {
-                        String sFileName = aFP.GetPath();
+                        OUString sFileName = aFP.GetPath();
                         SvStream* pStream = ::utl::UcbStreamHelper::CreateStream(
                             sFileName, ( bLoad ? STREAM_READ : STREAM_WRITE | STREAM_TRUNC ) | STREAM_SHARE_DENYALL
                         );
                         if ( pStream )
                         {
                             EETextFormat eFormat = EE_FORMAT_XML;
-                            String sFilter = aFP.GetCurrentFilter();
+                            OUString sFilter = aFP.GetCurrentFilter();
                             for ( size_t i = 0; i < SAL_N_ELEMENTS( aExportFormats ); ++i )
                             {
-                                if ( sFilter.EqualsAscii( aExportFormats[i].pDescription ) )
+                                if ( sFilter.equalsAscii( aExportFormats[i].pDescription ) )
                                 {
                                     eFormat = aExportFormats[i].eFormat;
                                     break;
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index 4820154e5968..3b07018e178e 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -55,11 +55,11 @@ namespace frm
                 || ( _nFeatureId == LID_RECORD_FILLER );
         }
 
-        static String getLabelString( sal_uInt16 _nResId )
+        static OUString getLabelString( sal_uInt16 _nResId )
         {
-            String sLabel = OUString( " " );
-            sLabel += String( FRM_RES_STRING( _nResId ) );
-            sLabel += OUString( " " );
+            OUString sLabel( " " );
+            sLabel += FRM_RES_STRING( _nResId );
+            sLabel += " ";
             return sLabel;
         }
 
@@ -294,8 +294,8 @@ namespace frm
             {   // it's _not_ a separator
 
                 // insert the entry
-                m_pToolbar->InsertItem( pSupportedFeatures->nId, String(), pSupportedFeatures->bRepeat ? TIB_REPEAT : 0 );
-                m_pToolbar->SetQuickHelpText( pSupportedFeatures->nId, String() );  // TODO
+                m_pToolbar->InsertItem( pSupportedFeatures->nId, OUString(), pSupportedFeatures->bRepeat ? TIB_REPEAT : 0 );
+                m_pToolbar->SetQuickHelpText( pSupportedFeatures->nId, OUString() );  // TODO
 
                 if ( !isArtificialItem( pSupportedFeatures->nId ) )
                 {
@@ -622,7 +622,7 @@ namespace frm
     //---------------------------------------------------------------------
     void NavigationToolBar::adjustItemWindowWidth( sal_uInt16 _nItemId, Window* _pItemWindow, const void* /* _pParam */ ) const
     {
-        String sItemText;
+        OUString sItemText;
         switch ( _nItemId )
         {
         case LID_RECORD_LABEL:
@@ -634,11 +634,11 @@ namespace frm
             break;
 
         case FormFeature::MoveAbsolute:
-            sItemText = OUString( "12345678" );
+            sItemText = "12345678";
             break;
 
         case FormFeature::TotalRecords:
-            sItemText = OUString( "123456" );
+            sItemText = "123456";
             break;
         }