Merge remote-tracking branch 'origin/integration/dev300_m101'

Conflicts:
chart2/source/controller/main/UndoManager.cxx
chart2/source/tools/RegressionCurveHelper.cxx
sc/inc/address.hxx
sc/inc/attrib.hxx
sc/inc/bigrange.hxx
sc/inc/callform.hxx
sc/inc/cell.hxx
sc/inc/chartarr.hxx
sc/inc/chartlis.hxx
sc/inc/chgtrack.hxx
sc/inc/collect.hxx
sc/inc/compiler.hxx
sc/inc/detdata.hxx
sc/inc/document.hxx
sc/inc/fillinfo.hxx
sc/inc/olinetab.hxx
sc/inc/prnsave.hxx
sc/inc/queryparam.hxx
sc/inc/sc.hrc
sc/inc/scabstdlg.hxx
sc/inc/table.hxx
sc/inc/validat.hxx
sc/inc/zforauto.hxx
sc/source/core/data/documen2.cxx
sc/source/core/data/document.cxx
sc/source/core/data/table1.cxx
sc/source/core/tool/address.cxx
sc/source/core/tool/token.cxx
sc/source/filter/excel/frmbase.cxx
sc/source/filter/excel/impop.cxx
sc/source/filter/excel/xename.cxx
sc/source/filter/inc/formel.hxx
sc/source/filter/inc/xename.hxx
sc/source/filter/xml/xmlexprt.cxx
sc/source/filter/xml/xmlnexpi.cxx
sc/source/filter/xml/xmlnexpi.hxx
sc/source/ui/dbgui/filtdlg.cxx
sc/source/ui/inc/docfunc.hxx
sc/source/ui/inc/namedlg.hxx
sc/source/ui/namedlg/namedlg.cxx
sc/source/ui/src/namedlg.src

1 files changed, 8 insertions, 8 deletions

diff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxx
index 58890f7c92c0..6b223dd715e5 100644
--- a/sc/inc/chartarr.hxx
+++ b/sc/inc/chartarr.hxx
@@ -74,7 +74,7 @@ class SC_DLLPUBLIC ScChartArray : public ScDataObject               // only para
     String      aName;
     ScDocument* pDocument;
     ScChartPositioner aPositioner;
-    BOOL        bValid;             // for creation out of SchMemChart
+    sal_Bool        bValid;             // for creation out of SchMemChart
 
 private:
     ScMemChart* CreateMemChartSingle();
@@ -96,14 +96,14 @@ public:
     void    SetRangeList( const ScRange& rNew ) { aPositioner.SetRangeList(rNew); }
     const   ScChartPositionMap* GetPositionMap() { return aPositioner.GetPositionMap(); }
 
-    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    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; }
 
-    BOOL    operator==(const ScChartArray& rCmp) const;
+    sal_Bool    operator==(const ScChartArray& rCmp) const;
 
     ScMemChart* CreateMemChart();
 };
@@ -116,10 +116,10 @@ public:
             ScCollection( rColl ) {}
 
     virtual ScDataObject*   Clone() const;
-    ScChartArray*       operator[](USHORT nIndex) const
+    ScChartArray*       operator[](sal_uInt16 nIndex) const
                         { return (ScChartArray*)At(nIndex); }
 
-    BOOL    operator==(const ScChartCollection& rCmp) const;
+    sal_Bool    operator==(const ScChartCollection& rCmp) const;
 };