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

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;
 };
 
 

sc/source/core/data/documen5.cxx

@@ -153,7 +153,7 @@ void ScDocument::UpdateAllCharts()
                     uno::Reference< embed::XEmbeddedObject > xIPObj = ((SdrOle2Obj*)pObject)->GetObjRef();
                     if ( xIPObj.is() )
                     {
-                        String aIPName = ((SdrOle2Obj*)pObject)->GetPersistName();
+                        ::rtl::OUString aIPName = ((SdrOle2Obj*)pObject)->GetPersistName();
 
                         for (nPos=0; nPos<nDataCount; nPos++)
                         {

sc/source/core/tool/chartarr.cxx

@@ -48,6 +48,7 @@
 #include <vector>
 
 using ::std::vector;
+using ::rtl::OUString;
 
 // -----------------------------------------------------------------------
 
@@ -66,8 +67,8 @@ ScMemChart::ScMemChart(short nCols, short nRows)
                 *(pFill ++) = 0.0;
     }
 
-    pColText = new String[nColCnt];
-    pRowText = new String[nRowCnt];
+    pColText = new OUString[nColCnt];
+    pRowText = new OUString[nRowCnt];
 }
 
 ScMemChart::~ScMemChart()
@@ -81,20 +82,20 @@ ScMemChart::~ScMemChart()
 
 ScChartArray::ScChartArray( ScDocument* pDoc, SCTAB nTab,
                     SCCOL nStartColP, SCROW nStartRowP, SCCOL nEndColP, SCROW nEndRowP,
-                    const String& rChartName ) :
+                    const OUString& rChartName ) :
         aName( rChartName ),
         pDocument( pDoc ),
         aPositioner(pDoc, nTab, nStartColP, nStartRowP, nEndColP, nEndRowP),
-        bValid( sal_True )
+        bValid( true )
 {
 }
 
 ScChartArray::ScChartArray( ScDocument* pDoc, const ScRangeListRef& rRangeList,
-                    const String& rChartName ) :
+                    const OUString& rChartName ) :
         aName( rChartName ),
         pDocument( pDoc ),
         aPositioner(pDoc, rRangeList),
-        bValid( sal_True )
+        bValid( true )
 {
 }
 
@@ -116,7 +117,7 @@ ScDataObject* ScChartArray::Clone() const
     return new ScChartArray(*this);
 }
 
-sal_Bool ScChartArray::operator==(const ScChartArray& rCmp) const
+bool ScChartArray::operator==(const ScChartArray& rCmp) const
 {
     return aPositioner == rCmp.aPositioner
         && aName == rCmp.aName;
@@ -226,7 +227,7 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
         nRowCount = 0;
     }
 
-    sal_Bool bValidData = sal_True;
+    bool bValidData = true;
     if ( !nColCount )
     {
         bValidData = false;
@@ -250,7 +251,7 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
     {
         if ( bValidData )
         {
-            sal_Bool bCalcAsShown = pDocument->GetDocOptions().IsCalcAsShown();
+            bool bCalcAsShown = pDocument->GetDocOptions().IsCalcAsShown();
             ScBaseCell* pCell;
             for (nCol=0; nCol<nColCount; nCol++)
             {
@@ -350,7 +351,7 @@ ScMemChart* ScChartArray::CreateMemChartMulti()
         nRowCount = 0;
     }
 
-    sal_Bool bValidData = sal_True;
+    bool bValidData = true;
     if ( !nColCount )
     {
         bValidData = false;
@@ -372,7 +373,7 @@ ScMemChart* ScChartArray::CreateMemChartMulti()
     {
         SCSIZE nCol = 0;
         SCSIZE nRow = 0;
-        sal_Bool bCalcAsShown = pDocument->GetDocOptions().IsCalcAsShown();
+        bool bCalcAsShown = pDocument->GetDocOptions().IsCalcAsShown();
         sal_uLong nIndex = 0;
         if (bValidData)
         {
@@ -516,7 +517,7 @@ ScDataObject*   ScChartCollection::Clone() const
     return new ScChartCollection(*this);
 }
 
-sal_Bool ScChartCollection::operator==(const ScChartCollection& rCmp) const
+bool ScChartCollection::operator==(const ScChartCollection& rCmp) const
 {
     if (nCount != rCmp.nCount)
         return false;
@@ -525,7 +526,7 @@ sal_Bool ScChartCollection::operator==(const ScChartCollection& rCmp) const
         if (!((*(const ScChartArray*)pItems[i]) == (*(const ScChartArray*)rCmp.pItems[i])))
             return false;
 
-    return sal_True;
+    return true;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */