convert remaining String in SC to OUString

Change-Id: I3ee8c3b59bf9d6ef6516f1da64cbe5f0b35af2d0

9 files changed, 25 insertions, 25 deletions

diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index cc0001c24810..7e482d28a0b8 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -545,7 +545,7 @@ IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox*, pLb )
         }
         else
         {
-            pEd->SetText( EMPTY_STRING );
+            pEd->SetText( EMPTY_OUSTRING );
             if ( pEd == pEdDataArea )
                 pBtnAdd->Enable();
         }
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 6e029f13fe62..8340ff66d880 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -320,7 +320,7 @@ void ScDbNameDlg::UpdateNames()
     m_pEdName->SetUpdateMode( false );
     //-----------------------------------------------------------
     m_pEdName->Clear();
-    m_pEdAssign->SetText( EMPTY_STRING );
+    m_pEdAssign->SetText( EMPTY_OUSTRING );
 
     if (!rDBs.empty())
     {
@@ -459,12 +459,12 @@ IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl)
 
                 UpdateNames();
 
-                m_pEdName->SetText( EMPTY_STRING );
+                m_pEdName->SetText( EMPTY_OUSTRING );
                 m_pEdName->GrabFocus();
                 m_pBtnAdd->SetText( aStrAdd );
                 m_pBtnAdd->Disable();
                 m_pBtnRemove->Disable();
-                m_pEdAssign->SetText( EMPTY_STRING );
+                m_pEdAssign->SetText( EMPTY_OUSTRING );
                 m_pBtnHeader->Check( sal_True );       // Default: mit Spaltenkoepfen
                 m_pBtnDoSize->Check( false );
                 m_pBtnKeepFmt->Check( false );
@@ -538,12 +538,12 @@ IMPL_LINK_NOARG(ScDbNameDlg, RemoveBtnHdl)
 
             UpdateNames();
 
-            m_pEdName->SetText( EMPTY_STRING );
+            m_pEdName->SetText( EMPTY_OUSTRING );
             m_pEdName->GrabFocus();
             m_pBtnAdd->SetText( aStrAdd );
             m_pBtnAdd->Disable();
             m_pBtnRemove->Disable();
-            m_pEdAssign->SetText( EMPTY_STRING );
+            m_pEdAssign->SetText( EMPTY_OUSTRING );
             theCurArea = ScRange();
             m_pBtnHeader->Check( sal_True );       // Default: mit Spaltenkoepfen
             m_pBtnDoSize->Check( false );
diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx
index 00b4f6af2298..717867bad9c4 100644
--- a/sc/source/ui/dbgui/fieldwnd.cxx
+++ b/sc/source/ui/dbgui/fieldwnd.cxx
@@ -1421,7 +1421,7 @@ ScDPSelectFieldControl::ScDPSelectFieldControl(
         ScPivotLayoutDlg* pDialog, const ResId& rResId, FixedText* pCaption, const char* pcHelpId) :
     ScDPHorFieldControl(pDialog, rResId, pCaption, pcHelpId)
 {
-    SetName(String(ScResId(STR_SELECT)));
+    SetName(OUString(ScResId(STR_SELECT)));
 }
 
 ScDPSelectFieldControl::~ScDPSelectFieldControl()
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index a15613109b8c..da1394b23c0c 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -626,7 +626,7 @@ void ScFilterDlg::ClearValueList( size_t nList )
         pValList->Clear();
         pValList->InsertEntry( aStrNotEmpty, 0 );
         pValList->InsertEntry( aStrEmpty, 1 );
-        pValList->SetText( EMPTY_STRING );
+        pValList->SetText( EMPTY_OUSTRING );
     }
 }
 
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx
index 7e49508a8271..5f1e81b8da93 100644
--- a/sc/source/ui/dbgui/foptmgr.cxx
+++ b/sc/source/ui/dbgui/foptmgr.cxx
@@ -77,7 +77,7 @@ ScFilterOptionsMgr::~ScFilterOptionsMgr()
     sal_uInt16 i;
 
     for ( i=2; i<nEntries; i++ )
-        delete (String*)pLbCopyArea->GetEntryData( i );
+        delete (OUString*)pLbCopyArea->GetEntryData( i );
 }
 
 
@@ -131,7 +131,7 @@ void ScFilterOptionsMgr::Init()
 
         pBtnDestPers->Check( sal_True );         // beim Aufruf immer an
         pLbCopyArea->SelectEntryPos( 0 );
-        pEdCopyArea->SetText( EMPTY_STRING );
+        pEdCopyArea->SetText( EMPTY_OUSTRING );
 
         /*
          * Ueberpruefen, ob es sich bei dem uebergebenen
@@ -193,7 +193,7 @@ void ScFilterOptionsMgr::Init()
         else
         {
             pBtnCopyResult->Check( false );
-            pEdCopyArea->SetText( EMPTY_STRING );
+            pEdCopyArea->SetText( EMPTY_OUSTRING );
             pLbCopyArea->Disable();
             pEdCopyArea->Disable();
             pRbCopyArea->Disable();
@@ -201,7 +201,7 @@ void ScFilterOptionsMgr::Init()
         }
     }
     else
-        pEdCopyArea->SetText( EMPTY_STRING );
+        pEdCopyArea->SetText( EMPTY_OUSTRING );
 }
 
 //----------------------------------------------------------------------------
@@ -232,7 +232,7 @@ IMPL_LINK( ScFilterOptionsMgr, LbAreaSelHdl, ListBox*, pLb )
         sal_uInt16 nSelPos = pLbCopyArea->GetSelectEntryPos();
 
         if ( nSelPos > 0 )
-            aString = *(String*)pLbCopyArea->GetEntryData( nSelPos );
+            aString = *(OUString*)pLbCopyArea->GetEntryData( nSelPos );
 
         pEdCopyArea->SetText( aString );
     }
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index edcf8bff8f3a..fbb46bfbe48c 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -187,7 +187,7 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet )
     }
     else
     {
-        aFtDbArea.SetText( EMPTY_STRING );
+        aFtDbArea.SetText( EMPTY_OUSTRING );
     }
 
     // Feldlisten einlesen und Eintraege selektieren:
@@ -220,7 +220,7 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet )
             aFieldLbArr[i]->SelectEntryPos( 0 ); // "keiner" selektieren
             aCondLbArr [i]->SelectEntryPos( 0 ); // "=" selektieren
             UpdateValueList( static_cast<sal_uInt16>(i) );
-            aValueEdArr[i]->SetText( EMPTY_STRING );
+            aValueEdArr[i]->SetText( EMPTY_OUSTRING );
         }
         aValueEdArr[i]->SetModifyHdl( LINK( this, ScPivotFilterDlg, ValModifyHdl ) );
     }
@@ -361,7 +361,7 @@ void ScPivotFilterDlg::ClearValueList( sal_uInt16 nList )
         pValList->Clear();
         pValList->InsertEntry( aStrNotEmpty, 0 );
         pValList->InsertEntry( aStrEmpty, 1 );
-        pValList->SetText( EMPTY_STRING );
+        pValList->SetText( EMPTY_OUSTRING );
     }
 }
 
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index 5dc381a86c16..c92b71a4ed1d 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -137,7 +137,7 @@ void ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet )
     pViewData   = rQueryItem.GetViewData();
     pDoc        = pViewData ? pViewData->GetDocument()  : NULL;
 
-    pEdFilterArea->SetText( EMPTY_STRING );      // may be overwritten below
+    pEdFilterArea->SetText( EMPTY_OUSTRING );      // may be overwritten below
 
     if ( pViewData && pDoc )
     {
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 0dfd8fccb84d..be013f7360a1 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -614,7 +614,7 @@ void ScTabPageSortOptions::Init()
         }
 
         m_pLbOutPos->SelectEntryPos( 0 );
-        m_pEdOutPos->SetText( EMPTY_STRING );
+        m_pEdOutPos->SetText( EMPTY_OUSTRING );
 
         // Check whether the field that is passed on is a database field:
 
@@ -724,7 +724,7 @@ void ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ )
         m_pBtnCopyResult->Check( false );
         m_pLbOutPos->Disable();
         m_pEdOutPos->Disable();
-        m_pEdOutPos->SetText( EMPTY_STRING );
+        m_pEdOutPos->SetText( EMPTY_OUSTRING );
     }
 }
 
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 0085edcb1bf2..534ff443c760 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -455,14 +455,14 @@ void ScTPValidationValue::SetFirstFormula( const OUString& rFmlaStr )
         lclGetStringListFromFormula( aStringList, rFmlaStr, mcFmlaSep ) )
     {
         maEdList.SetText( aStringList );
-        maEdMin.SetText( EMPTY_STRING );
+        maEdMin.SetText( EMPTY_OUSTRING );
         // change validation mode to string list
         maLbAllow.SelectEntryPos( SC_VALIDDLG_ALLOW_LIST );
     }
     else
     {
         maEdMin.SetText( rFmlaStr );
-        maEdList.SetText( EMPTY_STRING );
+        maEdList.SetText( EMPTY_OUSTRING );
     }
 }
 
@@ -738,12 +738,12 @@ void ScTPValidationHelp::Reset( const SfxItemSet& rArgSet )
     if ( rArgSet.GetItemState( FID_VALID_HELPTITLE, sal_True, &pItem ) == SFX_ITEM_SET )
         pEdtTitle->SetText( ((const SfxStringItem*)pItem)->GetValue() );
     else
-        pEdtTitle->SetText( EMPTY_STRING );
+        pEdtTitle->SetText( EMPTY_OUSTRING );
 
     if ( rArgSet.GetItemState( FID_VALID_HELPTEXT, sal_True, &pItem ) == SFX_ITEM_SET )
         pEdInputHelp->SetText( ((const SfxStringItem*)pItem)->GetValue() );
     else
-        pEdInputHelp->SetText( EMPTY_STRING );
+        pEdInputHelp->SetText( EMPTY_OUSTRING );
 }
 
 // -----------------------------------------------------------------------
@@ -832,12 +832,12 @@ void ScTPValidationError::Reset( const SfxItemSet& rArgSet )
     if ( rArgSet.GetItemState( FID_VALID_ERRTITLE, sal_True, &pItem ) == SFX_ITEM_SET )
         m_pEdtTitle->SetText( ((const SfxStringItem*)pItem)->GetValue() );
     else
-        m_pEdtTitle->SetText( EMPTY_STRING );
+        m_pEdtTitle->SetText( EMPTY_OUSTRING );
 
     if ( rArgSet.GetItemState( FID_VALID_ERRTEXT, sal_True, &pItem ) == SFX_ITEM_SET )
         m_pEdError->SetText( ((const SfxStringItem*)pItem)->GetValue() );
     else
-        m_pEdError->SetText( EMPTY_STRING );
+        m_pEdError->SetText( EMPTY_OUSTRING );
 
     SelectActionHdl( NULL );
 }