Use bool and rtl::OUString in ScChartCollection et. al.

1 files changed, 18 insertions, 18 deletions

diff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxx
index 6b223dd715e5..fefa11c52099 100644
--- a/sc/inc/chartarr.hxx
+++ b/sc/inc/chartarr.hxx
@@ -49,8 +49,8 @@ class ScMemChart
     short           nRowCnt;
     short           nColCnt;
     double*         pData;
-    String*         pColText;
-    String*         pRowText;
+    ::rtl::OUString* pColText;
+    ::rtl::OUString* pRowText;
 
     ScMemChart(const ScMemChart& rMemChart);      // not implemented
 
@@ -60,21 +60,21 @@ public:
 
     short GetColCount() const { return nColCnt; }
     short GetRowCount() const { return nRowCnt; }
-    const String& GetColText(short nCol) const { return pColText[nCol]; }
-    const String& GetRowText(short nRow) const { return pRowText[nRow]; }
+    const ::rtl::OUString& GetColText(short nCol) const { return pColText[nCol]; }
+    const ::rtl::OUString& GetRowText(short nRow) const { return pRowText[nRow]; }
     double GetData(short nCol, short nRow) const { return pData[nCol * nRowCnt + nRow]; }
     void SetData(short nCol, short nRow, const double& rVal) { pData[nCol * nRowCnt + nRow] = rVal; }
-    void SetColText(short nCol, const String& rText) { pColText[nCol] = rText; }
-    void SetRowText(short nRow, const String& rText) { pRowText[nRow] = rText; }
+    void SetColText(short nCol, const ::rtl::OUString& rText) { pColText[nCol] = rText; }
+    void SetRowText(short nRow, const ::rtl::OUString& rText) { pRowText[nRow] = rText; }
 };
 
 
 class SC_DLLPUBLIC ScChartArray : public ScDataObject               // only parameter-struct
 {
-    String      aName;
+    ::rtl::OUString aName;
     ScDocument* pDocument;
     ScChartPositioner aPositioner;
-    sal_Bool        bValid;             // for creation out of SchMemChart
+    bool        bValid;             // for creation out of SchMemChart
 
 private:
     ScMemChart* CreateMemChartSingle();
@@ -83,9 +83,9 @@ public:
     ScChartArray( ScDocument* pDoc, SCTAB nTab,
                     SCCOL nStartColP, SCROW nStartRowP,
                     SCCOL nEndColP, SCROW nEndRowP,
-                    const String& rChartName );
+                    const ::rtl::OUString& rChartName );
     ScChartArray( ScDocument* pDoc, const ScRangeListRef& rRangeList,
-                    const String& rChartName );
+                    const ::rtl::OUString& rChartName );
     ScChartArray( const ScChartArray& rArr );
 
     virtual ~ScChartArray();
@@ -96,14 +96,14 @@ public:
     void    SetRangeList( const ScRange& rNew ) { aPositioner.SetRangeList(rNew); }
     const   ScChartPositionMap* GetPositionMap() { return aPositioner.GetPositionMap(); }
 
-    void    SetHeaders(sal_Bool bCol, sal_Bool bRow) { aPositioner.SetHeaders(bCol, bRow); }
-    sal_Bool    HasColHeaders() const            { return aPositioner.HasColHeaders(); }
-    sal_Bool    HasRowHeaders() const            { return aPositioner.HasRowHeaders(); }
-    sal_Bool    IsValid() const                  { return bValid; }
-    void    SetName(const String& rNew)      { aName = rNew; }
-    const String& GetName() const            { return aName; }
+    void    SetHeaders(bool bCol, bool bRow) { aPositioner.SetHeaders(bCol, bRow); }
+    bool    HasColHeaders() const { return aPositioner.HasColHeaders(); }
+    bool    HasRowHeaders() const { return aPositioner.HasRowHeaders(); }
+    bool IsValid() const { return bValid; }
+    void SetName(const ::rtl::OUString& rNew) { aName = rNew; }
+    const ::rtl::OUString& GetName() const { return aName; }
 
-    sal_Bool    operator==(const ScChartArray& rCmp) const;
+    bool operator==(const ScChartArray& rCmp) const;
 
     ScMemChart* CreateMemChart();
 };
@@ -119,7 +119,7 @@ public:
     ScChartArray*       operator[](sal_uInt16 nIndex) const
                         { return (ScChartArray*)At(nIndex); }
 
-    sal_Bool    operator==(const ScChartCollection& rCmp) const;
+    bool operator==(const ScChartCollection& rCmp) const;
 };