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, 15 insertions, 15 deletions

diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index 102409509d10..fef859f4b7de 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -76,9 +76,9 @@ private:
 
     ScChartUnoData* pUnoData;
     ScDocument*     pDoc;
-    BOOL            bUsed;  // for ScChartListenerCollection::FreeUnused
-    BOOL            bDirty;
-    BOOL            bSeriesRangesScheduled;
+    sal_Bool            bUsed;  // for ScChartListenerCollection::FreeUnused
+    sal_Bool            bDirty;
+    sal_Bool            bSeriesRangesScheduled;
 
                     // not implemented
     ScChartListener& operator=( const ScChartListener& );
@@ -99,34 +99,34 @@ public:
     com::sun::star::uno::Reference< com::sun::star::chart::XChartDataChangeEventListener >  GetUnoListener() const;
     com::sun::star::uno::Reference< com::sun::star::chart::XChartData >                     GetUnoSource() const;
 
-    BOOL            IsUno() const   { return (pUnoData != NULL); }
+    sal_Bool            IsUno() const   { return (pUnoData != NULL); }
 
     virtual void    Notify( SvtBroadcaster& rBC, const SfxHint& rHint );
     void            StartListeningTo();
     void            EndListeningTo();
     void            ChangeListening( const ScRangeListRef& rRangeListRef,
-                                    BOOL bDirty = FALSE );
+                                    sal_Bool bDirty = false );
     void            Update();
     ScRangeListRef  GetRangeList() const;
     void            SetRangeList( const ScRangeListRef& rNew );
     void            SetRangeList( const ScRange& rNew );
-    BOOL            IsUsed() const { return bUsed; }
-    void            SetUsed( BOOL bFlg ) { bUsed = bFlg; }
-    BOOL            IsDirty() const { return bDirty; }
-    void            SetDirty( BOOL bFlg ) { bDirty = bFlg; }
+    sal_Bool            IsUsed() const { return bUsed; }
+    void            SetUsed( sal_Bool bFlg ) { bUsed = bFlg; }
+    sal_Bool            IsDirty() const { return bDirty; }
+    void            SetDirty( sal_Bool bFlg ) { bDirty = bFlg; }
 
     void            UpdateChartIntersecting( const ScRange& rRange );
 
     // if chart series ranges are to be updated later on (e.g. DeleteTab, InsertTab)
-    void            ScheduleSeriesRanges()      { bSeriesRangesScheduled = TRUE; }
+    void            ScheduleSeriesRanges()      { bSeriesRangesScheduled = sal_True; }
     void            UpdateScheduledSeriesRanges();
     void            UpdateSeriesRanges();
 
     ExternalRefListener* GetExtRefListener();
     void            SetUpdateQueue();
 
-    BOOL            operator==( const ScChartListener& );
-    BOOL            operator!=( const ScChartListener& r )
+    sal_Bool            operator==( const ScChartListener& );
+    sal_Bool            operator!=( const ScChartListener& r )
                         { return !operator==( r ); }
 };
 
@@ -177,7 +177,7 @@ public:
 
     void            ChangeListening( const String& rName,
                                     const ScRangeListRef& rRangeListRef,
-                                    BOOL bDirty = FALSE );
+                                    sal_Bool bDirty = sal_False );
     // use FreeUnused only the way it's used in ScDocument::UpdateChartListenerCollection
     void            FreeUnused();
     void            FreeUno( const com::sun::star::uno::Reference< com::sun::star::chart::XChartDataChangeEventListener >& rListener,
@@ -186,14 +186,14 @@ public:
     void            UpdateDirtyCharts();
     void SC_DLLPUBLIC SetDirty();
     void            SetDiffDirty( const ScChartListenerCollection&,
-                        BOOL bSetChartRangeLists = FALSE );
+                        sal_Bool bSetChartRangeLists = false );
 
     void            SetRangeDirty( const ScRange& rRange );     // for example rows/columns
 
     void            UpdateScheduledSeriesRanges();
     void            UpdateChartsContainingTab( SCTAB nTab );
 
-    BOOL            operator==( const ScChartListenerCollection& );
+    sal_Bool            operator==( const ScChartListenerCollection& );
 
     /**
      * Start listening on hide/show change within specified cell range.  A