Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

1 files changed, 16 insertions, 16 deletions

diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx
index a2038b77adbe..4ce3249bda05 100644
--- a/sc/inc/hints.hxx
+++ b/sc/inc/hints.hxx
@@ -38,17 +38,17 @@
 class ScPaintHint : public SfxHint
 {
     ScRange     aRange;
-    USHORT      nParts;
-    BOOL        bPrint;     //  flag indicating whether print/preview if affected
+    sal_uInt16      nParts;
+    sal_Bool        bPrint;     //  flag indicating whether print/preview if affected
 
     ScPaintHint(); // disabled
 
 public:
                     TYPEINFO();
-                    ScPaintHint( const ScRange& rRng, USHORT nPaint = PAINT_ALL );
+                    ScPaintHint( const ScRange& rRng, sal_uInt16 nPaint = PAINT_ALL );
                     ~ScPaintHint();
 
-    void            SetPrintFlag(BOOL bSet) { bPrint = bSet; }
+    void            SetPrintFlag(sal_Bool bSet) { bPrint = bSet; }
 
     const ScRange&  GetRange() const        { return aRange; }
     SCCOL           GetStartCol() const     { return aRange.aStart.Col(); }
@@ -57,8 +57,8 @@ public:
     SCCOL           GetEndCol() const       { return aRange.aEnd.Col(); }
     SCROW           GetEndRow() const       { return aRange.aEnd.Row(); }
     SCTAB           GetEndTab() const       { return aRange.aEnd.Tab(); }
-    USHORT          GetParts() const        { return nParts; }
-    BOOL            GetPrintFlag() const    { return bPrint; }
+    sal_uInt16          GetParts() const        { return nParts; }
+    sal_Bool            GetPrintFlag() const    { return bPrint; }
 };
 
 
@@ -89,14 +89,14 @@ public:
 
 class ScPointerChangedHint : public SfxHint
 {
-    USHORT          nFlags;
+    sal_uInt16          nFlags;
 
 public:
                     TYPEINFO();
 
                     ~ScPointerChangedHint();
 
-    USHORT          GetFlags() const            { return nFlags; }
+    sal_uInt16          GetFlags() const            { return nFlags; }
 };
 
 
@@ -109,12 +109,12 @@ public:
 
 class ScLinkRefreshedHint : public SfxHint
 {
-    USHORT      nLinkType;  // SC_LINKREFTYPE_...
+    sal_uInt16      nLinkType;  // SC_LINKREFTYPE_...
     String      aUrl;       // used for sheet links
     String      aDdeAppl;   // used for dde links:
     String      aDdeTopic;
     String      aDdeItem;
-    BYTE        nDdeMode;
+    sal_uInt8       nDdeMode;
     ScAddress   aDestPos;   // used to identify area links
                             //! also use source data for area links?
 
@@ -124,15 +124,15 @@ public:
                     ~ScLinkRefreshedHint();
 
     void            SetSheetLink( const String& rSourceUrl );
-    void            SetDdeLink( const String& rA, const String& rT, const String& rI, BYTE nM );
+    void            SetDdeLink( const String& rA, const String& rT, const String& rI, sal_uInt8 nM );
     void            SetAreaLink( const ScAddress& rPos );
 
-    USHORT              GetLinkType() const { return nLinkType; }
+    sal_uInt16              GetLinkType() const { return nLinkType; }
     const String&       GetUrl() const      { return aUrl; }
     const String&       GetDdeAppl() const  { return aDdeAppl; }
     const String&       GetDdeTopic() const { return aDdeTopic; }
     const String&       GetDdeItem() const  { return aDdeItem; }
-    BYTE                GetDdeMode() const  { return nDdeMode; }
+    sal_uInt8               GetDdeMode() const  { return nDdeMode; }
     const ScAddress&    GetDestPos() const  { return aDestPos; }
 };
 
@@ -144,17 +144,17 @@ class ScAutoStyleHint : public SfxHint
     ScRange     aRange;
     String      aStyle1;
     String      aStyle2;
-    ULONG       nTimeout;
+    sal_uLong       nTimeout;
 
 public:
                     TYPEINFO();
                     ScAutoStyleHint( const ScRange& rR, const String& rSt1,
-                                        ULONG nT, const String& rSt2 );
+                                        sal_uLong nT, const String& rSt2 );
                     ~ScAutoStyleHint();
 
     const ScRange&  GetRange() const    { return aRange; }
     const String&   GetStyle1() const   { return aStyle1; }
-    UINT32          GetTimeout() const  { return nTimeout; }
+    sal_uInt32          GetTimeout() const  { return nTimeout; }
     const String&   GetStyle2() const   { return aStyle2; }
 };