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

diff --git a/sc/inc/fillinfo.hxx b/sc/inc/fillinfo.hxx
index d58f417e3f2e..f716662ebc23 100644
--- a/sc/inc/fillinfo.hxx
+++ b/sc/inc/fillinfo.hxx
@@ -41,16 +41,16 @@ class SvxShadowItem;
 class ScBaseCell;
 class ScPatternAttr;
 
-const BYTE SC_ROTDIR_NONE       = 0;
-const BYTE SC_ROTDIR_STANDARD   = 1;
-const BYTE SC_ROTDIR_LEFT       = 2;
-const BYTE SC_ROTDIR_RIGHT      = 3;
-const BYTE SC_ROTDIR_CENTER     = 4;
+const sal_uInt8 SC_ROTDIR_NONE       = 0;
+const sal_uInt8 SC_ROTDIR_STANDARD   = 1;
+const sal_uInt8 SC_ROTDIR_LEFT       = 2;
+const sal_uInt8 SC_ROTDIR_RIGHT      = 3;
+const sal_uInt8 SC_ROTDIR_CENTER     = 4;
 
-const BYTE SC_CLIPMARK_NONE     = 0;
-const BYTE SC_CLIPMARK_LEFT     = 1;
-const BYTE SC_CLIPMARK_RIGHT    = 2;
-const BYTE SC_CLIPMARK_SIZE     = 64;
+const sal_uInt8 SC_CLIPMARK_NONE     = 0;
+const sal_uInt8 SC_CLIPMARK_LEFT     = 1;
+const sal_uInt8 SC_CLIPMARK_RIGHT    = 2;
+const sal_uInt8 SC_CLIPMARK_SIZE     = 64;
 
 enum ScShadowPart
 {
@@ -81,25 +81,25 @@ struct CellInfo
 
     ScShadowPart                eHShadowPart : 4;           // shadow effective for drawing
     ScShadowPart                eVShadowPart : 4;
-    BYTE                        nClipMark;
-    USHORT                      nWidth;
-    BYTE                        nRotateDir;
-
-    BOOL                        bMarked : 1;
-    BOOL                        bEmptyCellText : 1;
-
-    BOOL                        bMerged : 1;
-    BOOL                        bHOverlapped : 1;
-    BOOL                        bVOverlapped : 1;
-    BOOL                        bAutoFilter : 1;
-    BOOL                        bPushButton : 1;
+    sal_uInt8                        nClipMark;
+    sal_uInt16                      nWidth;
+    sal_uInt8                        nRotateDir;
+
+    sal_Bool                        bMarked : 1;
+    sal_Bool                        bEmptyCellText : 1;
+
+    sal_Bool                        bMerged : 1;
+    sal_Bool                        bHOverlapped : 1;
+    sal_Bool                        bVOverlapped : 1;
+    sal_Bool                        bAutoFilter : 1;
+    sal_Bool                        bPushButton : 1;
     bool                        bPopupButton: 1;
     bool                        bFilterActive:1;
 
-    BOOL                        bPrinted : 1;               // when required (pagebreak mode)
+    sal_Bool                        bPrinted : 1;               // when required (pagebreak mode)
 
-    BOOL                        bHideGrid : 1;              // output-internal
-    BOOL                        bEditEngine : 1;            // output-internal
+    sal_Bool                        bHideGrid : 1;              // output-internal
+    sal_Bool                        bEditEngine : 1;            // output-internal
 };
 
 const SCCOL SC_ROTMAX_NONE = SCCOL_MAX;
@@ -108,15 +108,15 @@ struct RowInfo
 {
     CellInfo*           pCellInfo;
 
-    USHORT              nHeight;
+    sal_uInt16              nHeight;
     SCROW               nRowNo;
     SCCOL               nRotMaxCol;         // SC_ROTMAX_NONE, if nothing
 
-    BOOL                bEmptyBack;
-    BOOL                bEmptyText;
-    BOOL                bAutoFilter;
-    BOOL                bPushButton;
-    BOOL                bChanged;           // TRUE, if not tested
+    sal_Bool                bEmptyBack;
+    sal_Bool                bEmptyText;
+    sal_Bool                bAutoFilter;
+    sal_Bool                bPushButton;
+    sal_Bool                bChanged;           // TRUE, if not tested
 
     inline explicit     RowInfo() : pCellInfo( 0 ) {}
 
@@ -129,7 +129,7 @@ struct ScTableInfo
 {
     svx::frame::Array   maArray;
     RowInfo*            mpRowInfo;
-    USHORT              mnArrCount;
+    sal_uInt16              mnArrCount;
     bool                mbPageMode;
 
     explicit            ScTableInfo();