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

Change-Id: I9915e2c627413ebc0622a79929fb778c0211c355

sc/source/ui/dbgui/fieldwnd.cxx

@@ -1061,7 +1061,7 @@ size_t ScDPHorFieldControl::GetDisplayPosition(size_t nIndex) const
     return nPos;
 }
 
-String ScDPHorFieldControl::GetDescription() const
+OUString ScDPHorFieldControl::GetDescription() const
 {
     return ScResId(STR_ACC_DATAPILOT_COL_DESCR);
 }
@@ -1158,7 +1158,7 @@ ScPivotFieldType ScDPPageFieldControl::GetFieldType() const
     return PIVOTFIELDTYPE_PAGE;
 }
 
-String ScDPPageFieldControl::GetDescription() const
+OUString ScDPPageFieldControl::GetDescription() const
 {
     return ScResId(STR_ACC_DATAPILOT_PAGE_DESCR);
 }
@@ -1180,7 +1180,7 @@ ScPivotFieldType ScDPColFieldControl::GetFieldType() const
     return PIVOTFIELDTYPE_COL;
 }
 
-String ScDPColFieldControl::GetDescription() const
+OUString ScDPColFieldControl::GetDescription() const
 {
     return ScResId(STR_ACC_DATAPILOT_COL_DESCR);
 }
@@ -1333,7 +1333,7 @@ size_t ScDPRowFieldControl::GetDisplayPosition(size_t nIndex) const
 
 //-------------------------------------------------------------------
 
-String ScDPRowFieldControl::GetDescription() const
+OUString ScDPRowFieldControl::GetDescription() const
 {
     return ScResId(STR_ACC_DATAPILOT_ROW_DESCR);
 }
@@ -1433,7 +1433,7 @@ ScPivotFieldType ScDPSelectFieldControl::GetFieldType() const
     return PIVOTFIELDTYPE_SELECT;
 }
 
-String ScDPSelectFieldControl::GetDescription() const
+OUString ScDPSelectFieldControl::GetDescription() const
 {
     return ScResId(STR_ACC_DATAPILOT_SEL_DESCR);
 }
@@ -1463,7 +1463,7 @@ Size ScDPDataFieldControl::GetFieldSize() const
     return aFieldSize;
 }
 
-String ScDPDataFieldControl::GetDescription() const
+OUString ScDPDataFieldControl::GetDescription() const
 {
     return ScResId(STR_ACC_DATAPILOT_DATA_DESCR);
 }

sc/source/ui/dbgui/foptmgr.cxx

@@ -47,7 +47,7 @@ ScFilterOptionsMgr::ScFilterOptionsMgr(
                                 formula::RefButton*     refRbCopyArea,
                                 FixedText*          refFtDbAreaLabel,
                                 FixedText*          refFtDbArea,
-                                const String&       refStrUndefined )
+                                const OUString&     refStrUndefined )
 
     :   pViewData       ( ptrViewData ),
         pDoc            ( ptrViewData ? ptrViewData->GetDocument() : NULL ),
@@ -206,7 +206,7 @@ void ScFilterOptionsMgr::Init()
 
 //----------------------------------------------------------------------------
 
-sal_Bool ScFilterOptionsMgr::VerifyPosStr( const String& rPosStr ) const
+sal_Bool ScFilterOptionsMgr::VerifyPosStr( const OUString& rPosStr ) const
 {
     String aPosStr( rPosStr );
     xub_StrLen nColonPos = aPosStr.Search( ':' );

sc/source/ui/inc/fieldwnd.hxx

@@ -104,7 +104,7 @@ public:
     virtual Size GetFieldSize() const = 0;
 
     /** @return The description of the control which is used for the accessibility objects. */
-    virtual String GetDescription() const = 0;
+    virtual OUString GetDescription() const = 0;
     /** @return The type of the FieldWindow. */
     virtual ScPivotFieldType GetFieldType() const = 0;
     virtual void ScrollToShowSelection() = 0;
@@ -284,7 +284,7 @@ public:
     virtual Point           GetFieldPosition(size_t nIndex);
     virtual Size            GetFieldSize() const;
     virtual size_t          GetFieldIndex( const Point& rPos );
-    virtual String          GetDescription() const;
+    virtual OUString        GetDescription() const;
 
     virtual void ScrollToEnd();
     virtual void ScrollToShowSelection();
@@ -316,7 +316,7 @@ public:
     virtual ~ScDPPageFieldControl();
 
     virtual ScPivotFieldType GetFieldType() const;
-    virtual String GetDescription() const;
+    virtual OUString GetDescription() const;
 };
 
 // ============================================================================
@@ -329,7 +329,7 @@ public:
     virtual ~ScDPColFieldControl();
 
     virtual ScPivotFieldType GetFieldType() const;
-    virtual String GetDescription() const;
+    virtual OUString GetDescription() const;
 };
 
 // ============================================================================
@@ -350,7 +350,7 @@ public:
     virtual Point           GetFieldPosition( size_t nIndex );
     virtual Size            GetFieldSize() const;
     virtual size_t          GetFieldIndex( const Point& rPos );
-    virtual String          GetDescription() const;
+    virtual OUString        GetDescription() const;
     virtual ScPivotFieldType   GetFieldType() const;
 
     virtual void ScrollToEnd();
@@ -386,7 +386,7 @@ public:
     virtual ~ScDPSelectFieldControl();
 
     virtual ScPivotFieldType GetFieldType() const;
-    virtual String GetDescription() const;
+    virtual OUString GetDescription() const;
 };
 
 // ============================================================================
@@ -400,7 +400,7 @@ public:
 
     virtual ScPivotFieldType GetFieldType() const;
     virtual Size GetFieldSize() const;
-    virtual String GetDescription() const;
+    virtual OUString GetDescription() const;
 };
 
 #endif

sc/source/ui/inc/foptmgr.hxx

@@ -53,9 +53,9 @@ public:
                         formula::RefButton*     refRbCopyArea,
                         FixedText*          refFtDbAreaLabel,
                         FixedText*          refFtDbArea,
-                        const String&       refStrUndefined );
+                        const OUString&       refStrUndefined );
     ~ScFilterOptionsMgr();
-    sal_Bool    VerifyPosStr ( const String& rPosStr ) const;
+    sal_Bool    VerifyPosStr ( const OUString& rPosStr ) const;
 
 private:
     ScViewData*     pViewData;
@@ -73,7 +73,7 @@ private:
     FixedText*      pFtDbAreaLabel;
     FixedText*      pFtDbArea;
 
-    const String&   rStrUndefined;
+    const OUString&   rStrUndefined;
 
     const ScQueryParam& rQueryData;
 

sc/source/ui/inc/funcpage.hxx

@@ -92,7 +92,7 @@ public:
 
     sal_uInt16          GetFuncPos(const ScFuncDesc*);
     const ScFuncDesc*   GetFuncDesc( sal_uInt16 nPos ) const;
-    String          GetSelFunctionName() const;
+    OUString        GetSelFunctionName() const;
 
     void            SetDoubleClickHdl( const Link& rLink ) { aDoubleClickLink = rLink; }
     const Link&     GetDoubleClickHdl() const { return aDoubleClickLink; }