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

diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx
index 62c73963973b..3a9a17eeed1a 100644
--- a/sc/inc/inputopt.hxx
+++ b/sc/inc/inputopt.hxx
@@ -39,16 +39,16 @@ class SvStream;
 class ScInputOptions
 {
 private:
-    USHORT      nMoveDir;           // enum ScDirection
-    BOOL        bMoveSelection;
-    BOOL        bEnterEdit;
-    BOOL        bExtendFormat;
-    BOOL        bRangeFinder;
-    BOOL        bExpandRefs;
-    BOOL        bMarkHeader;
-    BOOL        bUseTabCol;
-    BOOL        bTextWysiwyg;
-    BOOL        bReplCellsWarn;
+    sal_uInt16      nMoveDir;           // enum ScDirection
+    sal_Bool        bMoveSelection;
+    sal_Bool        bEnterEdit;
+    sal_Bool        bExtendFormat;
+    sal_Bool        bRangeFinder;
+    sal_Bool        bExpandRefs;
+    sal_Bool        bMarkHeader;
+    sal_Bool        bUseTabCol;
+    sal_Bool        bTextWysiwyg;
+    sal_Bool        bReplCellsWarn;
 
 public:
                 ScInputOptions();
@@ -57,26 +57,26 @@ public:
 
     void        SetDefaults();
 
-    void        SetMoveDir(USHORT nNew)         { nMoveDir = nNew;       }
-    USHORT      GetMoveDir() const              { return nMoveDir;       }
-    void        SetMoveSelection(BOOL bSet)     { bMoveSelection = bSet; }
-    BOOL        GetMoveSelection() const        { return bMoveSelection; }
-    void        SetEnterEdit(BOOL bSet)         { bEnterEdit = bSet;     }
-    BOOL        GetEnterEdit() const            { return bEnterEdit;     }
-    void        SetExtendFormat(BOOL bSet)      { bExtendFormat = bSet;  }
-    BOOL        GetExtendFormat() const         { return bExtendFormat;  }
-    void        SetRangeFinder(BOOL bSet)       { bRangeFinder = bSet;   }
-    BOOL        GetRangeFinder() const          { return bRangeFinder;   }
-    void        SetExpandRefs(BOOL bSet)        { bExpandRefs = bSet;    }
-    BOOL        GetExpandRefs() const           { return bExpandRefs;    }
-    void        SetMarkHeader(BOOL bSet)        { bMarkHeader = bSet;    }
-    BOOL        GetMarkHeader() const           { return bMarkHeader;    }
-    void        SetUseTabCol(BOOL bSet)         { bUseTabCol = bSet;     }
-    BOOL        GetUseTabCol() const            { return bUseTabCol;     }
-    void        SetTextWysiwyg(BOOL bSet)       { bTextWysiwyg = bSet;   }
-    BOOL        GetTextWysiwyg() const          { return bTextWysiwyg;   }
-    void        SetReplaceCellsWarn(BOOL bSet)  { bReplCellsWarn = bSet; }
-    BOOL        GetReplaceCellsWarn() const     { return bReplCellsWarn; }
+    void        SetMoveDir(sal_uInt16 nNew)         { nMoveDir = nNew;       }
+    sal_uInt16      GetMoveDir() const              { return nMoveDir;       }
+    void        SetMoveSelection(sal_Bool bSet)     { bMoveSelection = bSet; }
+    sal_Bool        GetMoveSelection() const        { return bMoveSelection; }
+    void        SetEnterEdit(sal_Bool bSet)         { bEnterEdit = bSet;     }
+    sal_Bool        GetEnterEdit() const            { return bEnterEdit;     }
+    void        SetExtendFormat(sal_Bool bSet)      { bExtendFormat = bSet;  }
+    sal_Bool        GetExtendFormat() const         { return bExtendFormat;  }
+    void        SetRangeFinder(sal_Bool bSet)       { bRangeFinder = bSet;   }
+    sal_Bool        GetRangeFinder() const          { return bRangeFinder;   }
+    void        SetExpandRefs(sal_Bool bSet)        { bExpandRefs = bSet;    }
+    sal_Bool        GetExpandRefs() const           { return bExpandRefs;    }
+    void        SetMarkHeader(sal_Bool bSet)        { bMarkHeader = bSet;    }
+    sal_Bool        GetMarkHeader() const           { return bMarkHeader;    }
+    void        SetUseTabCol(sal_Bool bSet)         { bUseTabCol = bSet;     }
+    sal_Bool        GetUseTabCol() const            { return bUseTabCol;     }
+    void        SetTextWysiwyg(sal_Bool bSet)       { bTextWysiwyg = bSet;   }
+    sal_Bool        GetTextWysiwyg() const          { return bTextWysiwyg;   }
+    void        SetReplaceCellsWarn(sal_Bool bSet)  { bReplCellsWarn = bSet; }
+    sal_Bool        GetReplaceCellsWarn() const     { return bReplCellsWarn; }
 
     const ScInputOptions&   operator=   ( const ScInputOptions& rOpt );
 };