diff options
Diffstat (limited to 'tools/source/generic/gen.cxx')
| -rw-r--r-- | tools/source/generic/gen.cxx | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/tools/source/generic/gen.cxx b/tools/source/generic/gen.cxx index b0eb57f1ab73..e4ef3ed58c82 100644 --- a/tools/source/generic/gen.cxx +++ b/tools/source/generic/gen.cxx @@ -44,7 +44,7 @@ SvStream& operator>>( SvStream& rIStream, Pair& rPair ) int i; int i1; int i2; - UINT32 nNum; + sal_uInt32 nNum; rIStream >> cId; i1 = (cId & 0x70) >> 4; @@ -61,7 +61,7 @@ SvStream& operator>>( SvStream& rIStream, Pair& rPair ) } if ( cId & 0x80 ) nNum ^= 0xFFFFFFFF; - rPair.nA = (INT32)nNum; + rPair.nA = (sal_Int32)nNum; nNum = 0; i = i1+i2; @@ -73,7 +73,7 @@ SvStream& operator>>( SvStream& rIStream, Pair& rPair ) } if ( cId & 0x08 ) nNum ^= 0xFFFFFFFF; - rPair.nB = (INT32)nNum; + rPair.nB = (sal_Int32)nNum; } else { @@ -93,11 +93,11 @@ SvStream& operator<<( SvStream& rOStream, const Pair& rPair ) { unsigned char cAry[9]; int i = 1; - UINT32 nNum; + sal_uInt32 nNum; cAry[0] = 0; - nNum = (UINT32)(INT32)rPair.nA; + nNum = (sal_uInt32)(sal_Int32)rPair.nA; if ( rPair.nA < 0 ) { cAry[0] |= 0x80; @@ -138,7 +138,7 @@ SvStream& operator<<( SvStream& rOStream, const Pair& rPair ) cAry[0] |= 0x10; } - nNum = (UINT32)(INT32)rPair.nB; + nNum = (sal_uInt32)(sal_Int32)rPair.nB; if ( rPair.nB < 0 ) { cAry[0] |= 0x08; @@ -323,31 +323,31 @@ void Rectangle::Justify() |* *************************************************************************/ -BOOL Rectangle::IsInside( const Point& rPoint ) const +sal_Bool Rectangle::IsInside( const Point& rPoint ) const { if ( IsEmpty() ) - return FALSE; + return sal_False; - BOOL bRet = TRUE; + sal_Bool bRet = sal_True; if ( nLeft <= nRight ) { if ( (rPoint.X() < nLeft) || (rPoint.X() > nRight) ) - bRet = FALSE; + bRet = sal_False; } else { if ( (rPoint.X() > nLeft) || (rPoint.X() < nRight) ) - bRet = FALSE; + bRet = sal_False; } if ( nTop <= nBottom ) { if ( (rPoint.Y() < nTop) || (rPoint.Y() > nBottom) ) - bRet = FALSE; + bRet = sal_False; } else { if ( (rPoint.Y() > nTop) || (rPoint.Y() < nBottom) ) - bRet = FALSE; + bRet = sal_False; } return bRet; } @@ -362,12 +362,12 @@ BOOL Rectangle::IsInside( const Point& rPoint ) const |* *************************************************************************/ -BOOL Rectangle::IsInside( const Rectangle& rRect ) const +sal_Bool Rectangle::IsInside( const Rectangle& rRect ) const { if ( IsInside( rRect.TopLeft() ) && IsInside( rRect.BottomRight() ) ) - return TRUE; + return sal_True; else - return FALSE; + return sal_False; } /************************************************************************* @@ -380,7 +380,7 @@ BOOL Rectangle::IsInside( const Rectangle& rRect ) const |* *************************************************************************/ -BOOL Rectangle::IsOver( const Rectangle& rRect ) const +sal_Bool Rectangle::IsOver( const Rectangle& rRect ) const { // Wenn sie sich nicht schneiden, ueberlappen sie auch nicht return !GetIntersection( rRect ).IsEmpty(); @@ -402,7 +402,7 @@ SvStream& operator>>( SvStream& rIStream, Rectangle& rRect ) int i2; int i3; int i4; - UINT32 nNum; + sal_uInt32 nNum; rIStream.Read( cIdAry, 2 ); i1 = (cIdAry[0] & 0x70) >> 4; @@ -423,7 +423,7 @@ SvStream& operator>>( SvStream& rIStream, Rectangle& rRect ) iLast = i1; if ( cIdAry[0] & 0x80 ) nNum ^= 0xFFFFFFFF; - rRect.nLeft = (INT32)nNum; + rRect.nLeft = (sal_Int32)nNum; nNum = 0; i = iLast+i2; @@ -436,7 +436,7 @@ SvStream& operator>>( SvStream& rIStream, Rectangle& rRect ) iLast += i2; if ( cIdAry[0] & 0x08 ) nNum ^= 0xFFFFFFFF; - rRect.nTop = (INT32)nNum; + rRect.nTop = (sal_Int32)nNum; nNum = 0; i = iLast+i3; @@ -449,7 +449,7 @@ SvStream& operator>>( SvStream& rIStream, Rectangle& rRect ) iLast += i3; if ( cIdAry[1] & 0x80 ) nNum ^= 0xFFFFFFFF; - rRect.nRight = (INT32)nNum; + rRect.nRight = (sal_Int32)nNum; nNum = 0; i = iLast+i4; @@ -461,7 +461,7 @@ SvStream& operator>>( SvStream& rIStream, Rectangle& rRect ) } if ( cIdAry[1] & 0x08 ) nNum ^= 0xFFFFFFFF; - rRect.nBottom = (INT32)nNum; + rRect.nBottom = (sal_Int32)nNum; } else { @@ -481,12 +481,12 @@ SvStream& operator<<( SvStream& rOStream, const Rectangle& rRect ) { unsigned char cAry[18]; int i = 2; - UINT32 nNum; + sal_uInt32 nNum; cAry[0] = 0; cAry[1] = 0; - nNum = (UINT32)(INT32)rRect.nLeft; + nNum = (sal_uInt32)(sal_Int32)rRect.nLeft; if ( rRect.nLeft < 0 ) { cAry[0] |= 0x80; @@ -527,7 +527,7 @@ SvStream& operator<<( SvStream& rOStream, const Rectangle& rRect ) cAry[0] |= 0x10; } - nNum = (UINT32)(INT32)rRect.nTop; + nNum = (sal_uInt32)(sal_Int32)rRect.nTop; if ( rRect.nTop < 0 ) { cAry[0] |= 0x08; @@ -568,7 +568,7 @@ SvStream& operator<<( SvStream& rOStream, const Rectangle& rRect ) cAry[0] |= 0x01; } - nNum = (UINT32)(INT32)rRect.nRight; + nNum = (sal_uInt32)(sal_Int32)rRect.nRight; if ( rRect.nRight < 0 ) { cAry[1] |= 0x80; @@ -609,7 +609,7 @@ SvStream& operator<<( SvStream& rOStream, const Rectangle& rRect ) cAry[1] |= 0x10; } - nNum = (UINT32)(INT32)rRect.nBottom; + nNum = (sal_uInt32)(sal_Int32)rRect.nBottom; if ( rRect.nBottom < 0 ) { cAry[1] |= 0x08; |