convert sc/source/ui/inc/d*.hxx from String to OUString

Change-Id: Ie463ca66bb77c251742bacee94f26adc2a697c6e

14 files changed, 75 insertions, 75 deletions

diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx
index c2a7bdd1ebe8..22ed0fc76b6e 100644
--- a/sc/source/ui/dbgui/dapitype.cxx
+++ b/sc/source/ui/dbgui/dapitype.cxx
@@ -138,27 +138,27 @@ ScDataPilotServiceDlg::~ScDataPilotServiceDlg()
 {
 }
 
-String ScDataPilotServiceDlg::GetServiceName() const
+OUString ScDataPilotServiceDlg::GetServiceName() const
 {
     return aLbService.GetSelectEntry();
 }
 
-String ScDataPilotServiceDlg::GetParSource() const
+OUString ScDataPilotServiceDlg::GetParSource() const
 {
     return aEdSource.GetText();
 }
 
-String ScDataPilotServiceDlg::GetParName() const
+OUString ScDataPilotServiceDlg::GetParName() const
 {
     return aEdName.GetText();
 }
 
-String ScDataPilotServiceDlg::GetParUser() const
+OUString ScDataPilotServiceDlg::GetParUser() const
 {
     return aEdUser.GetText();
 }
 
-String ScDataPilotServiceDlg::GetParPass() const
+OUString ScDataPilotServiceDlg::GetParPass() const
 {
     return aEdPasswd.GetText();
 }
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 1035ed033507..12c7f8ac682e 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -341,7 +341,7 @@ void ScDbNameDlg::UpdateNames()
 
 //------------------------------------------------------------------------
 
-void ScDbNameDlg::UpdateDBData( const String& rStrName )
+void ScDbNameDlg::UpdateDBData( const OUString& rStrName )
 {
 
     const ScDBData* pData = aLocalDbCol.getNamedDBs().findByUpperName(ScGlobal::pCharClass->uppercase(rStrName));
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 15355ee1dca3..44cfb2f9644d 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -748,7 +748,7 @@ sal_Bool ScDocFunc::TransliterateText( const ScMarkData& rMark, sal_Int32 nType,
 
 //------------------------------------------------------------------------
 
-sal_Bool ScDocFunc::SetNormalString( bool& o_rbNumFmtSet, const ScAddress& rPos, const String& rText, sal_Bool bApi )
+sal_Bool ScDocFunc::SetNormalString( bool& o_rbNumFmtSet, const ScAddress& rPos, const OUString& rText, sal_Bool bApi )
 {
     ScDocShellModificator aModificator( rDocShell );
     ScDocument* pDoc = rDocShell.GetDocument();
@@ -1173,7 +1173,7 @@ bool ScDocFunc::ShowNote( const ScAddress& rPos, bool bShow )
 
 //------------------------------------------------------------------------
 
-bool ScDocFunc::SetNoteText( const ScAddress& rPos, const String& rText, sal_Bool bApi )
+bool ScDocFunc::SetNoteText( const ScAddress& rPos, const OUString& rText, sal_Bool bApi )
 {
     ScDocShellModificator aModificator( rDocShell );
 
@@ -1329,7 +1329,7 @@ sal_Bool ScDocFunc::ApplyAttributes( const ScMarkData& rMark, const ScPatternAtt
 }
 
 
-sal_Bool ScDocFunc::ApplyStyle( const ScMarkData& rMark, const String& rStyleName,
+sal_Bool ScDocFunc::ApplyStyle( const ScMarkData& rMark, const OUString& rStyleName,
                                 sal_Bool bRecord, sal_Bool bApi )
 {
     ScDocument* pDoc = rDocShell.GetDocument();
@@ -2953,7 +2953,7 @@ void VBA_DeleteModule( ScDocShell& rDocSh, const OUString& sModuleName )
 }
 
 
-sal_Bool ScDocFunc::InsertTable( SCTAB nTab, const String& rName, sal_Bool bRecord, sal_Bool bApi )
+sal_Bool ScDocFunc::InsertTable( SCTAB nTab, const OUString& rName, sal_Bool bRecord, sal_Bool bApi )
 {
     sal_Bool bSuccess = false;
     WaitObject aWait( rDocShell.GetActiveDialogParent() );
@@ -3192,7 +3192,7 @@ sal_Bool ScDocFunc::SetLayoutRTL( SCTAB nTab, bool bRTL, sal_Bool /* bApi */ )
     return sal_True;
 }
 
-sal_Bool ScDocFunc::RenameTable( SCTAB nTab, const String& rName, sal_Bool bRecord, sal_Bool bApi )
+sal_Bool ScDocFunc::RenameTable( SCTAB nTab, const OUString& rName, sal_Bool bRecord, sal_Bool bApi )
 {
     ScDocument* pDoc = rDocShell.GetDocument();
     if (bRecord && !pDoc->IsUndoEnabled())
@@ -3674,7 +3674,7 @@ void ScDocFunc::ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect )
     aModificator.SetDocumentModified();
 }
 
-sal_Bool ScDocFunc::Protect( SCTAB nTab, const String& rPassword, sal_Bool /*bApi*/ )
+sal_Bool ScDocFunc::Protect( SCTAB nTab, const OUString& rPassword, sal_Bool /*bApi*/ )
 {
     ScDocument* pDoc = rDocShell.GetDocument();
     if (nTab == TABLEID_DOC)
@@ -3732,7 +3732,7 @@ sal_Bool ScDocFunc::Protect( SCTAB nTab, const String& rPassword, sal_Bool /*bAp
     return true;
 }
 
-sal_Bool ScDocFunc::Unprotect( SCTAB nTab, const String& rPassword, sal_Bool bApi )
+sal_Bool ScDocFunc::Unprotect( SCTAB nTab, const OUString& rPassword, sal_Bool bApi )
 {
     ScDocument* pDoc = rDocShell.GetDocument();
 
@@ -4031,8 +4031,8 @@ bool ScDocFunc::AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark,
 //------------------------------------------------------------------------
 
 sal_Bool ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark,
-        const ScTokenArray* pTokenArray, const String& rString, sal_Bool bApi, sal_Bool bEnglish,
-        const String& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar )
+        const ScTokenArray* pTokenArray, const OUString& rString, sal_Bool bApi, sal_Bool bEnglish,
+        const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar )
 {
     ScDocShellModificator aModificator( rDocShell );
 
@@ -4083,7 +4083,7 @@ sal_Bool ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMa
             pDoc->InsertMatrixFormula( nStartCol, nStartRow, nEndCol, nEndRow,
                     aMark, EMPTY_STRING, pCode, eGrammar);
             delete pCode;
-            pDoc->IncXMLImportedFormulaCount( rString.Len() );
+            pDoc->IncXMLImportedFormulaCount( rString.getLength() );
         }
         else if (bEnglish)
         {
@@ -5226,8 +5226,8 @@ sal_Bool ScDocFunc::ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNe
 
 //------------------------------------------------------------------------
 
-sal_Bool ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter,
-                                const String& rOptions, const OUString& rSource,
+sal_Bool ScDocFunc::InsertAreaLink( const OUString& rFile, const OUString& rFilter,
+                                const OUString& rOptions, const OUString& rSource,
                                 const ScRange& rDestRange, sal_uLong nRefresh,
                                 sal_Bool bFitBlock, sal_Bool bApi )
 {
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 05b44a0608e3..1259646692ed 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2519,55 +2519,55 @@ void ScDocShell::PrepareReload()
 }
 
 
-String ScDocShell::GetOwnFilterName()
+OUString ScDocShell::GetOwnFilterName()
 {
     return OUString(pFilterSc50);
 }
 
-String ScDocShell::GetHtmlFilterName()
+OUString ScDocShell::GetHtmlFilterName()
 {
     return OUString(pFilterHtml);
 }
 
-String ScDocShell::GetWebQueryFilterName()
+OUString ScDocShell::GetWebQueryFilterName()
 {
     return OUString(pFilterHtmlWebQ);
 }
 
-String ScDocShell::GetAsciiFilterName()
+OUString ScDocShell::GetAsciiFilterName()
 {
     return OUString(pFilterAscii);
 }
 
-String ScDocShell::GetLotusFilterName()
+OUString ScDocShell::GetLotusFilterName()
 {
     return OUString(pFilterLotus);
 }
 
-String ScDocShell::GetDBaseFilterName()
+OUString ScDocShell::GetDBaseFilterName()
 {
     return OUString(pFilterDBase);
 }
 
-String ScDocShell::GetDifFilterName()
+OUString ScDocShell::GetDifFilterName()
 {
     return OUString(pFilterDif);
 }
 
-sal_Bool ScDocShell::HasAutomaticTableName( const String& rFilter )
+sal_Bool ScDocShell::HasAutomaticTableName( const OUString& rFilter )
 {
     //  sal_True for those filters that keep the default table name
     //  (which is language specific)
 
-    return rFilter.EqualsAscii( pFilterAscii )
-        || rFilter.EqualsAscii( pFilterLotus )
-        || rFilter.EqualsAscii( pFilterExcel4 )
-        || rFilter.EqualsAscii( pFilterEx4Temp )
-        || rFilter.EqualsAscii( pFilterDBase )
-        || rFilter.EqualsAscii( pFilterDif )
-        || rFilter.EqualsAscii( pFilterSylk )
-        || rFilter.EqualsAscii( pFilterHtml )
-        || rFilter.EqualsAscii( pFilterRtf );
+    return rFilter.equalsAscii( pFilterAscii )
+        || rFilter.equalsAscii( pFilterLotus )
+        || rFilter.equalsAscii( pFilterExcel4 )
+        || rFilter.equalsAscii( pFilterEx4Temp )
+        || rFilter.equalsAscii( pFilterDBase )
+        || rFilter.equalsAscii( pFilterDif )
+        || rFilter.equalsAscii( pFilterSylk )
+        || rFilter.equalsAscii( pFilterHtml )
+        || rFilter.equalsAscii( pFilterRtf );
 }
 
 #if ! ENABLE_TELEPATHY
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index c07913f882fe..f5a282cd3ce7 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -620,7 +620,7 @@ ScChangeAction* ScDocShell::GetChangeAction( const ScAddress& rPos )
     return (ScChangeAction*)pFound;
 }
 
-void ScDocShell::SetChangeComment( ScChangeAction* pAction, const String& rComment )
+void ScDocShell::SetChangeComment( ScChangeAction* pAction, const OUString& rComment )
 {
     if (pAction)
     {
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 65ef96bb6707..c5dd453f57aa 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -1261,7 +1261,7 @@ void ScDocShell::DoHardRecalc( bool /* bApi */ )
 
 //------------------------------------------------------------------
 
-void ScDocShell::DoAutoStyle( const ScRange& rRange, const String& rStyle )
+void ScDocShell::DoAutoStyle( const ScRange& rRange, const OUString& rStyle )
 {
     ScStyleSheetPool* pStylePool = aDocument.GetStyleSheetPool();
     ScStyleSheet* pStyleSheet =
diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx
index d324df53ab2b..c0b12160ad86 100644
--- a/sc/source/ui/docshell/docsh5.cxx
+++ b/sc/source/ui/docshell/docsh5.cxx
@@ -623,7 +623,7 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, sal_Bool bReco
     aModificator.SetDocumentModified();
 }
 
-void ScDocShell::UseScenario( SCTAB nTab, const String& rName, sal_Bool bRecord )
+void ScDocShell::UseScenario( SCTAB nTab, const OUString& rName, sal_Bool bRecord )
 {
     if (!aDocument.IsScenario(nTab))
     {
@@ -714,7 +714,7 @@ void ScDocShell::UseScenario( SCTAB nTab, const String& rName, sal_Bool bRecord
     }
 }
 
-void ScDocShell::ModifyScenario( SCTAB nTab, const String& rName, const String& rComment,
+void ScDocShell::ModifyScenario( SCTAB nTab, const OUString& rName, const OUString& rComment,
                                     const Color& rColor, sal_uInt16 nFlags )
 {
     //  Undo
@@ -744,7 +744,7 @@ void ScDocShell::ModifyScenario( SCTAB nTab, const String& rName, const String&
         pBindings->Invalidate( SID_SELECT_SCENARIO );
 }
 
-SCTAB ScDocShell::MakeScenario( SCTAB nTab, const String& rName, const String& rComment,
+SCTAB ScDocShell::MakeScenario( SCTAB nTab, const OUString& rName, const OUString& rComment,
                                     const Color& rColor, sal_uInt16 nFlags,
                                     ScMarkData& rMark, sal_Bool bRecord )
 {
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index d9a13e63fa07..9004222a561b 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -291,7 +291,7 @@ static void lcl_setScalesToColumns(ScDocument& rDoc, const vector<long>& rScales
 
 #endif // !DISABLE_DBCONNECTIVITY
 
-sal_uLong ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet,
+sal_uLong ScDocShell::DBaseImport( const OUString& rFullFileName, CharSet eCharSet,
                                ScColWidthParam aColWidthParam[MAXCOLCOUNT], ScFlatBoolRowSegments& rRowHeightsRecalc )
 {
 #ifdef DISABLE_DBCONNECTIVITY
diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx
index 9cdbccb0bb4a..f2be47d008a8 100644
--- a/sc/source/ui/inc/dapitype.hxx
+++ b/sc/source/ui/inc/dapitype.hxx
@@ -76,11 +76,11 @@ public:
                     const com::sun::star::uno::Sequence<OUString>& rServices );
             ~ScDataPilotServiceDlg();
 
-    String  GetServiceName() const;
-    String  GetParSource() const;
-    String  GetParName() const;
-    String  GetParUser() const;
-    String  GetParPass() const;
+    OUString  GetServiceName() const;
+    OUString  GetParSource() const;
+    OUString  GetParName() const;
+    OUString  GetParUser() const;
+    OUString  GetParPass() const;
 };
 
 
diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx
index e36b6222ee2b..65350a7f42d9 100644
--- a/sc/source/ui/inc/dbnamdlg.hxx
+++ b/sc/source/ui/inc/dbnamdlg.hxx
@@ -90,7 +90,7 @@ private:
 private:
     void            Init();
     void            UpdateNames();
-    void            UpdateDBData( const String& rStrName );
+    void            UpdateDBData( const OUString& rStrName );
     void            SetInfoStrings( const ScDBData* pDBData );
 
     DECL_LINK( CancelBtnHdl, void * );
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index 3a2e2c1c00ec..c17e43b629a9 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -87,7 +87,7 @@ public:
     virtual sal_Bool        TransliterateText( const ScMarkData& rMark, sal_Int32 nType,
                                                sal_Bool bRecord, sal_Bool bApi );
 
-    virtual sal_Bool        SetNormalString( bool& o_rbNumFmtSet, const ScAddress& rPos, const String& rText, sal_Bool bApi );
+    virtual sal_Bool        SetNormalString( bool& o_rbNumFmtSet, const ScAddress& rPos, const OUString& rText, sal_Bool bApi );
     virtual bool SetValueCell( const ScAddress& rPos, double fVal, bool bInteraction );
     virtual bool SetStringCell( const ScAddress& rPos, const OUString& rStr, bool bInteraction );
     virtual bool SetEditCell( const ScAddress& rPos, const EditTextObject& rStr, bool bInteraction );
@@ -107,12 +107,12 @@ public:
     virtual bool            ShowNote( const ScAddress& rPos, bool bShow = true );
     inline bool             HideNote( const ScAddress& rPos ) { return ShowNote( rPos, false ); }
 
-    virtual bool            SetNoteText( const ScAddress& rPos, const String& rNoteText, sal_Bool bApi );
+    virtual bool            SetNoteText( const ScAddress& rPos, const OUString& rNoteText, sal_Bool bApi );
     virtual bool            ReplaceNote( const ScAddress& rPos, const OUString& rNoteText, const OUString* pAuthor, const OUString* pDate, sal_Bool bApi );
 
     virtual sal_Bool        ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& rPattern,
                                              sal_Bool bRecord, sal_Bool bApi );
-    virtual sal_Bool        ApplyStyle( const ScMarkData& rMark, const String& rStyleName,
+    virtual sal_Bool        ApplyStyle( const ScMarkData& rMark, const OUString& rStyleName,
                                         sal_Bool bRecord, sal_Bool bApi );
 
     virtual bool InsertCells( const ScRange& rRange,const ScMarkData* pTabMark,
@@ -124,8 +124,8 @@ public:
     virtual sal_Bool        MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
                                        sal_Bool bCut, sal_Bool bRecord, sal_Bool bPaint, sal_Bool bApi );
 
-    virtual sal_Bool        InsertTable( SCTAB nTab, const String& rName, sal_Bool bRecord, sal_Bool bApi );
-    virtual sal_Bool        RenameTable( SCTAB nTab, const String& rName, sal_Bool bRecord, sal_Bool bApi );
+    virtual sal_Bool        InsertTable( SCTAB nTab, const OUString& rName, sal_Bool bRecord, sal_Bool bApi );
+    virtual sal_Bool        RenameTable( SCTAB nTab, const OUString& rName, sal_Bool bRecord, sal_Bool bApi );
     virtual sal_Bool        DeleteTable( SCTAB nTab, sal_Bool bRecord, sal_Bool bApi );
 
     virtual bool            SetTabBgColor( SCTAB nTab, const Color& rColor, bool bRecord, bool bApi );
@@ -147,8 +147,8 @@ public:
 
     virtual void            ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect );
 
-    virtual sal_Bool        Protect( SCTAB nTab, const String& rPassword, sal_Bool bApi );
-    virtual sal_Bool        Unprotect( SCTAB nTab, const String& rPassword, sal_Bool bApi );
+    virtual sal_Bool        Protect( SCTAB nTab, const OUString& rPassword, sal_Bool bApi );
+    virtual sal_Bool        Unprotect( SCTAB nTab, const OUString& rPassword, sal_Bool bApi );
 
     virtual sal_Bool        ClearItems( const ScMarkData& rMark, const sal_uInt16* pWhich, sal_Bool bApi );
     virtual sal_Bool        ChangeIndent( const ScMarkData& rMark, sal_Bool bIncrement, sal_Bool bApi );
@@ -157,8 +157,8 @@ public:
 
     virtual sal_Bool        EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark,
                                          const ScTokenArray* pTokenArray,
-                                         const String& rString, sal_Bool bApi, sal_Bool bEnglish,
-                                         const String& rFormulaNmsp,
+                                         const OUString& rString, sal_Bool bApi, sal_Bool bEnglish,
+                                         const OUString& rFormulaNmsp,
                                          const formula::FormulaGrammar::Grammar );
 
     virtual sal_Bool        TabOp( const ScRange& rRange, const ScMarkData* pTabMark,
@@ -197,8 +197,8 @@ public:
     virtual sal_Bool        CreateNames( const ScRange& rRange, sal_uInt16 nFlags, sal_Bool bApi, SCTAB nTab = -1 ); // -1 for global range names
     virtual sal_Bool        InsertNameList( const ScAddress& rStartPos, sal_Bool bApi );
 
-    sal_Bool                InsertAreaLink( const String& rFile, const String& rFilter,
-                                            const String& rOptions, const OUString& rSource,
+    sal_Bool                InsertAreaLink( const OUString& rFile, const OUString& rFilter,
+                                            const OUString& rOptions, const OUString& rSource,
                                             const ScRange& rDestRange, sal_uLong nRefresh,
                                             sal_Bool bFitBlock, sal_Bool bApi );
 
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index eeda0364dc84..964c3ee868c9 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -141,7 +141,7 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener
 
     SC_DLLPRIVATE bool SaveCurrentChart( SfxMedium& rMedium );
 
-    SC_DLLPRIVATE sal_uLong         DBaseImport( const String& rFullFileName, CharSet eCharSet,
+    SC_DLLPRIVATE sal_uLong         DBaseImport( const OUString& rFullFileName, CharSet eCharSet,
                                              ScColWidthParam aColWidthParam[MAXCOLCOUNT], ScFlatBoolRowSegments& rRowHeightsRecalc );
     SC_DLLPRIVATE sal_uLong DBaseExport(
         const OUString& rFullFileName, CharSet eCharSet, bool& bHasMemo );
@@ -242,7 +242,7 @@ public:
 
     void            UpdateFontList();
 
-    String          CreateObjectName( const String& rPrefix );
+    OUString        CreateObjectName( const OUString& rPrefix );
 
     ScDrawLayer*    MakeDrawLayer();
 
@@ -261,7 +261,7 @@ public:
     bool            MergeSharedDocument( ScDocShell* pSharedDocShell );
 
     ScChangeAction* GetChangeAction( const ScAddress& rPos );
-    void            SetChangeComment( ScChangeAction* pAction, const String& rComment );
+    void            SetChangeComment( ScChangeAction* pAction, const OUString& rComment );
     void            ExecuteChangeCommentDialog( ScChangeAction* pAction, Window* pParent,sal_Bool bPrevNext=sal_True );
                     /// Protect/unprotect ChangeTrack and return <TRUE/> if
                     /// protection was successfully changed.
@@ -278,7 +278,7 @@ public:
     void            PageStyleModified( const OUString& rStyleName, sal_Bool bApi );
 
     void            NotifyStyle( const SfxStyleSheetHint& rHint );
-    void            DoAutoStyle( const ScRange& rRange, const String& rStyle );
+    void            DoAutoStyle( const ScRange& rRange, const OUString& rStyle );
 
     Window*         GetActiveDialogParent();
     void            ErrorMessage( sal_uInt16 nGlobStrId );
@@ -290,11 +290,11 @@ public:
 
     void            RefreshPivotTables( const ScRange& rSource );
     void            DoConsolidate( const ScConsolidateParam& rParam, sal_Bool bRecord = sal_True );
-    void            UseScenario( SCTAB nTab, const String& rName, sal_Bool bRecord = sal_True );
-    SCTAB           MakeScenario( SCTAB nTab, const String& rName, const String& rComment,
+    void            UseScenario( SCTAB nTab, const OUString& rName, sal_Bool bRecord = sal_True );
+    SCTAB           MakeScenario( SCTAB nTab, const OUString& rName, const OUString& rComment,
                                     const Color& rColor, sal_uInt16 nFlags,
                                     ScMarkData& rMark, sal_Bool bRecord = sal_True );
-    void            ModifyScenario( SCTAB nTab, const String& rName, const String& rComment,
+    void            ModifyScenario( SCTAB nTab, const OUString& rName, const OUString& rComment,
                                     const Color& rColor, sal_uInt16 nFlags );
     sal_uLong TransferTab( ScDocShell& rSrcDocShell, SCTAB nSrcPos,
                                 SCTAB nDestPos, sal_Bool bInsertNew,
@@ -399,14 +399,14 @@ public:
     static SCTAB       GetCurTab();
 
     static ScDocShell* GetShellByNum( sal_uInt16 nDocNo );
-    static String   GetOwnFilterName();
-        static String   GetHtmlFilterName();
-    static String   GetWebQueryFilterName();
-    static String   GetAsciiFilterName();
-    static String   GetLotusFilterName();
-    static String   GetDBaseFilterName();
-    static String   GetDifFilterName();
-    static sal_Bool     HasAutomaticTableName( const String& rFilter );
+    static OUString   GetOwnFilterName();
+    static OUString   GetHtmlFilterName();
+    static OUString   GetWebQueryFilterName();
+    static OUString   GetAsciiFilterName();
+    static OUString   GetLotusFilterName();
+    static OUString   GetDBaseFilterName();
+    static OUString   GetDifFilterName();
+    static sal_Bool     HasAutomaticTableName( const OUString& rFilter );
 
     DECL_LINK( RefreshDBDataHdl, ScRefreshTimer* );
 
diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx
index ab6f9c6b4568..3da404cf394a 100644
--- a/sc/source/ui/inc/drawview.hxx
+++ b/sc/source/ui/inc/drawview.hxx
@@ -115,7 +115,7 @@ public:
 
     void            SetMarkedOriginalSize();
 
-    sal_Bool            SelectObject( const String& rName );
+    sal_Bool            SelectObject( const OUString& rName );
     bool            HasMarkedControl() const;
     bool            HasMarkedInternal() const;
 
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 8bd69d3e2db3..5300a096121a 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -628,7 +628,7 @@ void ScDrawView::UpdateUserViewOptions()
     }
 }
 
-sal_Bool ScDrawView::SelectObject( const String& rName )
+sal_Bool ScDrawView::SelectObject( const OUString& rName )
 {
     UnmarkAll();