convert remaining String in SC to OUString

Change-Id: I3ee8c3b59bf9d6ef6516f1da64cbe5f0b35af2d0

52 files changed, 126 insertions, 127 deletions

diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index f73172d21770..f525455283db 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -1386,7 +1386,7 @@ void ScAccessibleDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
             {
                 mpTempAccEdit = new ScAccessibleEditObject(this, mpViewShell->GetViewData()->GetEditView(meSplitPos),
                     mpViewShell->GetWindowByPos(meSplitPos), GetCurrentCellName(),
-                    OUString(String(ScResId(STR_ACC_EDITLINE_DESCR))), ScAccessibleEditObject::CellInEditMode);
+                    OUString(ScResId(STR_ACC_EDITLINE_DESCR)), ScAccessibleEditObject::CellInEditMode);
                 uno::Reference<XAccessible> xAcc = mpTempAccEdit;
 
                 AddChild(xAcc, sal_True);
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index c35d3d6059b0..6e2baf472db3 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -313,7 +313,7 @@ static void lcl_Replace( EditView* pView, const OUString& rNewStr, const ESelect
 
         //  Dummy-InsertText fuer Update und Paint
         //  dafuer muss oben die Selektion aufgehoben werden (vor QuickInsertText)
-        pView->InsertText( EMPTY_STRING, false );
+        pView->InsertText( EMPTY_OUSTRING, false );
 
         xub_StrLen nLen = pEngine->GetTextLen(0);
         ESelection aSel( 0, nLen, 0, nLen );
@@ -1713,7 +1713,7 @@ void ScInputHandler::UpdateParenthesis()
                         pEngine->QuickSetAttribs( aSet, aSelOther );
 
                         //  Dummy-InsertText fuer Update und Paint (Selektion ist leer)
-                        pTableView->InsertText( EMPTY_STRING, false );
+                        pTableView->InsertText( EMPTY_OUSTRING, false );
 
                         bFound = true;
                     }
@@ -2873,7 +2873,7 @@ void ScInputHandler::CancelHandler()
         pExecuteSh->StopEditShell();
 
     aCursorPos.Set(MAXCOL+1,0,0);       // Flag, dass ungueltig
-    pEngine->SetText(String());
+    pEngine->SetText(OUString());
 
     if ( !pLastState && pExecuteSh )
         pExecuteSh->UpdateInputHandler( true );     // Status neu holen
@@ -3694,11 +3694,11 @@ IMPL_LINK( ScInputHandler, DelayTimer, Timer*, pTimer )
                 bInOwnChange = true;    // disable ModifyHdl (reset below)
 
                 pActiveViewSh = NULL;
-                pEngine->SetText( EMPTY_STRING );
+                pEngine->SetText( EMPTY_OUSTRING );
                 if ( pInputWin )
                 {
-                    pInputWin->SetPosString( EMPTY_STRING );
-                    pInputWin->SetTextString( EMPTY_STRING );
+                    pInputWin->SetPosString( EMPTY_OUSTRING );
+                    pInputWin->SetTextString( EMPTY_OUSTRING );
                     pInputWin->Disable();
                 }
 
@@ -3835,7 +3835,7 @@ EditView* ScInputHandler::GetFuncEditView()
             SetMode( SC_INPUT_TABLE );
             bCreatingFuncView = false;
             if ( pTableView )
-                pTableView->GetEditEngine()->SetText( EMPTY_STRING );
+                pTableView->GetEditEngine()->SetText( EMPTY_OUSTRING );
         }
         pView = pTableView;
     }
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index ca2f9ae65b81..f6488ebf0b87 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2009,8 +2009,8 @@ void ScTextWnd::ImplInitSettings()
 ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ScTextWnd::CreateAccessible()
 {
     return new ScAccessibleEditObject(GetAccessibleParentWindow()->GetAccessible(), NULL, this,
-        OUString(String(ScResId(STR_ACC_EDITLINE_NAME))),
-        OUString(String(ScResId(STR_ACC_EDITLINE_DESCR))), ScAccessibleEditObject::EditLine);
+        OUString(ScResId(STR_ACC_EDITLINE_NAME)),
+        OUString(ScResId(STR_ACC_EDITLINE_DESCR)), ScAccessibleEditObject::EditLine);
 }
 
 void ScTextWnd::InsertAccessibleTextData( ScAccessibleEditLineTextData& rTextData )
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 6512a873c429..b4398e570b79 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1578,7 +1578,7 @@ void ScModule::ActivateInputWindow( const OUString* pStrFormula, sal_Bool bMatri
             // Abbrechen
             if ( pWin )
             {
-                pWin->SetFuncString( EMPTY_STRING, false );
+                pWin->SetFuncString( EMPTY_OUSTRING, false );
                 // SetSumAssignMode wegen sal_False nicht noetig
             }
             pHdl->CancelHandler();
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 494204719505..ba7817c82232 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -836,7 +836,7 @@ AbstractScInsertTableDlg * ScAbstractDialogFactory_Impl::CreateScInsertTableDlg(
 }
 
 AbstractScSelEntryDlg * ScAbstractDialogFactory_Impl::CreateScSelEntryDlg ( Window* pParent,
-                                                        const std::vector<String> &rEntryList )
+                                                        const std::vector<OUString> &rEntryList )
 {
     ScSelEntryDlg * pDlg = new ScSelEntryDlg( pParent, rEntryList );
     return new AbstractScSelEntryDlg_Impl( pDlg );
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 49d328c71319..5dc7607e7acf 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -465,7 +465,7 @@ public:
         SCTAB nTabCount, bool bFromFile);
 
     virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent,
-                                                          const std::vector<String> &rEntryList );
+                                                          const std::vector<OUString> &rEntryList );
 
     virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg(Window* pParent);
 
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 );
 }
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index d40677192d13..5f1c8cbbc6d5 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -4075,13 +4075,13 @@ sal_Bool ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMa
         if ( pTokenArray )
         {
             pDoc->InsertMatrixFormula( nStartCol, nStartRow, nEndCol, nEndRow,
-                    aMark, EMPTY_STRING, pTokenArray, eGrammar);
+                    aMark, EMPTY_OUSTRING, pTokenArray, eGrammar);
         }
         else if ( pDoc->IsImportingXML() )
         {
             ScTokenArray* pCode = lcl_ScDocFunc_CreateTokenArrayXML( rString, rFormulaNmsp, eGrammar );
             pDoc->InsertMatrixFormula( nStartCol, nStartRow, nEndCol, nEndRow,
-                    aMark, EMPTY_STRING, pCode, eGrammar);
+                    aMark, EMPTY_OUSTRING, pCode, eGrammar);
             delete pCode;
             pDoc->IncXMLImportedFormulaCount( rString.getLength() );
         }
@@ -4091,7 +4091,7 @@ sal_Bool ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMa
             aComp.SetGrammar(eGrammar);
             ScTokenArray* pCode = aComp.CompileString( rString );
             pDoc->InsertMatrixFormula( nStartCol, nStartRow, nEndCol, nEndRow,
-                    aMark, EMPTY_STRING, pCode, eGrammar);
+                    aMark, EMPTY_OUSTRING, pCode, eGrammar);
             delete pCode;
         }
         else
@@ -5207,11 +5207,11 @@ sal_Bool ScDocFunc::ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNe
         if ( DeleteContents( aMark, IDF_CONTENTS, sal_True, bApi ) )
         {
             // GRAM_PODF_A1 for API compatibility.
-            bRet = EnterMatrix( aNewRange, &aMark, NULL, aFormula, bApi, false, EMPTY_STRING, formula::FormulaGrammar::GRAM_PODF_A1 );
+            bRet = EnterMatrix( aNewRange, &aMark, NULL, aFormula, bApi, false, EMPTY_OUSTRING, formula::FormulaGrammar::GRAM_PODF_A1 );
             if (!bRet)
             {
                 //  versuchen, alten Zustand wiederherzustellen
-                EnterMatrix( rOldRange, &aMark, NULL, aFormula, bApi, false, EMPTY_STRING, formula::FormulaGrammar::GRAM_PODF_A1 );
+                EnterMatrix( rOldRange, &aMark, NULL, aFormula, bApi, false, EMPTY_OUSTRING, formula::FormulaGrammar::GRAM_PODF_A1 );
             }
         }
 
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 433e6af649a9..3d785c612a22 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -1025,7 +1025,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
                                     aValue = aValue.copy(1, aValue.getLength()-2); // remove the 1st and last characters.
                                     GetDocFunc().EnterMatrix( aSourceRange,
                                         NULL, NULL, aValue, false, false,
-                                        EMPTY_STRING, formula::FormulaGrammar::GRAM_DEFAULT );
+                                        EMPTY_OUSTRING, formula::FormulaGrammar::GRAM_DEFAULT );
                                 }
                                 break;
                                 case MM_REFERENCE :     // do nothing
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 6ed09cf39c3c..66e7ba518d9f 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -869,7 +869,7 @@ OUString ScExternalRefCache::getTableName(sal_uInt16 nFileId, size_t nCacheId) c
     if( DocItem* pDoc = getDocItem( nFileId ) )
         if( nCacheId < pDoc->maTableNames.size() )
             return pDoc->maTableNames[ nCacheId ].maRealName;
-    return EMPTY_STRING;
+    return EMPTY_OUSTRING;
 }
 
 void ScExternalRefCache::getAllTableNames(sal_uInt16 nFileId, vector<OUString>& rTabNames) const
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 3392f06d303a..85868ecf8708 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -1217,7 +1217,7 @@ static OUString lcl_GetFixed( const OUString& rLine, sal_Int32 nStart, sal_Int32
     if (nNext > nLen)
         nNext = nLen;
     if ( nNext <= nStart )
-        return EMPTY_STRING;
+        return EMPTY_OUSTRING;
 
     const sal_Unicode* pStr = rLine.getStr();
 
@@ -1823,7 +1823,7 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm )
                                 ScMarkData aMark;
                                 aMark.SelectTable( aPos.Tab(), true );
                                 pDoc->InsertMatrixFormula( nCol, nRow, nRefCol,
-                                    nRefRow, aMark, EMPTY_STRING, pCode );
+                                    nRefRow, aMark, EMPTY_OUSTRING, pCode );
                             }
                             else
                             {
diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index 8b52e3799461..9085f08df574 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -440,7 +440,7 @@ OUString ScDocumentLoader::GetOptions( SfxMedium& rMedium )
     if ( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) )
         return ((const SfxStringItem*)pItem)->GetValue();
 
-    return EMPTY_STRING;
+    return EMPTY_OUSTRING;
 }
 
 bool ScDocumentLoader::GetFilterName( const OUString& rFileName,
@@ -590,7 +590,7 @@ OUString ScDocumentLoader::GetTitle() const
     if ( pDocShell )
         return pDocShell->GetTitle();
     else
-        return EMPTY_STRING;
+        return EMPTY_OUSTRING;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx
index a3f5445d5f49..fcff116d6aa3 100644
--- a/sc/source/ui/drawfunc/drtxtob1.cxx
+++ b/sc/source/ui/drawfunc/drtxtob1.cxx
@@ -115,8 +115,8 @@ void ScDrawTextObjectBar::ExecutePasteContents( SfxRequest & /* rReq */ )
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
     SfxAbstractPasteDialog* pDlg = pFact->CreatePasteDialog( pViewData->GetDialogParent() );
 
-    pDlg->Insert( SOT_FORMAT_STRING, EMPTY_STRING );
-    pDlg->Insert( SOT_FORMAT_RTF,    EMPTY_STRING );
+    pDlg->Insert( SOT_FORMAT_STRING, EMPTY_OUSTRING );
+    pDlg->Insert( SOT_FORMAT_RTF,    EMPTY_OUSTRING );
 
     TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pViewData->GetActiveWin() ) );
 
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 6bec2ebc4071..3b8e8fd67843 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -555,7 +555,7 @@ void ScFunctionDockWin::SetMyHeightToBo(Size &aNewSize)
 
 void ScFunctionDockWin::SetDescription()
 {
-    aFiFuncDesc.SetText( EMPTY_STRING );
+    aFiFuncDesc.SetText( EMPTY_OUSTRING );
     const ScFuncDesc* pDesc =
              (const ScFuncDesc*)pAllFuncList->GetEntryData(
                     pAllFuncList->GetSelectEntryPos() );
diff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxx
index 6d749ae1febc..d2c093df81ab 100644
--- a/sc/source/ui/inc/lbseldlg.hxx
+++ b/sc/source/ui/inc/lbseldlg.hxx
@@ -39,7 +39,7 @@ private:
     DECL_LINK( DblClkHdl, void * );
 
 public:
-    ScSelEntryDlg(Window* pParent, const std::vector<String> &rEntryList);
+    ScSelEntryDlg(Window* pParent, const std::vector<OUString> &rEntryList);
 
     OUString GetSelectEntry() const;
 };
diff --git a/sc/source/ui/inc/redcom.hxx b/sc/source/ui/inc/redcom.hxx
index 21446a23cef8..dd48d92d8fc8 100644
--- a/sc/source/ui/inc/redcom.hxx
+++ b/sc/source/ui/inc/redcom.hxx
@@ -31,7 +31,7 @@ private:
 
     ScChangeAction  *pChangeAction;
     ScDocShell      *pDocShell;
-    String          aComment;
+    OUString        aComment;
     AbstractSvxPostItDialog* pDlg;
 
     DECL_LINK( PrevHdl, AbstractSvxPostItDialog* );
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index 0ad0a90d840f..adce6ab0310d 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -181,8 +181,8 @@ void ScColRowNameRangesDlg::Init()
     {
         pBtnColHead->Check( sal_True );
         pBtnRowHead->Check( false );
-        pEdAssign->SetText( EMPTY_STRING );
-        pEdAssign2->SetText( EMPTY_STRING );
+        pEdAssign->SetText( EMPTY_OUSTRING );
+        pEdAssign2->SetText( EMPTY_OUSTRING );
     }
 
     pLbRange->SetBorderStyle( WINDOW_BORDER_MONO );
@@ -279,13 +279,13 @@ void ScColRowNameRangesDlg::SetColRowData( const ScRange& rLabelRange,sal_Bool b
 
         if(bRef)
         {
-            pEdAssign->SetRefString( EMPTY_STRING );
-            pEdAssign2->SetRefString( EMPTY_STRING );
+            pEdAssign->SetRefString( EMPTY_OUSTRING );
+            pEdAssign2->SetRefString( EMPTY_OUSTRING );
         }
         else
         {
-            pEdAssign->SetText( EMPTY_STRING );
-            pEdAssign2->SetText( EMPTY_STRING );
+            pEdAssign->SetText( EMPTY_OUSTRING );
+            pEdAssign2->SetText( EMPTY_OUSTRING );
         }
 
         pBtnColHead->Disable();
@@ -481,7 +481,7 @@ void ScColRowNameRangesDlg::UpdateNames()
     //-----------------------------------------------------------
     pLbRange->Clear();
     aRangeMap.clear();
-    pEdAssign->SetText( EMPTY_STRING );
+    pEdAssign->SetText( EMPTY_OUSTRING );
 
     size_t nCount, j;
     sal_uInt16 nPos; //@008 Hilfsvariable q eingefuegt
@@ -778,10 +778,10 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl)
             pEdAssign->GrabFocus();
             pBtnAdd->Disable();
             pBtnRemove->Disable();
-            pEdAssign->SetText( EMPTY_STRING );
+            pEdAssign->SetText( EMPTY_OUSTRING );
             pBtnColHead->Check( sal_True );
             pBtnRowHead->Check( false );
-            pEdAssign2->SetText( EMPTY_STRING );
+            pEdAssign2->SetText( EMPTY_OUSTRING );
             theCurArea = ScRange();
             theCurData = theCurArea;
             Range1SelectHdl( 0 );
@@ -864,11 +864,11 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl)
             pLbRange->GrabFocus();
             pBtnAdd->Disable();
             pBtnRemove->Disable();
-            pEdAssign->SetText( EMPTY_STRING );
+            pEdAssign->SetText( EMPTY_OUSTRING );
             theCurArea = theCurData = ScRange();
             pBtnColHead->Check( sal_True );
             pBtnRowHead->Check( false );
-            pEdAssign2->SetText( EMPTY_STRING );
+            pEdAssign2->SetText( EMPTY_OUSTRING );
             Range1SelectHdl( 0 );
         }
     }
diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx
index 43ed37c67f09..62fcaafa7187 100644
--- a/sc/source/ui/miscdlgs/datafdlg.cxx
+++ b/sc/source/ui/miscdlgs/datafdlg.cxx
@@ -215,7 +215,7 @@ void ScDataFormDlg::FillCtrls(SCROW /*nCurrentRow*/)
                 maEdits[i].SetText(aFieldName);
             }
             else
-                maEdits[i].SetText(String());
+                maEdits[i].SetText(OUString());
         }
     }
 
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index 15333d4bd4dd..0ed012d27afc 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -379,7 +379,7 @@ IMPL_LINK( ScInsertTableDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg
                 pDocShTables = NULL;
 
                 FillTables_Impl( NULL );
-                m_pFtPath->SetText( EMPTY_STRING );
+                m_pFtPath->SetText( EMPTY_OUSTRING );
             }
         }
 
diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx
index 1708b2d44db4..2ed54313ccaf 100644
--- a/sc/source/ui/miscdlgs/lbseldlg.cxx
+++ b/sc/source/ui/miscdlgs/lbseldlg.cxx
@@ -32,7 +32,7 @@
 
 //==================================================================
 
-ScSelEntryDlg::ScSelEntryDlg(Window*  pParent, const std::vector<String> &rEntryList)
+ScSelEntryDlg::ScSelEntryDlg(Window*  pParent, const std::vector<OUString> &rEntryList)
     : ModalDialog(pParent, "SelectRangeDialog", "modules/scalc/ui/selectrange.ui")
 {
     get(m_pLb, "treeview");
@@ -40,7 +40,7 @@ ScSelEntryDlg::ScSelEntryDlg(Window*  pParent, const std::vector<String> &rEntry
     m_pLb->set_width_request(m_pLb->approximate_char_width() * 32);
     m_pLb->SetDoubleClickHdl( LINK( this, ScSelEntryDlg, DblClkHdl ) );
 
-    std::vector<String>::const_iterator pIter;
+    std::vector<OUString>::const_iterator pIter;
     for ( pIter = rEntryList.begin(); pIter != rEntryList.end(); ++pIter )
         m_pLb->InsertEntry(*pIter);
 
diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx
index 036a837dca24..830d0438e79d 100644
--- a/sc/source/ui/miscdlgs/linkarea.cxx
+++ b/sc/source/ui/miscdlgs/linkarea.cxx
@@ -171,7 +171,7 @@ void ScLinkedAreaDlg::InitFromOldLink( const OUString& rFile, const OUString& rF
         m_pCbUrl->SetText( pMed->GetName() );
     }
     else
-        m_pCbUrl->SetText( EMPTY_STRING );
+        m_pCbUrl->SetText( EMPTY_OUSTRING );
 
     UpdateSourceRanges();
 
@@ -251,7 +251,7 @@ IMPL_LINK( ScLinkedAreaDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg
             pSourceShell = NULL;
             aSourceRef.Clear();
 
-            m_pCbUrl->SetText( EMPTY_STRING );
+            m_pCbUrl->SetText( EMPTY_OUSTRING );
         }
     }
 
@@ -300,7 +300,7 @@ OUString ScLinkedAreaDlg::GetURL()
         SfxMedium* pMed = pSourceShell->GetMedium();
         return pMed->GetName();
     }
-    return EMPTY_STRING;
+    return EMPTY_OUSTRING;
 }
 
 OUString ScLinkedAreaDlg::GetFilter()
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index 97aed4629846..3c7dc4328cde 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -126,7 +126,7 @@ void ScMoveTableDlg::ResetRenameInput()
 
     if (!pEdTabName->IsEnabled())
     {
-        pEdTabName->SetText(String());
+        pEdTabName->SetText(OUString());
         return;
     }
 
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx
index a18066474b13..7abf7e98cc8f 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.cxx
+++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx
@@ -369,7 +369,7 @@ IMPL_LINK( ScRetypePassDlg, RetypeBtnHdl, PushButton*, pBtn )
         if (aDlg.IsRemovePassword())
         {
             // Remove password from this item.
-            pProtected->setPassword(String());
+            pProtected->setPassword(OUString());
         }
         else
         {
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 350765739b71..fa6c78b0ed5f 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -1168,12 +1168,12 @@ void ScContentTree::DoDrag()
                         switch ( nType )
                         {
                             case SC_CONTENT_TABLE:
-                                pScMod->SetDragLink( aDocName, aText, EMPTY_STRING );
+                                pScMod->SetDragLink( aDocName, aText, EMPTY_OUSTRING );
                                 bDoLinkTrans = true;
                                 break;
                             case SC_CONTENT_RANGENAME:
                             case SC_CONTENT_DBAREA:
-                                pScMod->SetDragLink( aDocName, EMPTY_STRING, aText );
+                                pScMod->SetDragLink( aDocName, EMPTY_OUSTRING, aText );
                                 bDoLinkTrans = true;
                                 break;
 
diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx
index 4b4fe03b417b..b62298c8c048 100644
--- a/sc/source/ui/navipi/scenwnd.cxx
+++ b/sc/source/ui/navipi/scenwnd.cxx
@@ -57,7 +57,7 @@ void ScScenarioListBox::UpdateEntries( const std::vector<OUString> &aNewEntryLis
     {
         case 0:
             // no scenarios in current sheet
-            mrParent.SetComment( EMPTY_STRING );
+            mrParent.SetComment( EMPTY_OUSTRING );
         break;
 
         case 1:
@@ -92,7 +92,7 @@ void ScScenarioListBox::UpdateEntries( const std::vector<OUString> &aNewEntryLis
             }
             SetUpdateMode( sal_True );
             SetNoSelection();
-            mrParent.SetComment( EMPTY_STRING );
+            mrParent.SetComment( EMPTY_OUSTRING );
         }
     }
 }
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index b66d768bf6cf..9235a0b344d1 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -523,7 +523,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
             mpLbLists->Disable();
             mpFtEntries->Enable();
             mpEdEntries->Enable();
-            mpEdEntries->SetText( EMPTY_STRING );
+            mpEdEntries->SetText( EMPTY_OUSTRING );
             mpEdEntries->GrabFocus();
             mpBtnAdd->Disable();
             mpBtnModify->Disable();
@@ -552,7 +552,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
             {
                 mpFtEntries->Disable();
                 mpEdEntries->Disable();
-                mpEdEntries->SetText( EMPTY_STRING );
+                mpEdEntries->SetText( EMPTY_OUSTRING );
                 mpBtnRemove->Disable();
             }
             mpBtnAdd->Disable();
@@ -674,7 +674,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
                     mpLbLists->Disable();
                     mpFtEntries->Disable();
                     mpEdEntries->Disable();
-                    mpEdEntries->SetText( EMPTY_STRING );
+                    mpEdEntries->SetText( EMPTY_OUSTRING );
                     mpBtnRemove->Disable();
                 }
             }
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index d4fda9d11b1d..d9d708365490 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -609,7 +609,7 @@ IMPL_LINK( ScPrintAreasDlg, Impl_SelectHdl, ListBox*, pLb )
 
     // fill edit field according to list box selection
     if( (nSelPos == 0) || (nSelPos == nAllSheetPos) )
-        pEd->SetText( EMPTY_STRING );
+        pEd->SetText( EMPTY_OUSTRING );
     else if( nSelPos == nUserDefPos && !pLb->IsTravelSelect() && pEd->GetText().isEmpty())
         pLb->SelectEntryPos( 0 );
     else if( nSelPos >= nFirstCustomPos )
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index a481c719ef02..8c0761fc83ba 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -325,8 +325,8 @@ void ScHFEditPage::SetSelectDefinedList()
                 aLeftEntry = pLeftObj->GetText(0);
                 aCenterEntry = pCenterObj->GetText(0);
                 aRightEntry = pRightObj->GetText(0);
-                if(aLeftEntry == EMPTY_STRING && aCenterEntry == EMPTY_STRING
-                    && aRightEntry == EMPTY_STRING)
+                if(aLeftEntry == EMPTY_OUSTRING && aCenterEntry == EMPTY_OUSTRING
+                    && aRightEntry == EMPTY_OUSTRING)
                 {
                     eSelectEntry = eNoneEntry;
                     bFound = true;
@@ -338,7 +338,7 @@ void ScHFEditPage::SetSelectDefinedList()
             {
                 aLeftEntry = pLeftObj->GetText(0);
                 aRightEntry = pRightObj->GetText(0);
-                if(aLeftEntry == EMPTY_STRING && aRightEntry == EMPTY_STRING)
+                if(aLeftEntry == EMPTY_OUSTRING && aRightEntry == EMPTY_OUSTRING)
                 {
                     if(IsPageEntry(m_pWndCenter->GetEditEngine(), pCenterObj.get()))
                     {
@@ -360,7 +360,7 @@ void ScHFEditPage::SetSelectDefinedList()
             {
                 aLeftEntry = pLeftObj->GetText(0);
                 aRightEntry = pRightObj->GetText(0);
-                if(aLeftEntry == EMPTY_STRING && aRightEntry == EMPTY_STRING)
+                if(aLeftEntry == EMPTY_OUSTRING && aRightEntry == EMPTY_OUSTRING)
                 {
                     if(pCenterObj->IsFieldObject())
                     {
@@ -403,8 +403,8 @@ void ScHFEditPage::SetSelectDefinedList()
             {
                 aLeftEntry = pLeftObj->GetText(0);
                 aRightEntry = pRightObj->GetText(0);
-                if(IsExtFileNameEntry(pCenterObj.get()) && aLeftEntry == EMPTY_STRING
-                    && aRightEntry == EMPTY_STRING)
+                if(IsExtFileNameEntry(pCenterObj.get()) && aLeftEntry == EMPTY_OUSTRING
+                    && aRightEntry == EMPTY_OUSTRING)
                 {
                     eSelectEntry = eExtFileNameEntry;
                     bFound = true;
@@ -428,7 +428,7 @@ void ScHFEditPage::SetSelectDefinedList()
             {
                 aLeftEntry = pLeftObj->GetText(0);
                 if(IsPageEntry(m_pWndCenter->GetEditEngine(), pCenterObj.get()) &&
-                    IsExtFileNameEntry(pRightObj.get()) && aLeftEntry == EMPTY_STRING)
+                    IsExtFileNameEntry(pRightObj.get()) && aLeftEntry == EMPTY_OUSTRING)
                 {
                     eSelectEntry = ePageExtFileNameEntry;
                     bFound = true;
@@ -646,7 +646,7 @@ void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling)
         case eExtFileNameEntry:
             ClearTextAreas();
             m_pWndCenter->InsertField( SvxFieldItem( SvxExtFileField(
-                EMPTY_STRING, SVXFILETYPE_VAR, SVXFILEFORMAT_FULLPATH ), EE_FEATURE_FIELD ) );
+                EMPTY_OUSTRING, SVXFILETYPE_VAR, SVXFILEFORMAT_FULLPATH ), EE_FEATURE_FIELD ) );
             if(!bTravelling)
                 m_pWndCenter->GrabFocus();
         break;
@@ -699,7 +699,7 @@ void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling)
             m_pWndCenter->GetEditEngine()->SetText(aPageEntry);
             m_pWndCenter->InsertField( SvxFieldItem(SvxPageField(), EE_FEATURE_FIELD) );
             m_pWndRight->InsertField( SvxFieldItem( SvxExtFileField(
-                EMPTY_STRING, SVXFILETYPE_VAR, SVXFILEFORMAT_FULLPATH ), EE_FEATURE_FIELD ) );
+                EMPTY_OUSTRING, SVXFILETYPE_VAR, SVXFILEFORMAT_FULLPATH ), EE_FEATURE_FIELD ) );
             if(!bTravelling)
                 m_pWndRight->GrabFocus();
         }
@@ -742,11 +742,11 @@ void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling)
 
 void ScHFEditPage::ClearTextAreas()
 {
-    m_pWndLeft->GetEditEngine()->SetText(EMPTY_STRING);
+    m_pWndLeft->GetEditEngine()->SetText(EMPTY_OUSTRING);
     m_pWndLeft->Invalidate();
-    m_pWndCenter->GetEditEngine()->SetText(EMPTY_STRING);
+    m_pWndCenter->GetEditEngine()->SetText(EMPTY_OUSTRING);
     m_pWndCenter->Invalidate();
-    m_pWndRight->GetEditEngine()->SetText(EMPTY_STRING);
+    m_pWndRight->GetEditEngine()->SetText(EMPTY_OUSTRING);
     m_pWndRight->Invalidate();
 }
 
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index 689be50f7e85..4b6dd3b79c4d 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -400,7 +400,7 @@ void AlignmentPropertyPanel::NotifyItemUpdate(
         else
         {
             mpMFLeftIndent->SetValue(0);
-            mpMFLeftIndent->SetText(String());
+            mpMFLeftIndent->SetText(OUString());
         }
         break;
     case FID_MERGE_TOGGLE:
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index d081d1f1abee..e16f8aee941b 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -5207,7 +5207,7 @@ void SAL_CALL ScCellRangeObj::setArrayTokens( const uno::Sequence<sheet::Formula
             // Actually GRAM_PODF_A1 is a don't-care here because of the token
             // array being set, it fits with other API compatibility grammars
             // though.
-            pDocSh->GetDocFunc().EnterMatrix( aRange, NULL, &aTokenArray, EMPTY_STRING, sal_True, sal_True, EMPTY_STRING, formula::FormulaGrammar::GRAM_PODF_A1 );
+            pDocSh->GetDocFunc().EnterMatrix( aRange, NULL, &aTokenArray, EMPTY_OUSTRING, sal_True, sal_True, EMPTY_OUSTRING, formula::FormulaGrammar::GRAM_PODF_A1 );
         }
         else
         {
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 401ee34a384a..9019cf048377 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -288,7 +288,7 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& l
     uno::Reference< XInputStream > xStream;
     uno::Reference< XContent > xContent;
     uno::Reference< XInteractionHandler > xInteraction;
-    String aURL;
+    OUString aURL;
     OUString sTemp;
     OUString aTypeName;            // a name describing the type (from MediaDescriptor, usually from flat detection)
     OUString aPreselectedFilterName;      // a name describing the filter to use (from MediaDescriptor, usually from UI action)
@@ -323,7 +323,7 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& l
             lDescriptor[nProperty].Value >>= sTemp;
             aURL = sTemp;
         }
-        else if( !aURL.Len() && lDescriptor[nProperty].Name == "FileName" )
+        else if( aURL.isEmpty() && lDescriptor[nProperty].Name == "FileName" )
         {
             lDescriptor[nProperty].Value >>= sTemp;
             aURL = sTemp;
@@ -375,11 +375,10 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& l
 
     const SfxFilter* pFilter = 0;
     OUString aPrefix = OUString( "private:factory/" );
-    if( aURL.Match( aPrefix ) == aPrefix.getLength() )
+    if( aURL.startsWith( aPrefix ) )
     {
-        OUString aPattern( aPrefix );
-        aPattern += "scalc";
-        if ( aURL.Match( aPattern ) >= aPattern.getLength() )
+        OUString aPattern = aPrefix + "scalc";
+        if ( aURL.startsWith( aPattern ) )
             pFilter = SfxFilter::GetDefaultFilterFromFactory( aURL );
     }
     else
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index e09e96be8a24..681a582279aa 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -2028,7 +2028,7 @@ ScVbaRange::setFormulaArray(const uno::Any& rFormula) throw (uno::RuntimeExcepti
     ScTokenArray aTokenArray;
     (void)ScTokenConversion::ConvertToTokenArray( *getScDocument(), aTokenArray, aTokens );
 
-    getScDocShell()->GetDocFunc().EnterMatrix( *getScRangeList()[0], NULL, &aTokenArray, OUString(), sal_True, sal_True, EMPTY_STRING, formula::FormulaGrammar::GRAM_PODF_A1 );
+    getScDocShell()->GetDocFunc().EnterMatrix( *getScRangeList()[0], NULL, &aTokenArray, OUString(), sal_True, sal_True, EMPTY_OUSTRING, formula::FormulaGrammar::GRAM_PODF_A1 );
 }
 
 OUString
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 2b6a835daa04..c6d3fdcf2871 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -707,7 +707,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
 
                     if ( pDBCol )
                     {
-                        std::vector<String> aList;
+                        std::vector<OUString> aList;
                         const ScDBCollection::NamedDBs& rDBs = pDBCol->getNamedDBs();
                         ScDBCollection::NamedDBs::const_iterator itr = rDBs.begin(), itrEnd = rDBs.end();
                         for (; itr != itrEnd; ++itr)
@@ -831,7 +831,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                                 sal_uInt32 nNumIndex = 0;
                                 double nVal;
                                 if (pDoc->GetFormatTable()->IsNumberFormat(aTemp1, nNumIndex, nVal))
-                                    aExpr1 =String( ::rtl::math::doubleToUString( nVal,
+                                    aExpr1 = OUString( ::rtl::math::doubleToUString( nVal,
                                             rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
                                             ScGlobal::pLocaleData->getNumDecimalSep()[0], sal_True));
                                 else
@@ -848,7 +848,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                                 sal_uInt32 nNumIndex = 0;
                                 double nVal;
                                 if (pDoc->GetFormatTable()->IsNumberFormat(aTemp2, nNumIndex, nVal))
-                                    aExpr2 =String( ::rtl::math::doubleToUString( nVal,
+                                    aExpr2 = OUString( ::rtl::math::doubleToUString( nVal,
                                             rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
                                             ScGlobal::pLocaleData->getNumDecimalSep()[0], sal_True));
                                 else
diff --git a/sc/source/ui/view/drawattr.cxx b/sc/source/ui/view/drawattr.cxx
index cb58d2af6c3f..296f9b7bdf2f 100644
--- a/sc/source/ui/view/drawattr.cxx
+++ b/sc/source/ui/view/drawattr.cxx
@@ -45,7 +45,7 @@ OUString SvxDrawToolItem::GetValueText( sal_uInt16 nVal ) const
         case 6  : p = "SVX_SNAP_DRAW_PIE"       ; break;
         case 7  : p = "SVX_SNAP_DRAW_CIRCLECUT" ; break;
         case 8  : p = "SVX_SNAP_DRAW_TEXT"      ; break;
-        default : return EMPTY_STRING;
+        default : return EMPTY_OUSTRING;
     }
     return OUString::createFromAscii( p );
 }
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 96b54df6d447..17ae3bb1a14c 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -274,8 +274,8 @@ void ScEditShell::Execute( SfxRequest& rReq )
                 sal_uLong nFormat = 0;
                 if ( pDlg )
                 {
-                    pDlg->Insert( SOT_FORMAT_STRING, EMPTY_STRING );
-                    pDlg->Insert( SOT_FORMAT_RTF,    EMPTY_STRING );
+                    pDlg->Insert( SOT_FORMAT_STRING, EMPTY_OUSTRING );
+                    pDlg->Insert( SOT_FORMAT_RTF,    EMPTY_OUSTRING );
 
                     TransferableDataHelper aDataHelper(
                         TransferableDataHelper::CreateFromSystemClipboard( pViewData->GetActiveWin() ) );
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index d4d88e434556..c08d00293347 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1054,7 +1054,7 @@ void ScGridWindow::DoScenarioMenu( const ScRange& rScenRange )
     sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND;
     if (!aCurrent.isEmpty())
     {
-        nPos = pFilterBox->GetEntryPos(String(aCurrent));
+        nPos = pFilterBox->GetEntryPos(aCurrent);
     }
     if (LISTBOX_ENTRY_NOTFOUND == nPos && pFilterBox->GetEntryCount() > 0 )
         nPos = 0;
@@ -4343,7 +4343,7 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
         {
             ScViewFunc* pView = pViewData->GetView();
             if ( !rData.aLinkTable.isEmpty() )
-                pView->InsertTableLink( rData.aLinkDoc, EMPTY_STRING, EMPTY_STRING,
+                pView->InsertTableLink( rData.aLinkDoc, EMPTY_OUSTRING, EMPTY_OUSTRING,
                                         rData.aLinkTable );
             else if ( !rData.aLinkArea.isEmpty() )
             {
@@ -4352,7 +4352,7 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
                 pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY );
                 pView->MoveCursorAbs( nPosX, nPosY, SC_FOLLOW_NONE, false, false );
 
-                pView->InsertAreaLink( rData.aLinkDoc, EMPTY_STRING, EMPTY_STRING,
+                pView->InsertAreaLink( rData.aLinkDoc, EMPTY_OUSTRING, EMPTY_OUSTRING,
                                         rData.aLinkArea, 0 );
             }
             else
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index 13a1a09cbe2f..37ac42387c2f 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -993,7 +993,7 @@ void ScHeaderControl::DrawInvert( long /* nDragPos */ )
 
 OUString ScHeaderControl::GetDragHelp( long /* nVal */ )
 {
-    return EMPTY_STRING;
+    return EMPTY_OUSTRING;
 }
 
 void ScHeaderControl::SetMarking( sal_Bool /* bSet */ )
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 957de521855c..63e0fad619a5 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -2079,7 +2079,7 @@ static void lcl_ClearEdit( EditEngine& rEngine )       // Text und Attribute
 {
     rEngine.SetUpdateMode( false );
 
-    rEngine.SetText(EMPTY_STRING);
+    rEngine.SetText(EMPTY_OUSTRING);
     //  keine Para-Attribute uebrigbehalten...
     const SfxItemSet& rPara = rEngine.GetParaAttribs(0);
     if (rPara.Count())
diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx
index 1839f2666a4a..eec312cd9971 100644
--- a/sc/source/ui/view/spelldialog.cxx
+++ b/sc/source/ui/view/spelldialog.cxx
@@ -251,7 +251,7 @@ void ScSpellDialogChildWindow::Init()
     mxEngine->SetControlWord( EE_CNTRL_USECHARATTRIBS );
     mxEngine->EnableUndo( false );
     mxEngine->SetPaperSize( aRect.GetSize() );
-    mxEngine->SetText( EMPTY_STRING );
+    mxEngine->SetText( EMPTY_OUSTRING );
     mxEngine->ClearModifyFlag();
 
     mbNeedNextObj = true;
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 199eaf1a9cb2..0769315c8c56 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -1327,8 +1327,8 @@ void ScViewData::EditGrowY( sal_Bool bInitial )
         //  because this occurs in the normal progress of editing a formula.
         //  Subsequent calls with empty text might involve changed attributes (including
         //  font height), so they are treated like normal text.
-        String aText = pEngine->GetText(  0 );
-        if ( ( aText.Len() == 0 && bInitial ) || aText.GetChar(0) == (sal_Unicode)'=' )
+        OUString aText = pEngine->GetText(  0 );
+        if ( ( aText.isEmpty() && bInitial ) || aText[0] == '=' )
             nAllowedExtra = SC_GROWY_BIG_EXTRA;
     }
 
@@ -2585,7 +2585,7 @@ void ScViewData::ReadExtOptions( const ScExtDocOptions& rDocOpt )
                     Color aGridColor( rTabSett.maGridColor );
                     if( aGridColor.GetColor() == COL_AUTO )
                         aGridColor.SetColor( SC_STD_GRIDCOLOR );
-                    pOptions->SetGridColor( aGridColor, EMPTY_STRING );
+                    pOptions->SetGridColor( aGridColor, EMPTY_OUSTRING );
                 }
 
                 // view mode and default zoom (for new sheets) from current sheet
@@ -2727,7 +2727,7 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue>
                 uno::Sequence< OUString > aNames(xNameContainer->getElementNames());
                 for (sal_Int32 nTabPos = 0; nTabPos < aNames.getLength(); nTabPos++)
                 {
-                    String sTabName(aNames[nTabPos]);
+                    OUString sTabName(aNames[nTabPos]);
                     SCTAB nTab(0);
                     if (GetDocument()->GetTable(sTabName, nTab))
                     {
@@ -2752,7 +2752,7 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue>
             OUString sValue;
             if(rSettings[i].Value >>= sValue)
             {
-                String sTabName(sValue);
+                OUString sTabName(sValue);
                 SCTAB nTab(0);
                 if (GetDocument()->GetTable(sTabName, nTab))
                     nTabNo = nTab;
@@ -2803,7 +2803,7 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue>
             sal_Int64 nColor = 0;
             if (rSettings[i].Value >>= nColor)
             {
-                String aColorName;
+                OUString aColorName;
                 Color aColor(static_cast<sal_uInt32>(nColor));
                 // #i47435# set automatic grid color explicitly
                 if( aColor.GetColor() == COL_AUTO )
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index 8d31df689958..8f140c89d10d 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -535,7 +535,7 @@ void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam, sal_Boo
     pEngine->SetControlWord( EE_CNTRL_USECHARATTRIBS );
     pEngine->EnableUndo( false );
     pEngine->SetPaperSize( aRect.GetSize() );
-    pEngine->SetText( EMPTY_STRING );
+    pEngine->SetText( EMPTY_OUSTRING );
 
     // *** do the conversion *** ----------------------------------------------
 
@@ -641,7 +641,7 @@ sal_Bool ScViewFunc::PasteFile( const Point& rPos, const OUString& rFile, sal_Bo
         else
         {
             // #i76709# if bLink isn't set, pass empty URL/filter, so a non-linked image is inserted
-            return PasteGraphic( rPos, aGraphic, EMPTY_STRING, EMPTY_STRING );
+            return PasteGraphic( rPos, aGraphic, EMPTY_OUSTRING, EMPTY_OUSTRING );
         }
     }
 
@@ -676,7 +676,7 @@ sal_Bool ScViewFunc::PasteFile( const Point& rPos, const OUString& rFile, sal_Bo
 
         // If an OLE object can't be created, insert a URL button
 
-        GetViewData()->GetViewShell()->InsertURLButton( aStrURL, aStrURL, EMPTY_STRING, &rPos );
+        GetViewData()->GetViewShell()->InsertURLButton( aStrURL, aStrURL, EMPTY_OUSTRING, &rPos );
         return sal_True;
     }
 }
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index bdf7a51306be..34f1e1fc0bc3 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -471,7 +471,7 @@ sal_Bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId,
         {
             Graphic aGraphic;
             *xStm >> aGraphic;
-            bRet = PasteGraphic( aPos, aGraphic, EMPTY_STRING, EMPTY_STRING );
+            bRet = PasteGraphic( aPos, aGraphic, EMPTY_OUSTRING, EMPTY_OUSTRING );
         }
     }
     else if ( nFormatId == SOT_FORMATSTR_ID_DRAWING )
diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx
index 18e49492f1a2..e70d1b220dfa 100644
--- a/sc/source/ui/view/viewfun7.cxx
+++ b/sc/source/ui/view/viewfun7.cxx
@@ -456,7 +456,7 @@ sal_Bool ScViewFunc::ApplyGraphicToObject( SdrObject* pPickObj, const Graphic& r
             SfxItemSet aSet( pScDrawView->GetModel()->GetItemPool(),
                                 XATTR_FILLSTYLE, XATTR_FILLBITMAP );
             aSet.Put(XFillStyleItem(XFILL_BITMAP));
-            aSet.Put(XFillBitmapItem(String(), rGraphic));
+            aSet.Put(XFillBitmapItem(OUString(), rGraphic));
 
             pPickObj->SetMergedItemSetAndBroadcast(aSet);
 
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 033b828afc48..92f72dfcf2c2 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -793,7 +793,7 @@ void ScViewFunc::EnterMatrix( const OUString& rString, ::formula::FormulaGrammar
     {
         ScDocShell* pDocSh = pData->GetDocShell();
         bool bSuccess = pDocSh->GetDocFunc().EnterMatrix(
-            aRange, &rMark, NULL, rString, false, false, EMPTY_STRING, eGram );
+            aRange, &rMark, NULL, rString, false, false, EMPTY_OUSTRING, eGram );
         if (bSuccess)
             pDocSh->UpdateOle(GetViewData());
     }