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

diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx
index 1aaddbf029d1..e2a1f3a6cdcc 100644
--- a/sc/inc/validat.hxx
+++ b/sc/inc/validat.hxx
@@ -68,8 +68,8 @@ class SC_DLLPUBLIC ScValidationData : public ScConditionEntry
     sal_uInt32          nKey;               // index in attributes
 
     ScValidationMode    eDataMode;
-    BOOL                bShowInput;
-    BOOL                bShowError;
+    sal_Bool                bShowInput;
+    sal_Bool                bShowError;
     ScValidErrorStyle   eErrorStyle;
     sal_Int16           mnListType;         // selection list type: none, unsorted, sorted.
     String              aInputTitle;
@@ -77,12 +77,12 @@ class SC_DLLPUBLIC ScValidationData : public ScConditionEntry
     String              aErrorTitle;
     String              aErrorMessage;
 
-    BOOL                bIsUsed;            // temporary during saving
+    sal_Bool                bIsUsed;            // temporary during saving
 
-    BOOL            DoMacro( const ScAddress& rPos, const String& rInput,
+    sal_Bool            DoMacro( const ScAddress& rPos, const String& rInput,
                                 ScFormulaCell* pCell, Window* pParent ) const;
 
-    BOOL            DoScript( const ScAddress& rPos, const String& rInput,
+    sal_Bool            DoScript( const ScAddress& rPos, const String& rInput,
                                 ScFormulaCell* pCell, Window* pParent ) const;
 
     using ScConditionEntry::operator==;
@@ -112,11 +112,11 @@ public:
     void            SetError( const String& rTitle, const String& rMsg,
                                 ScValidErrorStyle eStyle );
 
-    BOOL            GetInput( String& rTitle, String& rMsg ) const
+    sal_Bool            GetInput( String& rTitle, String& rMsg ) const
                         { rTitle = aInputTitle; rMsg = aInputMessage; return bShowInput; }
-    BOOL            GetErrMsg( String& rTitle, String& rMsg, ScValidErrorStyle& rStyle ) const;
+    sal_Bool            GetErrMsg( String& rTitle, String& rMsg, ScValidErrorStyle& rStyle ) const;
 
-    BOOL            HasErrMsg() const       { return bShowError; }
+    sal_Bool            HasErrMsg() const       { return bShowError; }
 
     ScValidationMode GetDataMode() const    { return eDataMode; }
 
@@ -134,27 +134,27 @@ public:
     bool            FillSelectionList( TypedScStrCollection& rStrings, const ScAddress& rPos ) const;
 
                     //  with string: during input, with cell: for detective / RC_FORCED
-    BOOL            IsDataValid( const String& rTest, const ScPatternAttr& rPattern,
+    sal_Bool            IsDataValid( const String& rTest, const ScPatternAttr& rPattern,
                                     const ScAddress& rPos ) const;
-    BOOL            IsDataValid( ScBaseCell* pCell, const ScAddress& rPos ) const;
+    sal_Bool            IsDataValid( ScBaseCell* pCell, const ScAddress& rPos ) const;
 
                     // TRUE -> break
-    BOOL            DoError( Window* pParent, const String& rInput, const ScAddress& rPos ) const;
+    sal_Bool            DoError( Window* pParent, const String& rInput, const ScAddress& rPos ) const;
     void            DoCalcError( ScFormulaCell* pCell ) const;
 
-    BOOL            IsEmpty() const;
+    sal_Bool            IsEmpty() const;
     sal_uInt32      GetKey() const          { return nKey; }
     void            SetKey(sal_uInt32 nNew) { nKey = nNew; }    // only if not inserted!
 
-    void            SetUsed(BOOL bSet)      { bIsUsed = bSet; }
-    BOOL            IsUsed() const          { return bIsUsed; }
+    void            SetUsed(sal_Bool bSet)      { bIsUsed = bSet; }
+    sal_Bool            IsUsed() const          { return bIsUsed; }
 
-    BOOL            EqualEntries( const ScValidationData& r ) const;    // for undo
+    sal_Bool            EqualEntries( const ScValidationData& r ) const;    // for undo
 
     //  sort (using PTRARR) by index
     //  operator== only for sorting
-    BOOL operator ==( const ScValidationData& r ) const { return nKey == r.nKey; }
-    BOOL operator < ( const ScValidationData& r ) const { return nKey <  r.nKey; }
+    sal_Bool operator ==( const ScValidationData& r ) const { return nKey == r.nKey; }
+    sal_Bool operator < ( const ScValidationData& r ) const { return nKey <  r.nKey; }
 
 private:
     /** Tries to fill the passed collection with list validation entries.
@@ -203,7 +203,7 @@ public:
                                 const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
     void    UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos );
 
-    BOOL    operator==( const ScValidationDataList& r ) const;      // for ref-undo
+    sal_Bool    operator==( const ScValidationDataList& r ) const;      // for ref-undo
 };
 
 #endif