diff options
| author | Carsten Driesner <cd@openoffice.org> | 2011-01-12 15:07:10 +0100 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2011-01-12 15:07:10 +0100 |
| commit | b7f5f44df674c7e47a8c1597bf082a8292b14efd (patch) | |
| tree | f0f0217f060ad2b9587f85c1dfecd427a164bc5d /vcl | |
| parent | 6e295e93909a5920b37e919537badfd6e10d0b94 (diff) | |
removetooltypes01: Exchange misleading type sal_uIntPtr with sal_uLong
Diffstat (limited to 'vcl')
231 files changed, 1920 insertions, 1922 deletions
diff --git a/vcl/inc/vcl/alpha.hxx b/vcl/inc/vcl/alpha.hxx index 909d135ff0b1..9913458be0e4 100644 --- a/vcl/inc/vcl/alpha.hxx +++ b/vcl/inc/vcl/alpha.hxx @@ -72,26 +72,26 @@ public: Size GetSizePixel() const { return Bitmap::GetSizePixel(); } void SetSizePixel( const Size& rNewSize ) { Bitmap::SetSizePixel( rNewSize ); } - sal_uIntPtr GetSizeBytes() const { return Bitmap::GetSizeBytes(); } - sal_uIntPtr GetChecksum() const { return Bitmap::GetChecksum(); } + sal_uLong GetSizeBytes() const { return Bitmap::GetSizeBytes(); } + sal_uLong GetChecksum() const { return Bitmap::GetChecksum(); } Bitmap GetBitmap() const; public: sal_Bool Crop( const Rectangle& rRectPixel ); - sal_Bool Expand( sal_uIntPtr nDX, sal_uIntPtr nDY, sal_uInt8* pInitTransparency = NULL ); + sal_Bool Expand( sal_uLong nDX, sal_uLong nDY, sal_uInt8* pInitTransparency = NULL ); sal_Bool CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, const AlphaMask* pAlphaSrc = NULL ); sal_Bool Erase( sal_uInt8 cTransparency ); sal_Bool Invert(); - sal_Bool Mirror( sal_uIntPtr nMirrorFlags ); - sal_Bool Scale( const Size& rNewSize, sal_uIntPtr nScaleFlag = BMP_SCALE_FAST ); - sal_Bool Scale( const double& rScaleX, const double& rScaleY, sal_uIntPtr nScaleFlag = BMP_SCALE_FAST ); + sal_Bool Mirror( sal_uLong nMirrorFlags ); + sal_Bool Scale( const Size& rNewSize, sal_uLong nScaleFlag = BMP_SCALE_FAST ); + sal_Bool Scale( const double& rScaleX, const double& rScaleY, sal_uLong nScaleFlag = BMP_SCALE_FAST ); sal_Bool Rotate( long nAngle10, sal_uInt8 cFillTransparency ); sal_Bool Replace( const Bitmap& rMask, sal_uInt8 rReplaceTransparency ); - sal_Bool Replace( sal_uInt8 cSearchTransparency, sal_uInt8 cReplaceTransparency, sal_uIntPtr nTol = 0UL ); + sal_Bool Replace( sal_uInt8 cSearchTransparency, sal_uInt8 cReplaceTransparency, sal_uLong nTol = 0UL ); sal_Bool Replace( sal_uInt8* pSearchTransparencies, sal_uInt8* pReplaceTransparencies, - sal_uIntPtr nColorCount, sal_uIntPtr* pTols = NULL ); + sal_uLong nColorCount, sal_uLong* pTols = NULL ); public: diff --git a/vcl/inc/vcl/animate.hxx b/vcl/inc/vcl/animate.hxx index 979aef93b967..be3d8768661b 100644 --- a/vcl/inc/vcl/animate.hxx +++ b/vcl/inc/vcl/animate.hxx @@ -105,7 +105,7 @@ struct VCL_DLLPUBLIC AnimationBitmap rAnimBmp.aBmpEx.IsEqual( aBmpEx ) ); } - sal_uIntPtr GetChecksum() const; + sal_uLong GetChecksum() const; }; // ------------------- @@ -140,7 +140,7 @@ struct AInfo class VCL_DLLPUBLIC Animation { - SAL_DLLPRIVATE static sal_uIntPtr mnAnimCount; + SAL_DLLPRIVATE static sal_uLong mnAnimCount; List maList; List maAInfoList; @@ -163,14 +163,14 @@ class VCL_DLLPUBLIC Animation //#if 0 // _SOLAR__PRIVATE - SAL_DLLPRIVATE void ImplRestartTimer( sal_uIntPtr nTimeout ); + SAL_DLLPRIVATE void ImplRestartTimer( sal_uLong nTimeout ); DECL_DLLPRIVATE_LINK( ImplTimeoutHdl, Timer* ); public: SAL_DLLPRIVATE static void ImplIncAnimCount() { mnAnimCount++; } SAL_DLLPRIVATE static void ImplDecAnimCount() { mnAnimCount--; } - SAL_DLLPRIVATE sal_uIntPtr ImplGetCurPos() const { return mnPos; } + SAL_DLLPRIVATE sal_uLong ImplGetCurPos() const { return mnPos; } //#endif @@ -209,8 +209,8 @@ public: const BitmapEx& GetBitmapEx() const { return maBitmapEx; } void SetBitmapEx( const BitmapEx& rBmpEx ) { maBitmapEx = rBmpEx; } - sal_uIntPtr GetLoopCount() const { return mnLoopCount; } - void SetLoopCount( const sal_uIntPtr nLoopCount ); + sal_uLong GetLoopCount() const { return mnLoopCount; } + void SetLoopCount( const sal_uLong nLoopCount ); void ResetLoopCount(); void SetCycleMode( CycleMode eMode ); @@ -225,8 +225,8 @@ public: void Replace( const AnimationBitmap& rNewAnimationBmp, sal_uInt16 nAnimation ); List* GetAInfoList() { return &maAInfoList; } - sal_uIntPtr GetSizeBytes() const; - sal_uIntPtr GetChecksum() const; + sal_uLong GetSizeBytes() const; + sal_uLong GetChecksum() const; public: @@ -234,8 +234,8 @@ public: sal_Bool ReduceColors( sal_uInt16 nNewColorCount, BmpReduce eReduce = BMP_REDUCE_SIMPLE ); sal_Bool Invert(); - sal_Bool Mirror( sal_uIntPtr nMirrorFlags ); - sal_Bool Dither( sal_uIntPtr nDitherFlags = BMP_DITHER_MATRIX ); + sal_Bool Mirror( sal_uLong nMirrorFlags ); + sal_Bool Dither( sal_uLong nDitherFlags = BMP_DITHER_MATRIX ); sal_Bool Adjust( short nLuminancePercent = 0, short nContrastPercent = 0, short nChannelRPercent = 0, diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx index be0d8720e333..cfcd863dfb85 100644 --- a/vcl/inc/vcl/bitmap.hxx +++ b/vcl/inc/vcl/bitmap.hxx @@ -164,14 +164,14 @@ class VCL_DLLPUBLIC BmpFilterParam private: BmpFilter meFilter; - sal_uIntPtr mnProgressStart; - sal_uIntPtr mnProgressEnd; + sal_uLong mnProgressStart; + sal_uLong mnProgressEnd; public: struct MosaicTileSize { - sal_uIntPtr mnTileWidth; - sal_uIntPtr mnTileHeight; + sal_uLong mnTileWidth; + sal_uLong mnTileHeight; }; struct EmbossAngles @@ -192,25 +192,25 @@ private: public: - BmpFilterParam( sal_uIntPtr nProgressStart = 0, sal_uIntPtr nProgressEnd = 0 ) : + BmpFilterParam( sal_uLong nProgressStart = 0, sal_uLong nProgressEnd = 0 ) : meFilter( BMP_FILTER_UNKNOWN ), mnProgressStart( nProgressStart ), mnProgressEnd( nProgressEnd ) {} - BmpFilterParam( sal_uInt8 cSolarGreyThreshold, sal_uIntPtr nProgressStart = 0, sal_uIntPtr nProgressEnd = 0 ) : + BmpFilterParam( sal_uInt8 cSolarGreyThreshold, sal_uLong nProgressStart = 0, sal_uLong nProgressEnd = 0 ) : meFilter( BMP_FILTER_SOLARIZE ), mnProgressStart( nProgressStart ), mnProgressEnd( nProgressEnd ), mcSolarGreyThreshold( cSolarGreyThreshold ) {} - BmpFilterParam( sal_uInt16 nSepiaPercent, sal_uIntPtr nProgressStart = 0, sal_uIntPtr nProgressEnd = 0 ) : + BmpFilterParam( sal_uInt16 nSepiaPercent, sal_uLong nProgressStart = 0, sal_uLong nProgressEnd = 0 ) : meFilter( BMP_FILTER_SEPIA ), mnProgressStart( nProgressStart ), mnProgressEnd( nProgressEnd ), mnSepiaPercent( nSepiaPercent ) {} - BmpFilterParam( const Size& rMosaicTileSize, sal_uIntPtr nProgressStart = 0, sal_uIntPtr nProgressEnd = 0 ) : + BmpFilterParam( const Size& rMosaicTileSize, sal_uLong nProgressStart = 0, sal_uLong nProgressEnd = 0 ) : meFilter( BMP_FILTER_MOSAIC ), mnProgressStart( nProgressStart ), mnProgressEnd( nProgressEnd ) { maMosaicTileSize.mnTileWidth = rMosaicTileSize.Width(); maMosaicTileSize.mnTileHeight= rMosaicTileSize.Height(); } BmpFilterParam( sal_uInt16 nEmbossAzimuthAngle100, sal_uInt16 nEmbossElevationAngle100, - sal_uIntPtr nProgressStart = 0, sal_uIntPtr nProgressEnd = 0 ) : + sal_uLong nProgressStart = 0, sal_uLong nProgressEnd = 0 ) : meFilter( BMP_FILTER_EMBOSS_GREY ), mnProgressStart( nProgressStart ), mnProgressEnd( nProgressEnd ) { maEmbossAngles.mnAzimuthAngle100 = nEmbossAzimuthAngle100; @@ -267,8 +267,8 @@ public: SAL_DLLPRIVATE void ImplSetImpBitmap( ImpBitmap* pImpBmp ); SAL_DLLPRIVATE void ImplAssignWithSize( const Bitmap& rBitmap ); - SAL_DLLPRIVATE static sal_Bool ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, sal_uIntPtr nOffset ); - SAL_DLLPRIVATE static sal_Bool ImplReadDIBFileHeader( SvStream& rIStm, sal_uIntPtr& rOffset ); + SAL_DLLPRIVATE static sal_Bool ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, sal_uLong nOffset ); + SAL_DLLPRIVATE static sal_Bool ImplReadDIBFileHeader( SvStream& rIStm, sal_uLong& rOffset ); SAL_DLLPRIVATE static sal_Bool ImplReadDIBInfoHeader( SvStream& rIStm, DIBInfoHeader& rHeader, sal_Bool& bTopDown ); SAL_DLLPRIVATE static sal_Bool ImplReadDIBPalette( SvStream& rIStm, BitmapWriteAccess& rAcc, sal_Bool bQuad ); SAL_DLLPRIVATE static sal_Bool ImplReadDIBBits( SvStream& rIStm, DIBInfoHeader& rHeader, BitmapWriteAccess& rAcc, sal_Bool bTopDown ); @@ -276,7 +276,7 @@ public: SAL_DLLPRIVATE static sal_Bool ImplWriteDIBFileHeader( SvStream& rOStm, BitmapReadAccess& rAcc ); SAL_DLLPRIVATE static sal_Bool ImplWriteDIBPalette( SvStream& rOStm, BitmapReadAccess& rAcc ); SAL_DLLPRIVATE static sal_Bool ImplWriteDIBBits( SvStream& rOStm, BitmapReadAccess& rAcc, - sal_uIntPtr nCompression, sal_uInt32& rImageSize ); + sal_uLong nCompression, sal_uInt32& rImageSize ); SAL_DLLPRIVATE static void ImplDecodeRLE( sal_uInt8* pBuffer, DIBInfoHeader& rHeader, BitmapWriteAccess& rAcc, sal_Bool bRLE4 ); SAL_DLLPRIVATE static sal_Bool ImplWriteRLE( SvStream& rOStm, BitmapReadAccess& rAcc, sal_Bool bRLE4 ); @@ -295,7 +295,7 @@ public: SAL_DLLPRIVATE sal_Bool ImplReduceSimple( sal_uInt16 nColorCount ); SAL_DLLPRIVATE sal_Bool ImplReducePopular( sal_uInt16 nColorCount ); SAL_DLLPRIVATE sal_Bool ImplReduceMedian( sal_uInt16 nColorCount ); - SAL_DLLPRIVATE void ImplMedianCut( sal_uIntPtr* pColBuf, BitmapPalette& rPal, + SAL_DLLPRIVATE void ImplMedianCut( sal_uLong* pColBuf, BitmapPalette& rPal, long nR1, long nR2, long nG1, long nG2, long nB1, long nB2, long nColors, long nPixels, long& rIndex ); SAL_DLLPRIVATE sal_Bool ImplConvolute3( const long* pMatrix, long nDivisor, @@ -349,8 +349,8 @@ public: sal_uInt16 GetBitCount() const; - inline sal_uIntPtr GetColorCount() const; - inline sal_uIntPtr GetSizeBytes() const; + inline sal_uLong GetColorCount() const; + inline sal_uLong GetSizeBytes() const; sal_Bool HasGreyPalette() const; /** get system dependent bitmap data @@ -361,7 +361,7 @@ public: */ bool GetSystemData( BitmapSystemData& rData ) const; - sal_uIntPtr GetChecksum() const; + sal_uLong GetChecksum() const; Bitmap CreateDisplayBitmap( OutputDevice* pDisplay ); Bitmap GetColorTransformedBitmap( BmpColorMode eColorMode ) const; @@ -407,7 +407,7 @@ public: @param pDitherPal A custom palette to be used when dithering (not yet implemented, leave NULL) */ - sal_Bool Dither( sal_uIntPtr nDitherFlags = BMP_DITHER_MATRIX ); + sal_Bool Dither( sal_uLong nDitherFlags = BMP_DITHER_MATRIX ); /** Crop the bitmap @@ -440,7 +440,7 @@ public: not only returned when the operation failed, but also if nothing had to be done, e.g. because nDX and nDY were zero. */ - sal_Bool Expand( sal_uIntPtr nDX, sal_uIntPtr nDY, + sal_Bool Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor = NULL ); /** Copy a rectangular area from another bitmap @@ -523,7 +523,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Mirror( sal_uIntPtr nMirrorFlags ); + sal_Bool Mirror( sal_uLong nMirrorFlags ); /** Scale the bitmap @@ -536,7 +536,7 @@ public: @return sal_True, if the operation was completed successfully. */ sal_Bool Scale( const Size& rNewSize, - sal_uIntPtr nScaleFlag = BMP_SCALE_FAST ); + sal_uLong nScaleFlag = BMP_SCALE_FAST ); /** Scale the bitmap @@ -549,7 +549,7 @@ public: @return sal_True, if the operation was completed successfully. */ sal_Bool Scale( const double& rScaleX, const double& rScaleY, - sal_uIntPtr nScaleFlag = BMP_SCALE_FAST ); + sal_uLong nScaleFlag = BMP_SCALE_FAST ); /** Rotate bitmap by the specified angle @@ -582,7 +582,7 @@ public: @return the resulting bitmask. */ - Bitmap CreateMask( const Color& rTransColor, sal_uIntPtr nTol = 0UL ) const; + Bitmap CreateMask( const Color& rTransColor, sal_uLong nTol = 0UL ) const; /** Create region of similar colors in a given rectangle @@ -636,7 +636,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uIntPtr nTol = 0 ); + sal_Bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol = 0 ); /** Replace all pixel having one the search colors with the corresponding replace color @@ -657,7 +657,7 @@ public: @return sal_True, if the operation was completed successfully. */ sal_Bool Replace( const Color* pSearchColors, const Color* rReplaceColors, - sal_uIntPtr nColorCount, sal_uIntPtr* pTols = NULL ); + sal_uLong nColorCount, sal_uLong* pTols = NULL ); /** Convert the bitmap to a PolyPolygon @@ -677,7 +677,7 @@ public: @return sal_True, if the operation was completed successfully. */ sal_Bool Vectorize( PolyPolygon& rPolyPoly, - sal_uIntPtr nFlags = BMP_VECTORIZE_OUTER, + sal_uLong nFlags = BMP_VECTORIZE_OUTER, const Link* pProgress = NULL ); /** Convert the bitmap to a meta file @@ -702,7 +702,7 @@ public: @return sal_True, if the operation was completed successfully. */ sal_Bool Vectorize( GDIMetaFile& rMtf, sal_uInt8 cReduce = 0, - sal_uIntPtr nFlags = BMP_VECTORIZE_INNER, + sal_uLong nFlags = BMP_VECTORIZE_INNER, const Link* pProgress = NULL ); /** Change various global color characteristics @@ -838,17 +838,17 @@ inline void Bitmap::SetPrefSize( const Size& rSize ) // ------------------------------------------------------------------ -inline sal_uIntPtr Bitmap::GetColorCount() const +inline sal_uLong Bitmap::GetColorCount() const { - return( 1UL << (sal_uIntPtr) GetBitCount() ); + return( 1UL << (sal_uLong) GetBitCount() ); } // ------------------------------------------------------------------ -inline sal_uIntPtr Bitmap::GetSizeBytes() const +inline sal_uLong Bitmap::GetSizeBytes() const { const Size aSizePix( GetSizePixel() ); - return( ( (sal_uIntPtr) aSizePix.Width() * aSizePix.Height() * GetBitCount() ) >> 3UL ); + return( ( (sal_uLong) aSizePix.Width() * aSizePix.Height() * GetBitCount() ) >> 3UL ); } #endif // _SV_BITMAP_HXX diff --git a/vcl/inc/vcl/bitmapex.hxx b/vcl/inc/vcl/bitmapex.hxx index a2259833ca22..b977adae5c95 100644 --- a/vcl/inc/vcl/bitmapex.hxx +++ b/vcl/inc/vcl/bitmapex.hxx @@ -125,8 +125,8 @@ public: void SetTransparentColor( const Color& rColor ) { aTransparentColor = rColor; } sal_uInt16 GetBitCount() const { return aBitmap.GetBitCount(); } - sal_uIntPtr GetSizeBytes() const; - sal_uIntPtr GetChecksum() const; + sal_uLong GetSizeBytes() const; + sal_uLong GetChecksum() const; public: @@ -161,7 +161,7 @@ public: @param nDitherFlags The algorithm to be used for dithering */ - sal_Bool Dither( sal_uIntPtr nDitherFlags = BMP_DITHER_MATRIX ); + sal_Bool Dither( sal_uLong nDitherFlags = BMP_DITHER_MATRIX ); /** Crop the bitmap @@ -194,7 +194,7 @@ public: not only returned when the operation failed, but also if nothing had to be done, e.g. because nDX and nDY were zero. */ - sal_Bool Expand( sal_uIntPtr nDX, sal_uIntPtr nDY, + sal_Bool Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor = NULL, sal_Bool bExpandTransparent = sal_False ); @@ -247,7 +247,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Mirror( sal_uIntPtr nMirrorFlags ); + sal_Bool Mirror( sal_uLong nMirrorFlags ); /** Scale the bitmap @@ -259,7 +259,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Scale( const Size& rNewSize, sal_uIntPtr nScaleFlag = BMP_SCALE_FAST ); + sal_Bool Scale( const Size& rNewSize, sal_uLong nScaleFlag = BMP_SCALE_FAST ); /** Scale the bitmap @@ -271,7 +271,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Scale( const double& rScaleX, const double& rScaleY, sal_uIntPtr nScaleFlag = BMP_SCALE_FAST ); + sal_Bool Scale( const double& rScaleX, const double& rScaleY, sal_uLong nScaleFlag = BMP_SCALE_FAST ); /** Rotate bitmap by the specified angle @@ -303,7 +303,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uIntPtr nTol = 0 ); + sal_Bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol = 0 ); /** Replace all pixel having one the search colors with the corresponding replace color @@ -324,7 +324,7 @@ public: @return sal_True, if the operation was completed successfully. */ sal_Bool Replace( const Color* pSearchColors, const Color* pReplaceColors, - sal_uIntPtr nColorCount, const sal_uIntPtr* pTols = NULL ); + sal_uLong nColorCount, const sal_uLong* pTols = NULL ); /** Change various global color characteristics diff --git a/vcl/inc/vcl/bmpacc.hxx b/vcl/inc/vcl/bmpacc.hxx index d9f0490eee27..def83d9910b7 100644 --- a/vcl/inc/vcl/bmpacc.hxx +++ b/vcl/inc/vcl/bmpacc.hxx @@ -105,7 +105,7 @@ protected: SAL_DLLPRIVATE void ImplCreate( Bitmap& rBitmap ); SAL_DLLPRIVATE void ImplDestroy(); -SAL_DLLPRIVATE sal_Bool ImplSetAccessPointers( sal_uIntPtr nFormat ); +SAL_DLLPRIVATE sal_Bool ImplSetAccessPointers( sal_uLong nFormat ); public: @@ -150,8 +150,8 @@ public: inline sal_Bool IsTopDown() const; inline sal_Bool IsBottomUp() const; - inline sal_uIntPtr GetScanlineFormat() const; - inline sal_uIntPtr GetScanlineSize() const; + inline sal_uLong GetScanlineFormat() const; + inline sal_uLong GetScanlineSize() const; inline sal_uInt16 GetBitCount() const; inline BitmapColor GetBestMatchingColor( const BitmapColor& rBitmapColor ); @@ -189,7 +189,7 @@ public: void CopyScanline( long nY, const BitmapReadAccess& rReadAcc ); void CopyScanline( long nY, ConstScanline aSrcScanline, - sal_uIntPtr nSrcScanlineFormat, sal_uIntPtr nSrcScanlineSize ); + sal_uLong nSrcScanlineFormat, sal_uLong nSrcScanlineSize ); void CopyBuffer( const BitmapReadAccess& rReadAcc ); @@ -350,7 +350,7 @@ inline sal_Bool BitmapReadAccess::IsBottomUp() const // ------------------------------------------------------------------ -inline sal_uIntPtr BitmapReadAccess::GetScanlineFormat() const +inline sal_uLong BitmapReadAccess::GetScanlineFormat() const { DBG_ASSERT( mpBuffer, "Access is not valid!" ); return( mpBuffer ? BMP_SCANLINE_FORMAT( mpBuffer->mnFormat ) : 0UL ); @@ -358,7 +358,7 @@ inline sal_uIntPtr BitmapReadAccess::GetScanlineFormat() const // ------------------------------------------------------------------ -inline sal_uIntPtr BitmapReadAccess::GetScanlineSize() const +inline sal_uLong BitmapReadAccess::GetScanlineSize() const { DBG_ASSERT( mpBuffer, "Access is not valid!" ); return( mpBuffer ? mpBuffer->mnScanlineSize : 0UL ); @@ -444,7 +444,7 @@ inline const BitmapColor& BitmapReadAccess::GetBestPaletteColor( const BitmapCol inline sal_Bool BitmapReadAccess::HasColorMask() const { DBG_ASSERT( mpBuffer, "Access is not valid!" ); - const sal_uIntPtr nFormat = BMP_SCANLINE_FORMAT( mpBuffer->mnFormat ); + const sal_uLong nFormat = BMP_SCANLINE_FORMAT( mpBuffer->mnFormat ); return( nFormat == BMP_FORMAT_8BIT_TC_MASK || nFormat == BMP_FORMAT_16BIT_TC_MSB_MASK || diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx index b1b4c03b320b..b29d56377b0c 100644 --- a/vcl/inc/vcl/button.hxx +++ b/vcl/inc/vcl/button.hxx @@ -57,9 +57,9 @@ private: public: SAL_DLLPRIVATE sal_uInt16 ImplGetButtonState() const; SAL_DLLPRIVATE sal_uInt16& ImplGetButtonState(); - SAL_DLLPRIVATE sal_uInt16 ImplGetTextStyle( XubString& rText, WinBits nWinStyle, sal_uIntPtr nDrawFlags ); + SAL_DLLPRIVATE sal_uInt16 ImplGetTextStyle( XubString& rText, WinBits nWinStyle, sal_uLong nDrawFlags ); SAL_DLLPRIVATE void ImplDrawAlignedImage( OutputDevice* pDev, Point& rPos, Size& rSize, - sal_Bool bLayout, sal_uIntPtr nImageSep, sal_uIntPtr nDrawFlags, + sal_Bool bLayout, sal_uLong nImageSep, sal_uLong nDrawFlags, sal_uInt16 nTextStyle, Rectangle *pSymbolRect=NULL, bool bAddImageSep = false ); SAL_DLLPRIVATE void ImplSetFocusRect( const Rectangle &rFocusRect ); SAL_DLLPRIVATE const Rectangle& ImplGetFocusRect() const; @@ -131,11 +131,11 @@ protected: SAL_DLLPRIVATE void ImplInitPushButtonData(); SAL_DLLPRIVATE WinBits ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); - SAL_DLLPRIVATE void ImplDrawPushButtonContent( OutputDevice* pDev, sal_uIntPtr nDrawFlags, + SAL_DLLPRIVATE void ImplDrawPushButtonContent( OutputDevice* pDev, sal_uLong nDrawFlags, const Rectangle& rRect, bool bLayout, bool bMenuBtnSep ); SAL_DLLPRIVATE void ImplDrawPushButton( bool bLayout = false ); using Button::ImplGetTextStyle; - SAL_DLLPRIVATE sal_uInt16 ImplGetTextStyle( sal_uIntPtr nDrawFlags ) const; + SAL_DLLPRIVATE sal_uInt16 ImplGetTextStyle( sal_uLong nDrawFlags ) const; SAL_DLLPRIVATE sal_Bool IsSymbol() const { return ( (meSymbol != SYMBOL_NOSYMBOL) && (meSymbol != SYMBOL_IMAGE) ); } SAL_DLLPRIVATE sal_Bool IsImage() const { return Button::HasImage(); } @@ -171,7 +171,7 @@ public: virtual void KeyInput( const KeyEvent& rKEvt ); virtual void KeyUp( const KeyEvent& rKEvt ); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void GetFocus(); virtual void LoseFocus(); @@ -308,7 +308,7 @@ private: SAL_DLLPRIVATE WinBits ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); SAL_DLLPRIVATE void ImplDrawRadioButtonState(); - SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uIntPtr nDrawFlags, + SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize, const Size& rImageSize, Rectangle& rStateRect, Rectangle& rMouseRect, bool bLayout = false ); @@ -358,7 +358,7 @@ public: virtual void KeyInput( const KeyEvent& rKEvt ); virtual void KeyUp( const KeyEvent& rKEvt ); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void GetFocus(); virtual void LoseFocus(); @@ -425,7 +425,7 @@ private: SAL_DLLPRIVATE WinBits ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); SAL_DLLPRIVATE void ImplInvalidateOrDrawCheckBoxState(); - SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uIntPtr nDrawFlags, + SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize, const Size& rImageSize, Rectangle& rStateRect, Rectangle& rMouseRect, bool bLayout ); @@ -463,7 +463,7 @@ public: virtual void KeyInput( const KeyEvent& rKEvt ); virtual void KeyUp( const KeyEvent& rKEvt ); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void GetFocus(); virtual void LoseFocus(); diff --git a/vcl/inc/vcl/canvasbitmap.hxx b/vcl/inc/vcl/canvasbitmap.hxx index da0116808416..6b719ef988ef 100644 --- a/vcl/inc/vcl/canvasbitmap.hxx +++ b/vcl/inc/vcl/canvasbitmap.hxx @@ -66,7 +66,7 @@ namespace unotools bool m_bSwap; bool m_bPalette; - SAL_DLLPRIVATE void setComponentInfo( sal_uIntPtr redShift, sal_uIntPtr greenShift, sal_uIntPtr blueShift ); + SAL_DLLPRIVATE void setComponentInfo( sal_uLong redShift, sal_uLong greenShift, sal_uLong blueShift ); virtual ~VclCanvasBitmap(); diff --git a/vcl/inc/vcl/cmdevt.hxx b/vcl/inc/vcl/cmdevt.hxx index 5540f26ad5eb..30a6c0b953bf 100644 --- a/vcl/inc/vcl/cmdevt.hxx +++ b/vcl/inc/vcl/cmdevt.hxx @@ -127,14 +127,14 @@ inline CommandInputContextData::CommandInputContextData( LanguageType eLang ) #define COMMAND_WHEEL_ZOOM ((sal_uInt16)0x0002) #define COMMAND_WHEEL_DATAZOOM ((sal_uInt16)0x0004) -#define COMMAND_WHEEL_PAGESCROLL ((sal_uIntPtr)0xFFFFFFFF) +#define COMMAND_WHEEL_PAGESCROLL ((sal_uLong)0xFFFFFFFF) class VCL_DLLPUBLIC CommandWheelData { private: long mnDelta; long mnNotchDelta; - sal_uIntPtr mnLines; + sal_uLong mnLines; sal_uInt16 mnMode; sal_uInt16 mnCode; sal_Bool mbHorz; @@ -143,13 +143,13 @@ private: public: CommandWheelData(); CommandWheelData( long nWheelDelta, long nWheelNotchDelta, - sal_uIntPtr nScrollLines, + sal_uLong nScrollLines, sal_uInt16 nWheelMode, sal_uInt16 nKeyModifier, sal_Bool bHorz = sal_False, sal_Bool bDeltaIsPixel = sal_False ); long GetDelta() const { return mnDelta; } long GetNotchDelta() const { return mnNotchDelta; } - sal_uIntPtr GetScrollLines() const { return mnLines; } + sal_uLong GetScrollLines() const { return mnLines; } sal_Bool IsHorz() const { return mbHorz; } sal_Bool IsDeltaPixel() const { return mbDeltaIsPixel; } @@ -179,7 +179,7 @@ inline CommandWheelData::CommandWheelData() } inline CommandWheelData::CommandWheelData( long nWheelDelta, long nWheelNotchDelta, - sal_uIntPtr nScrollLines, + sal_uLong nScrollLines, sal_uInt16 nWheelMode, sal_uInt16 nKeyModifier, sal_Bool bHorz, sal_Bool bDeltaIsPixel ) { @@ -357,15 +357,15 @@ class VCL_DLLPUBLIC CommandDialogData class VCL_DLLPUBLIC CommandSelectionChangeData { private: - sal_uIntPtr mnStart; - sal_uIntPtr mnEnd; + sal_uLong mnStart; + sal_uLong mnEnd; public: CommandSelectionChangeData(); - CommandSelectionChangeData( sal_uIntPtr nStart, sal_uIntPtr nEnd ); + CommandSelectionChangeData( sal_uLong nStart, sal_uLong nEnd ); - sal_uIntPtr GetStart() const { return mnStart; } - sal_uIntPtr GetEnd() const { return mnEnd; } + sal_uLong GetStart() const { return mnStart; } + sal_uLong GetEnd() const { return mnEnd; } }; inline CommandSelectionChangeData::CommandSelectionChangeData() @@ -373,8 +373,8 @@ inline CommandSelectionChangeData::CommandSelectionChangeData() mnStart = mnEnd = 0; } -inline CommandSelectionChangeData::CommandSelectionChangeData( sal_uIntPtr nStart, - sal_uIntPtr nEnd ) +inline CommandSelectionChangeData::CommandSelectionChangeData( sal_uLong nStart, + sal_uLong nEnd ) { mnStart = nStart; mnEnd = nEnd; diff --git a/vcl/inc/vcl/combobox.hxx b/vcl/inc/vcl/combobox.hxx index 7dad7490aea8..e7ab69e75700 100644 --- a/vcl/inc/vcl/combobox.hxx +++ b/vcl/inc/vcl/combobox.hxx @@ -90,7 +90,7 @@ public: ComboBox( Window* pParent, const ResId& rResId ); ~ComboBox(); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual long PreNotify( NotifyEvent& rNEvt ); virtual long Notify( NotifyEvent& rNEvt ); diff --git a/vcl/inc/vcl/ctrl.hxx b/vcl/inc/vcl/ctrl.hxx index ef3563649667..3bf529ada48b 100644 --- a/vcl/inc/vcl/ctrl.hxx +++ b/vcl/inc/vcl/ctrl.hxx @@ -87,7 +87,7 @@ protected: if the Control instance has been destroyed in any of the call */ sal_Bool ImplCallEventListenersAndHandler( - sal_uIntPtr nEvent, const Link& rHandler, void* pCaller + sal_uLong nEvent, const Link& rHandler, void* pCaller ); /** draws the given text onto the given device diff --git a/vcl/inc/vcl/cvtgrf.hxx b/vcl/inc/vcl/cvtgrf.hxx index 83213ffc2ff4..a84e98524276 100644 --- a/vcl/inc/vcl/cvtgrf.hxx +++ b/vcl/inc/vcl/cvtgrf.hxx @@ -48,8 +48,8 @@ private: //#if 0 // _SOLAR__PRIVATE public: - SAL_DLLPRIVATE sal_uIntPtr ImplConvert( sal_uIntPtr nInFormat, void* pInBuffer, sal_uIntPtr nInBufSize, - void** ppOutBuffer, sal_uIntPtr nOutFormat ); + SAL_DLLPRIVATE sal_uLong ImplConvert( sal_uLong nInFormat, void* pInBuffer, sal_uLong nInBufSize, + void** ppOutBuffer, sal_uLong nOutFormat ); //#endif // __PRIVATE public: @@ -57,8 +57,8 @@ public: GraphicConverter(); ~GraphicConverter(); - static sal_uIntPtr Import( SvStream& rIStm, Graphic& rGraphic, sal_uIntPtr nFormat = CVT_UNKNOWN ); - static sal_uIntPtr Export( SvStream& rOStm, const Graphic& rGraphic, sal_uIntPtr nFormat ); + static sal_uLong Import( SvStream& rIStm, Graphic& rGraphic, sal_uLong nFormat = CVT_UNKNOWN ); + static sal_uLong Export( SvStream& rOStm, const Graphic& rGraphic, sal_uLong nFormat ); ConvertData* GetConvertData() { return mpConvertData; } diff --git a/vcl/inc/vcl/cvtsvm.hxx b/vcl/inc/vcl/cvtsvm.hxx index b78ad26ef104..00c7c5270a0d 100644 --- a/vcl/inc/vcl/cvtsvm.hxx +++ b/vcl/inc/vcl/cvtsvm.hxx @@ -98,14 +98,14 @@ private: //#if 0 // _SOLAR__PRIVATE SAL_DLLPRIVATE void ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ); SAL_DLLPRIVATE void ImplConvertToSVM1( SvStream& rOStm, GDIMetaFile& rMtf ); - SAL_DLLPRIVATE sal_uIntPtr ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, + SAL_DLLPRIVATE sal_uLong ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, VirtualDevice& rSaveVDev, sal_Bool& rRop_0_1, Color& rLineCol, Stack& rLineColStack, rtl_TextEncoding& rActualCharSet ); //#endif public: - SVMConverter( SvStream& rIStm, GDIMetaFile& rMtf, sal_uIntPtr nConvertMode ); + SVMConverter( SvStream& rIStm, GDIMetaFile& rMtf, sal_uLong nConvertMode ); ~SVMConverter() {} private: diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx index 660bf9e955ca..3bce9c0497ac 100644 --- a/vcl/inc/vcl/dialog.hxx +++ b/vcl/inc/vcl/dialog.hxx @@ -75,7 +75,7 @@ public: protected: Dialog( WindowType nType ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); public: Dialog( Window* pParent, WinBits nStyle = WB_STDDIALOG ); diff --git a/vcl/inc/vcl/dockwin.hxx b/vcl/inc/vcl/dockwin.hxx index e135a911dd04..5fb9ab4d4c6d 100644 --- a/vcl/inc/vcl/dockwin.hxx +++ b/vcl/inc/vcl/dockwin.hxx @@ -152,7 +152,7 @@ public: void Unlock(); sal_Bool IsLocked() const; - void StartPopupMode( ToolBox* pParentToolBox, sal_uIntPtr nPopupModeFlags ); + void StartPopupMode( ToolBox* pParentToolBox, sal_uLong nPopupModeFlags ); sal_Bool IsInPopupMode() const; void TitleButtonClick( sal_uInt16 nButton ); @@ -234,7 +234,7 @@ public: sal_Bool IsLocked( const Window *pWin ); void StartPopupMode( ToolBox *pParentToolBox, const Window *pWin ); - void StartPopupMode( ToolBox *pParentToolBox, const Window *pWin, sal_uIntPtr nPopupModeFlags ); + void StartPopupMode( ToolBox *pParentToolBox, const Window *pWin, sal_uLong nPopupModeFlags ); sal_Bool IsInPopupMode( const Window *pWin ); void EndPopupMode( const Window *pWin ); diff --git a/vcl/inc/vcl/edit.hxx b/vcl/inc/vcl/edit.hxx index 686e996c03c2..f9063356b187 100755 --- a/vcl/inc/vcl/edit.hxx +++ b/vcl/inc/vcl/edit.hxx @@ -164,7 +164,7 @@ public: virtual void KeyInput( const KeyEvent& rKEvt ); virtual void Paint( const Rectangle& rRect ); virtual void Resize(); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void GetFocus(); virtual void LoseFocus(); virtual void Tracking( const TrackingEvent& rTEvt ); @@ -182,9 +182,9 @@ public: virtual void ClearModifyFlag(); virtual sal_Bool IsModified() const { return mpSubEdit ? mpSubEdit->mbModified : mbModified; } - virtual void EnableUpdateData( sal_uIntPtr nTimeout = EDIT_UPDATEDATA_TIMEOUT ); + virtual void EnableUpdateData( sal_uLong nTimeout = EDIT_UPDATEDATA_TIMEOUT ); virtual void DisableUpdateData() { delete mpUpdateDataTimer; mpUpdateDataTimer = NULL; } - virtual sal_uIntPtr IsUpdateDataEnabled() const; + virtual sal_uLong IsUpdateDataEnabled() const; void SetEchoChar( xub_Unicode c ); xub_Unicode GetEchoChar() const { return mcEchoChar; } @@ -253,7 +253,7 @@ public: static Size GetMinimumEditSize(); }; -inline sal_uIntPtr Edit::IsUpdateDataEnabled() const +inline sal_uLong Edit::IsUpdateDataEnabled() const { if ( mpUpdateDataTimer ) return mpUpdateDataTimer->GetTimeout(); diff --git a/vcl/inc/vcl/event.hxx b/vcl/inc/vcl/event.hxx index 61d9d91d7533..33d43ddf2053 100644 --- a/vcl/inc/vcl/event.hxx +++ b/vcl/inc/vcl/event.hxx @@ -435,18 +435,18 @@ class VCL_DLLPUBLIC DataChangedEvent { private: void* mpData; - sal_uIntPtr mnFlags; + sal_uLong mnFlags; sal_uInt16 mnType; public: DataChangedEvent(); DataChangedEvent( sal_uInt16 nType, const void* pData = NULL, - sal_uIntPtr nFlags = 0 ); + sal_uLong nFlags = 0 ); sal_uInt16 GetType() const { return mnType; } void* GetData() const { return mpData; } - sal_uIntPtr GetFlags() const { return mnFlags; } + sal_uLong GetFlags() const { return mnFlags; } const AllSettings* GetOldSettings() const; }; @@ -460,7 +460,7 @@ inline DataChangedEvent::DataChangedEvent() inline DataChangedEvent::DataChangedEvent( sal_uInt16 nType, const void* pData, - sal_uIntPtr nChangeFlags ) + sal_uLong nChangeFlags ) { mpData = (void*)pData; mnFlags = nChangeFlags; diff --git a/vcl/inc/vcl/evntpost.hxx b/vcl/inc/vcl/evntpost.hxx index 01d2ccd2e95e..287328d274a4 100644 --- a/vcl/inc/vcl/evntpost.hxx +++ b/vcl/inc/vcl/evntpost.hxx @@ -36,13 +36,13 @@ namespace vcl { struct UserEvent { - sal_uIntPtr m_nWhich; + sal_uLong m_nWhich; void* m_pData; }; class VCL_DLLPUBLIC EventPoster { - sal_uIntPtr m_nId; + sal_uLong m_nId; Link m_aLink; //#if 0 // _SOLAR__PRIVATE diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx index 24601d2c96bb..cdc801d3b34b 100644 --- a/vcl/inc/vcl/field.hxx +++ b/vcl/inc/vcl/field.hxx @@ -332,7 +332,7 @@ private: sal_Bool mbEmptyDate; sal_Bool mbShowDateCentury; sal_uInt16 mnDateFormat; - sal_uIntPtr mnExtDateFormat; + sal_uLong mnExtDateFormat; sal_Bool mbEnforceValidValue; SAL_DLLPRIVATE void ImplInit(); diff --git a/vcl/inc/vcl/fixbrd.hxx b/vcl/inc/vcl/fixbrd.hxx index a42d522538cf..dec13b4e2874 100644 --- a/vcl/inc/vcl/fixbrd.hxx +++ b/vcl/inc/vcl/fixbrd.hxx @@ -59,7 +59,7 @@ private: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); - SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uIntPtr nDrawFlags, + SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize ); public: @@ -68,7 +68,7 @@ public: ~FixedBorder(); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/vcl/inc/vcl/fixed.hxx b/vcl/inc/vcl/fixed.hxx index 3e14b512807f..a262ea6078a7 100644 --- a/vcl/inc/vcl/fixed.hxx +++ b/vcl/inc/vcl/fixed.hxx @@ -49,7 +49,7 @@ private: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); - SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uIntPtr nDrawFlags, + SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize, bool bFillLayout = false ) const; public: SAL_DLLPRIVATE static sal_uInt16 ImplGetTextStyle( WinBits nWinBits ); @@ -67,7 +67,7 @@ public: FixedText( Window* pParent, const ResId& rResId, bool bDisableAccessibleLabelForRelation ); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -103,7 +103,7 @@ public: FixedLine( Window* pParent, const ResId& rResId ); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -126,7 +126,7 @@ private: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); - SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uIntPtr nDrawFlags, + SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize ); protected: @@ -138,7 +138,7 @@ public: ~FixedBitmap(); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -167,7 +167,7 @@ private: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); - SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uIntPtr nDrawFlags, + SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize ); protected: @@ -179,7 +179,7 @@ public: ~FixedImage(); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/vcl/inc/vcl/floatwin.hxx b/vcl/inc/vcl/floatwin.hxx index d25552398642..cdb1531ee89a 100644 --- a/vcl/inc/vcl/floatwin.hxx +++ b/vcl/inc/vcl/floatwin.hxx @@ -39,24 +39,24 @@ class PopupModeEvent; // - FloatingWindow-Types - // ------------------------ -#define FLOATWIN_POPUPMODE_ALLOWTEAROFF ((sal_uIntPtr)0x00000001) -#define FLOATWIN_POPUPMODE_ANIMATIONSLIDE ((sal_uIntPtr)0x00000002) -#define FLOATWIN_POPUPMODE_NOAUTOARRANGE ((sal_uIntPtr)0x00000004) -#define FLOATWIN_POPUPMODE_NOANIMATION ((sal_uIntPtr)0x00000008) -#define FLOATWIN_POPUPMODE_DOWN ((sal_uIntPtr)0x00000010) -#define FLOATWIN_POPUPMODE_UP ((sal_uIntPtr)0x00000020) -#define FLOATWIN_POPUPMODE_LEFT ((sal_uIntPtr)0x00000040) -#define FLOATWIN_POPUPMODE_RIGHT ((sal_uIntPtr)0x00000080) -#define FLOATWIN_POPUPMODE_NOFOCUSCLOSE ((sal_uIntPtr)0x00000100) -#define FLOATWIN_POPUPMODE_NOKEYCLOSE ((sal_uIntPtr)0x00000200) -#define FLOATWIN_POPUPMODE_NOMOUSECLOSE ((sal_uIntPtr)0x00000400) -#define FLOATWIN_POPUPMODE_NOMOUSERECTCLOSE ((sal_uIntPtr)0x00000800) -#define FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE ((sal_uIntPtr)0x00001000) -#define FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE ((sal_uIntPtr)0x00002000) -#define FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK ((sal_uIntPtr)0x00004000) -#define FLOATWIN_POPUPMODE_NEWLEVEL ((sal_uIntPtr)0x00008000) -#define FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE ((sal_uIntPtr)0x00010000) -#define FLOATWIN_POPUPMODE_GRABFOCUS ((sal_uIntPtr)0x00020000) +#define FLOATWIN_POPUPMODE_ALLOWTEAROFF ((sal_uLong)0x00000001) +#define FLOATWIN_POPUPMODE_ANIMATIONSLIDE ((sal_uLong)0x00000002) +#define FLOATWIN_POPUPMODE_NOAUTOARRANGE ((sal_uLong)0x00000004) +#define FLOATWIN_POPUPMODE_NOANIMATION ((sal_uLong)0x00000008) +#define FLOATWIN_POPUPMODE_DOWN ((sal_uLong)0x00000010) +#define FLOATWIN_POPUPMODE_UP ((sal_uLong)0x00000020) +#define FLOATWIN_POPUPMODE_LEFT ((sal_uLong)0x00000040) +#define FLOATWIN_POPUPMODE_RIGHT ((sal_uLong)0x00000080) +#define FLOATWIN_POPUPMODE_NOFOCUSCLOSE ((sal_uLong)0x00000100) +#define FLOATWIN_POPUPMODE_NOKEYCLOSE ((sal_uLong)0x00000200) +#define FLOATWIN_POPUPMODE_NOMOUSECLOSE ((sal_uLong)0x00000400) +#define FLOATWIN_POPUPMODE_NOMOUSERECTCLOSE ((sal_uLong)0x00000800) +#define FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE ((sal_uLong)0x00001000) +#define FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE ((sal_uLong)0x00002000) +#define FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK ((sal_uLong)0x00004000) +#define FLOATWIN_POPUPMODE_NEWLEVEL ((sal_uLong)0x00008000) +#define FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE ((sal_uLong)0x00010000) +#define FLOATWIN_POPUPMODE_GRABFOCUS ((sal_uLong)0x00020000) #define FLOATWIN_POPUPMODEEND_CANCEL ((sal_uInt16)0x0001) #define FLOATWIN_POPUPMODEEND_TEAROFF ((sal_uInt16)0x0002) @@ -79,8 +79,8 @@ private: Window* mpFirstPopupModeWin; ImplData* mpImplData; Rectangle maFloatRect; - sal_uIntPtr mnPostId; - sal_uIntPtr mnPopupModeFlags; + sal_uLong mnPostId; + sal_uLong mnPopupModeFlags; sal_uInt16 mnTitle; sal_uInt16 mnOldTitle; sal_Bool mbInPopupMode; @@ -117,9 +117,9 @@ public: SAL_DLLPRIVATE void ImplSetMouseDown() { mbMouseDown = sal_True; } SAL_DLLPRIVATE sal_Bool ImplIsMouseDown() const { return mbMouseDown; } SAL_DLLPRIVATE static Point ImplCalcPos( Window* pWindow, - const Rectangle& rRect, sal_uIntPtr nFlags, + const Rectangle& rRect, sal_uLong nFlags, sal_uInt16& rArrangeIndex ); - SAL_DLLPRIVATE void ImplEndPopupMode( sal_uInt16 nFlags = 0, sal_uIntPtr nFocusId = 0 ); + SAL_DLLPRIVATE void ImplEndPopupMode( sal_uInt16 nFlags = 0, sal_uLong nFocusId = 0 ); SAL_DLLPRIVATE Rectangle& ImplGetItemEdgeClipRect(); SAL_DLLPRIVATE sal_Bool ImplIsInPrivatePopupMode() const { return mbInPopupMode; } //#endif @@ -138,13 +138,13 @@ public: void SetTitleType( sal_uInt16 nTitle ); sal_uInt16 GetTitleType() const { return mnTitle; } - void StartPopupMode( const Rectangle& rRect, sal_uIntPtr nFlags = 0 ); - void StartPopupMode( ToolBox* pBox, sal_uIntPtr nFlags = 0 ); + void StartPopupMode( const Rectangle& rRect, sal_uLong nFlags = 0 ); + void StartPopupMode( ToolBox* pBox, sal_uLong nFlags = 0 ); void EndPopupMode( sal_uInt16 nFlags = 0 ); void AddPopupModeWindow( Window* pWindow ); void RemovePopupModeWindow( Window* pWindow ); - sal_uIntPtr GetPopupModeFlags() const { return mnPopupModeFlags; } - void SetPopupModeFlags( sal_uIntPtr nFlags ) { mnPopupModeFlags = nFlags; } + sal_uLong GetPopupModeFlags() const { return mnPopupModeFlags; } + void SetPopupModeFlags( sal_uLong nFlags ) { mnPopupModeFlags = nFlags; } sal_Bool IsInPopupMode() const { return mbPopupMode; } sal_Bool IsInCleanUp() const { return mbInCleanUp; } sal_Bool IsPopupModeCanceled() const { return mbPopupModeCanceled; } @@ -155,7 +155,7 @@ public: sal_Bool GrabsFocus() const { return mbGrabFocus; } - static Point CalcFloatingPosition( Window* pWindow, const Rectangle& rRect, sal_uIntPtr nFlags, sal_uInt16& rArrangeIndex ); + static Point CalcFloatingPosition( Window* pWindow, const Rectangle& rRect, sal_uLong nFlags, sal_uInt16& rArrangeIndex ); }; #endif // _SV_FLOATWIN_HXX diff --git a/vcl/inc/vcl/gdimtf.hxx b/vcl/inc/vcl/gdimtf.hxx index 70913a25a42e..a83920b6674c 100644 --- a/vcl/inc/vcl/gdimtf.hxx +++ b/vcl/inc/vcl/gdimtf.hxx @@ -49,8 +49,8 @@ class Gradient; // - GDIMetaFile-Types - // --------------------- -#define GDI_METAFILE_END ((sal_uIntPtr)0xFFFFFFFF) -#define GDI_METAFILE_LABEL_NOTFOUND ((sal_uIntPtr)0xFFFFFFFF) +#define GDI_METAFILE_END ((sal_uLong)0xFFFFFFFF) +#define GDI_METAFILE_LABEL_NOTFOUND ((sal_uLong)0xFFFFFFFF) #ifndef METAFILE_END #define METAFILE_END GDI_METAFILE_END @@ -156,7 +156,7 @@ public: void Clear(); sal_Bool IsEqual( const GDIMetaFile& rMtf ) const; - sal_Bool Mirror( sal_uIntPtr nMirrorFlags ); + sal_Bool Mirror( sal_uLong nMirrorFlags ); void Move( long nX, long nY ); // additional Move method getting specifics how to handle MapMode( MAP_PIXEL ) void Move( long nX, long nY, long nDPIX, long nDPIY ); @@ -177,19 +177,19 @@ public: short nChannelRPercent = 0, short nChannelGPercent = 0, short nChannelBPercent = 0, double fGamma = 1.0, sal_Bool bInvert = sal_False ); void Convert( MtfConversion eConversion ); - void ReplaceColors( const Color& rSearchColor, const Color& rReplaceColor, sal_uIntPtr nTol = 0 ); + void ReplaceColors( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol = 0 ); void ReplaceColors( const Color* pSearchColors, const Color* rReplaceColors, - sal_uIntPtr nColorCount, sal_uIntPtr* pTols = NULL ); + sal_uLong nColorCount, sal_uLong* pTols = NULL ); GDIMetaFile GetMonochromeMtf( const Color& rCol ) const; void Record( OutputDevice* pOutDev ); sal_Bool IsRecord() const { return bRecord; } - void Play( GDIMetaFile& rMtf, sal_uIntPtr nPos = GDI_METAFILE_END ); - void Play( OutputDevice* pOutDev, sal_uIntPtr nPos = GDI_METAFILE_END ); + void Play( GDIMetaFile& rMtf, sal_uLong nPos = GDI_METAFILE_END ); + void Play( OutputDevice* pOutDev, sal_uLong nPos = GDI_METAFILE_END ); void Play( OutputDevice* pOutDev, const Point& rPos, - const Size& rSize, sal_uIntPtr nPos = GDI_METAFILE_END ); + const Size& rSize, sal_uLong nPos = GDI_METAFILE_END ); void Pause( sal_Bool bPause ); sal_Bool IsPause() const { return bPause; } @@ -198,27 +198,27 @@ public: void WindStart(); void WindEnd(); - void Wind( sal_uIntPtr nAction ); + void Wind( sal_uLong nAction ); void WindPrev(); void WindNext(); - sal_uIntPtr GetActionCount() const { return Count(); } + sal_uLong GetActionCount() const { return Count(); } void AddAction( MetaAction* pAction ); - void AddAction( MetaAction* pAction, sal_uIntPtr nPos ); - void RemoveAction( sal_uIntPtr nPos ); - MetaAction* CopyAction( sal_uIntPtr nPos ) const; + void AddAction( MetaAction* pAction, sal_uLong nPos ); + void RemoveAction( sal_uLong nPos ); + MetaAction* CopyAction( sal_uLong nPos ) const; MetaAction* GetCurAction() const { return (MetaAction*) GetCurObject(); } - MetaAction* GetAction( sal_uIntPtr nAction ) const { return (MetaAction*) GetObject( nAction ); } + MetaAction* GetAction( sal_uLong nAction ) const { return (MetaAction*) GetObject( nAction ); } MetaAction* FirstAction() { return (MetaAction*) First(); } MetaAction* NextAction() { return (MetaAction*) Next(); } - MetaAction* ReplaceAction( MetaAction* pAction, sal_uIntPtr nAction ) { return (MetaAction*) Replace( pAction, nAction ); } + MetaAction* ReplaceAction( MetaAction* pAction, sal_uLong nAction ) { return (MetaAction*) Replace( pAction, nAction ); } - sal_uIntPtr GetActionPos( const String& rLabel ); - sal_Bool InsertLabel( const String& rLabel, sal_uIntPtr nActionPos ); + sal_uLong GetActionPos( const String& rLabel ); + sal_Bool InsertLabel( const String& rLabel, sal_uLong nActionPos ); void RemoveLabel( const String& rLabel ); void RenameLabel( const String& rLabel, const String& rNewLabel ); - sal_uIntPtr GetLabelCount() const; - String GetLabel( sal_uIntPtr nLabel ); + sal_uLong GetLabelCount() const; + String GetLabel( sal_uLong nLabel ); sal_Bool SaveStatus(); @@ -231,8 +231,8 @@ public: void SetHookHdl( const Link& rLink ) { aHookHdlLink = rLink; } const Link& GetHookHdl() const { return aHookHdlLink; } - sal_uIntPtr GetChecksum() const; - sal_uIntPtr GetSizeBytes() const; + sal_uLong GetChecksum() const; + sal_uLong GetSizeBytes() const; // Methoden zum Lesen und Schreiben des neuen Formats; // die Read-Methode kann auch das alte Format lesen diff --git a/vcl/inc/vcl/gfxlink.hxx b/vcl/inc/vcl/gfxlink.hxx index c6eae01c5e2c..ce2cec67e1f4 100644 --- a/vcl/inc/vcl/gfxlink.hxx +++ b/vcl/inc/vcl/gfxlink.hxx @@ -39,10 +39,10 @@ struct ImpBuffer { - sal_uIntPtr mnRefCount; + sal_uLong mnRefCount; sal_uInt8* mpBuffer; - ImpBuffer( sal_uIntPtr nSize ) + ImpBuffer( sal_uLong nSize ) { mnRefCount = 1UL; mpBuffer = nSize ? new sal_uInt8[ nSize ] : NULL; @@ -60,10 +60,10 @@ struct ImpBuffer struct ImpSwap { rtl::OUString maURL; - sal_uIntPtr mnDataSize; - sal_uIntPtr mnRefCount; + sal_uLong mnDataSize; + sal_uLong mnRefCount; - ImpSwap( sal_uInt8* pData, sal_uIntPtr nDataSize ); + ImpSwap( sal_uInt8* pData, sal_uLong nDataSize ); ~ImpSwap(); sal_uInt8* GetData() const; @@ -134,7 +134,7 @@ private: sal_uInt32 mnBufSize; sal_uInt32 mnUserId; ImpGfxLink* mpImpData; - sal_uIntPtr mnExtra2; + sal_uLong mnExtra2; SAL_DLLPRIVATE void ImplCopy( const GfxLink& rGfxLink ); diff --git a/vcl/inc/vcl/glyphcache.hxx b/vcl/inc/vcl/glyphcache.hxx index 1cb53668e0c9..20c3f9aaa68e 100644 --- a/vcl/inc/vcl/glyphcache.hxx +++ b/vcl/inc/vcl/glyphcache.hxx @@ -89,7 +89,7 @@ private: void GrowNotify(); private: - sal_uIntPtr CalcByteCount() const; + sal_uLong CalcByteCount() const; void GarbageCollect(); // the GlyphCache's FontList matches a font request to a serverfont instance @@ -98,8 +98,8 @@ private: struct IFSD_Hash{ size_t operator()( const ImplFontSelectData& ) const; }; typedef ::std::hash_map<ImplFontSelectData,ServerFont*,IFSD_Hash,IFSD_Equal > FontList; FontList maFontList; - sal_uIntPtr mnMaxSize; // max overall cache size in bytes - mutable sal_uIntPtr mnBytesUsed; + sal_uLong mnMaxSize; // max overall cache size in bytes + mutable sal_uLong mnBytesUsed; mutable long mnLruIndex; mutable int mnGlyphCount; ServerFont* mpCurrentGCFont; @@ -187,7 +187,7 @@ public: const ImplFontSelectData& GetFontSelData() const { return maFontSelData; } virtual void FetchFontMetric( ImplFontMetricData&, long& rFactor ) const = 0; - virtual sal_uIntPtr GetKernPairs( ImplKernPairData** ) const { return 0; } + virtual sal_uLong GetKernPairs( ImplKernPairData** ) const { return 0; } virtual int GetGlyphKernValue( int, int ) const { return 0; } virtual const ImplFontCharMap* GetImplFontCharMap() const = 0; Point TransformPoint( const Point& ) const; @@ -216,7 +216,7 @@ protected: void AddRef() const { ++mnRefCount; } long GetRefCount() const { return mnRefCount; } long Release() const; - sal_uIntPtr GetByteCount() const { return mnBytesUsed; } + sal_uLong GetByteCount() const { return mnBytesUsed; } virtual void InitGlyphData( int nGlyphIndex, GlyphData& ) const = 0; virtual void GarbageCollect( long ); @@ -236,7 +236,7 @@ private: // used by GlyphCache for cache LRU algorithm mutable long mnRefCount; - mutable sal_uIntPtr mnBytesUsed; + mutable sal_uLong mnBytesUsed; ServerFont* mpPrevGCFont; ServerFont* mpNextGCFont; @@ -325,13 +325,13 @@ public: public: unsigned char* mpBits; - sal_uIntPtr mnAllocated; + sal_uLong mnAllocated; - sal_uIntPtr mnWidth; - sal_uIntPtr mnHeight; + sal_uLong mnWidth; + sal_uLong mnHeight; - sal_uIntPtr mnScanlineSize; - sal_uIntPtr mnBitCount; + sal_uLong mnScanlineSize; + sal_uLong mnBitCount; int mnXOffset; int mnYOffset; diff --git a/vcl/inc/vcl/gradient.hxx b/vcl/inc/vcl/gradient.hxx index 6295e854d6c4..7e2fe408eadf 100644 --- a/vcl/inc/vcl/gradient.hxx +++ b/vcl/inc/vcl/gradient.hxx @@ -54,7 +54,7 @@ class SvStream; class Impl_Gradient { public: - sal_uIntPtr mnRefCount; + sal_uLong mnRefCount; GradientStyle meStyle; Color maStartColor; Color maEndColor; diff --git a/vcl/inc/vcl/graph.hxx b/vcl/inc/vcl/graph.hxx index 944cbbf60be4..61ec67ce8a79 100644 --- a/vcl/inc/vcl/graph.hxx +++ b/vcl/inc/vcl/graph.hxx @@ -144,7 +144,7 @@ public: Size GetSizePixel( const OutputDevice* pRefDevice = NULL ) const; - sal_uIntPtr GetSizeBytes() const; + sal_uLong GetSizeBytes() const; void Draw( OutputDevice* pOutDev, const Point& rDestPt ) const; @@ -173,12 +173,12 @@ public: void SetAnimationNotifyHdl( const Link& rLink ); Link GetAnimationNotifyHdl() const; - sal_uIntPtr GetAnimationLoopCount() const; + sal_uLong GetAnimationLoopCount() const; void ResetAnimationLoopCount(); List* GetAnimationInfoList() const; - sal_uIntPtr GetChecksum() const; + sal_uLong GetChecksum() const; public: @@ -189,9 +189,9 @@ public: static sal_uInt16 GetGraphicsCompressMode( SvStream& rIStm ); - void SetDocFileName( const String& rName, sal_uIntPtr nFilePos ); + void SetDocFileName( const String& rName, sal_uLong nFilePos ); const String& GetDocFileName() const; - sal_uIntPtr GetDocFilePos() const; + sal_uLong GetDocFilePos() const; sal_Bool ReadEmbedded( SvStream& rIStream, sal_Bool bSwap = sal_False ); sal_Bool WriteEmbedded( SvStream& rOStream ); diff --git a/vcl/inc/vcl/group.hxx b/vcl/inc/vcl/group.hxx index 69d14c145cd2..56aec19f366f 100644 --- a/vcl/inc/vcl/group.hxx +++ b/vcl/inc/vcl/group.hxx @@ -44,7 +44,7 @@ private: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); - SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uIntPtr nDrawFlags, + SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize, bool bLayout = false ); virtual void FillLayoutData() const; @@ -58,7 +58,7 @@ public: GroupBox( Window* pParent, const ResId& rResId ); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/vcl/inc/vcl/hatch.hxx b/vcl/inc/vcl/hatch.hxx index 93d96b367f5a..78cbfe1153c1 100644 --- a/vcl/inc/vcl/hatch.hxx +++ b/vcl/inc/vcl/hatch.hxx @@ -41,7 +41,7 @@ class SvStream; struct ImplHatch { - sal_uIntPtr mnRefCount; + sal_uLong mnRefCount; Color maColor; HatchStyle meStyle; long mnDistance; diff --git a/vcl/inc/vcl/help.hxx b/vcl/inc/vcl/help.hxx index 2e06ed61058a..752fc6e6e4f9 100644 --- a/vcl/inc/vcl/help.hxx +++ b/vcl/inc/vcl/help.hxx @@ -113,10 +113,10 @@ public: sal_uInt16 nStyle = 0 ) { return Help::ShowQuickHelp( pParent, rScreenRect, rHelpText, XubString(), nStyle ); } - static sal_uIntPtr ShowTip( Window* pParent, + static sal_uLong ShowTip( Window* pParent, const Rectangle& rScreenRect, const XubString& rText, sal_uInt16 nStyle = 0 ); - static void HideTip( sal_uIntPtr nId ); + static void HideTip( sal_uLong nId ); }; #endif // _SV_HELP_HXX diff --git a/vcl/inc/vcl/image.hxx b/vcl/inc/vcl/image.hxx index 1532ac7fe5ce..3b294125226b 100644 --- a/vcl/inc/vcl/image.hxx +++ b/vcl/inc/vcl/image.hxx @@ -86,7 +86,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > GetXGraphic() const; Image GetColorTransformedImage( ImageColorTransform eColorTransform ) const; - static void GetColorTransformArrays( ImageColorTransform eColorTransform, Color*& rpSrcColor, Color*& rpDstColor, sal_uIntPtr& rColorCount ); + static void GetColorTransformArrays( ImageColorTransform eColorTransform, Color*& rpSrcColor, Color*& rpDstColor, sal_uLong& rColorCount ); void Invert(); @@ -125,7 +125,7 @@ public: const Color *pNonAlphaMaskColor, const Color *pSearchColors = NULL, const Color *pReplaceColors = NULL, - sal_uIntPtr nColorCount = 0); + sal_uLong nColorCount = 0); BitmapEx GetAsHorizontalStrip() const; sal_uInt16 GetImageCount() const; Size GetImageSize() const; diff --git a/vcl/inc/vcl/impbmp.hxx b/vcl/inc/vcl/impbmp.hxx index c01dde59dae1..778cc0f8f750 100644 --- a/vcl/inc/vcl/impbmp.hxx +++ b/vcl/inc/vcl/impbmp.hxx @@ -49,8 +49,8 @@ class ImpBitmap { private: - sal_uIntPtr mnRefCount; - sal_uIntPtr mnChecksum; + sal_uLong mnRefCount; + sal_uLong mnChecksum; SalBitmap* mpSalBitmap; Size maSourceSize; @@ -85,12 +85,12 @@ public: public: - sal_uIntPtr ImplGetRefCount() const { return mnRefCount; } + sal_uLong ImplGetRefCount() const { return mnRefCount; } void ImplIncRefCount() { mnRefCount++; } void ImplDecRefCount() { mnRefCount--; } - inline void ImplSetChecksum( sal_uIntPtr nChecksum ) { mnChecksum = nChecksum; } - inline sal_uIntPtr ImplGetChecksum() const { return mnChecksum; } + inline void ImplSetChecksum( sal_uLong nChecksum ) { mnChecksum = nChecksum; } + inline sal_uLong ImplGetChecksum() const { return mnChecksum; } #endif // PRIVATE }; diff --git a/vcl/inc/vcl/impgraph.hxx b/vcl/inc/vcl/impgraph.hxx index f4de70e0fa62..7164952ea51b 100644 --- a/vcl/inc/vcl/impgraph.hxx +++ b/vcl/inc/vcl/impgraph.hxx @@ -69,9 +69,9 @@ private: GfxLink* mpGfxLink; GraphicType meType; String maDocFileURLStr; - sal_uIntPtr mnDocFilePos; - mutable sal_uIntPtr mnSizeBytes; - sal_uIntPtr mnRefCount; + sal_uLong mnDocFilePos; + mutable sal_uLong mnSizeBytes; + sal_uLong mnRefCount; sal_Bool mbSwapOut; sal_Bool mbSwapUnderway; @@ -111,7 +111,7 @@ private: MapMode ImplGetPrefMapMode() const; void ImplSetPrefMapMode( const MapMode& rPrefMapMode ); - sal_uIntPtr ImplGetSizeBytes() const; + sal_uLong ImplGetSizeBytes() const; void ImplDraw( OutputDevice* pOutDev, const Point& rDestPt ) const; @@ -134,7 +134,7 @@ private: void ImplSetAnimationNotifyHdl( const Link& rLink ); Link ImplGetAnimationNotifyHdl() const; - sal_uIntPtr ImplGetAnimationLoopCount() const; + sal_uLong ImplGetAnimationLoopCount() const; void ImplResetAnimationLoopCount(); List* ImplGetAnimationInfoList() const; @@ -146,9 +146,9 @@ private: private: - void ImplSetDocFileName( const String& rName, sal_uIntPtr nFilePos ); + void ImplSetDocFileName( const String& rName, sal_uLong nFilePos ); const String& ImplGetDocFileName() const; - sal_uIntPtr ImplGetDocFilePos() const; + sal_uLong ImplGetDocFilePos() const; sal_Bool ImplReadEmbedded( SvStream& rIStream, sal_Bool bSwap = sal_False ); sal_Bool ImplWriteEmbedded( SvStream& rOStream ); @@ -165,7 +165,7 @@ private: GfxLink ImplGetLink(); sal_Bool ImplIsLink() const; - sal_uIntPtr ImplGetChecksum() const; + sal_uLong ImplGetChecksum() const; sal_Bool ImplExportNative( SvStream& rOStm ) const; diff --git a/vcl/inc/vcl/impoct.hxx b/vcl/inc/vcl/impoct.hxx index 7a4dc3e3ab55..8b0e85021db9 100644 --- a/vcl/inc/vcl/impoct.hxx +++ b/vcl/inc/vcl/impoct.hxx @@ -132,14 +132,14 @@ inline BitmapColor ImpErrorQuad::ImplGetColor() class ImpNodeCache { OctreeNode* pActNode; - sal_uIntPtr nNew; - sal_uIntPtr nDelete; - sal_uIntPtr nGet; - sal_uIntPtr nRelease; + sal_uLong nNew; + sal_uLong nDelete; + sal_uLong nGet; + sal_uLong nRelease; public: - ImpNodeCache( const sal_uIntPtr nInitSize ); + ImpNodeCache( const sal_uLong nInitSize ); ~ImpNodeCache(); inline OctreeNode* ImplGetFreeNode(); diff --git a/vcl/inc/vcl/impprn.hxx b/vcl/inc/vcl/impprn.hxx index 717c9b2a3108..883bd55c66be 100644 --- a/vcl/inc/vcl/impprn.hxx +++ b/vcl/inc/vcl/impprn.hxx @@ -73,7 +73,7 @@ private: GDIMetaFile maCurPageMetaFile; long mnMaxBmpDPIX; long mnMaxBmpDPIY; - sal_uIntPtr mnRestoreDrawMode; + sal_uLong mnRestoreDrawMode; int mnCurCopyCount; DECL_LINK( ImplPrintHdl, Timer* ); @@ -109,7 +109,7 @@ public: used by pull implementation to get the number of physical pages (that is how often PrintNextPage should be called) */ - sal_uIntPtr GetPrintPageCount() const; + sal_uLong GetPrintPageCount() const; /** used by pull implementation to get ranges of physical pages that @@ -129,7 +129,7 @@ public: returns an false in push model (error condition) */ - bool GetPaperRanges( std::vector< sal_uIntPtr >& o_rRanges, bool i_bIncludeOrientationChanges ) const; + bool GetPaperRanges( std::vector< sal_uLong >& o_rRanges, bool i_bIncludeOrientationChanges ) const; /** get the jobsetup for a page diff --git a/vcl/inc/vcl/inputctx.hxx b/vcl/inc/vcl/inputctx.hxx index f96364eddabb..5dc3e31eec74 100644 --- a/vcl/inc/vcl/inputctx.hxx +++ b/vcl/inc/vcl/inputctx.hxx @@ -36,10 +36,10 @@ // - InputContext-Flags - // ---------------------- -#define INPUTCONTEXT_TEXT ((sal_uIntPtr)0x00000001) -#define INPUTCONTEXT_EXTTEXTINPUT ((sal_uIntPtr)0x00000002) -#define INPUTCONTEXT_EXTTEXTINPUT_ON ((sal_uIntPtr)0x00000004) -#define INPUTCONTEXT_EXTTEXTINPUT_OFF ((sal_uIntPtr)0x00000008) +#define INPUTCONTEXT_TEXT ((sal_uLong)0x00000001) +#define INPUTCONTEXT_EXTTEXTINPUT ((sal_uLong)0x00000002) +#define INPUTCONTEXT_EXTTEXTINPUT_ON ((sal_uLong)0x00000004) +#define INPUTCONTEXT_EXTTEXTINPUT_OFF ((sal_uLong)0x00000008) // ---------------- // - InputContext - @@ -49,22 +49,22 @@ class VCL_DLLPUBLIC InputContext { private: Font maFont; - sal_uIntPtr mnOptions; + sal_uLong mnOptions; public: InputContext() { mnOptions = 0; } InputContext( const InputContext& rInputContext ) : maFont( rInputContext.maFont ) { mnOptions = rInputContext.mnOptions; } - InputContext( const Font& rFont, sal_uIntPtr nOptions = 0 ) : + InputContext( const Font& rFont, sal_uLong nOptions = 0 ) : maFont( rFont ) { mnOptions = nOptions; } void SetFont( const Font& rFont ) { maFont = rFont; } const Font& GetFont() const { return maFont; } - void SetOptions( sal_uIntPtr nOptions ) { mnOptions = nOptions; } - sal_uIntPtr GetOptions() const { return mnOptions; } + void SetOptions( sal_uLong nOptions ) { mnOptions = nOptions; } + sal_uLong GetOptions() const { return mnOptions; } InputContext& operator=( const InputContext& rInputContext ); sal_Bool operator==( const InputContext& rInputContext ) const; diff --git a/vcl/inc/vcl/lineinfo.hxx b/vcl/inc/vcl/lineinfo.hxx index 3a72c25e325b..6332acb907ee 100644 --- a/vcl/inc/vcl/lineinfo.hxx +++ b/vcl/inc/vcl/lineinfo.hxx @@ -42,7 +42,7 @@ namespace basegfx { class B2DPolyPolygon; } struct ImplLineInfo { - sal_uIntPtr mnRefCount; + sal_uLong mnRefCount; LineStyle meStyle; long mnWidth; sal_uInt16 mnDashCount; diff --git a/vcl/inc/vcl/lstbox.hxx b/vcl/inc/vcl/lstbox.hxx index fce38871fa7f..80ee97200006 100644 --- a/vcl/inc/vcl/lstbox.hxx +++ b/vcl/inc/vcl/lstbox.hxx @@ -87,7 +87,7 @@ public: ListBox( Window* pParent, const ResId& rResId ); ~ListBox(); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual long PreNotify( NotifyEvent& rNEvt ); virtual void StateChanged( StateChangedType nType ); diff --git a/vcl/inc/vcl/mapmod.hxx b/vcl/inc/vcl/mapmod.hxx index 7fd4fbd55f9d..7147c02081c3 100644 --- a/vcl/inc/vcl/mapmod.hxx +++ b/vcl/inc/vcl/mapmod.hxx @@ -49,7 +49,7 @@ class ImplMapMode friend class OutputDevice; private: - sal_uIntPtr mnRefCount; + sal_uLong mnRefCount; MapUnit meUnit; Point maOrigin; Fraction maScaleX; diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx index 5f05af947248..0ccdc912f535 100644 --- a/vcl/inc/vcl/menu.hxx +++ b/vcl/inc/vcl/menu.hxx @@ -150,7 +150,7 @@ private: XubString aTitleText; // PopupMenu-Text - sal_uIntPtr nEventId; + sal_uLong nEventId; sal_uInt16 mnHighlightedItemPos; // for native menues: keeps track of the highlighted item sal_uInt16 nMenuFlags; sal_uInt16 nDefaultItem; // Id vom Default-Item @@ -186,7 +186,7 @@ protected: SAL_DLLPRIVATE void ImplPaint( Window* pWin, sal_uInt16 nBorder, long nOffY = 0, MenuItemData* pThisDataOnly = 0, sal_Bool bHighlighted = sal_False, bool bLayout = false ) const; SAL_DLLPRIVATE void ImplSelect(); SAL_DLLPRIVATE void ImplCallHighlight( sal_uInt16 nHighlightItem ); - SAL_DLLPRIVATE void ImplCallEventListeners( sal_uIntPtr nEvent, sal_uInt16 nPos ); + SAL_DLLPRIVATE void ImplCallEventListeners( sal_uLong nEvent, sal_uInt16 nPos ); DECL_DLLPRIVATE_LINK( ImplCallSelect, Menu* ); SAL_DLLPRIVATE void ImplFillLayoutData() const; @@ -253,8 +253,8 @@ public: void SetItemBits( sal_uInt16 nItemId, MenuItemBits nBits ); MenuItemBits GetItemBits( sal_uInt16 nItemId ) const; - void SetUserValue( sal_uInt16 nItemId, sal_uIntPtr nValue ); - sal_uIntPtr GetUserValue( sal_uInt16 nItemId ) const; + void SetUserValue( sal_uInt16 nItemId, sal_uLong nValue ); + sal_uLong GetUserValue( sal_uInt16 nItemId ) const; void SetPopupMenu( sal_uInt16 nItemId, PopupMenu* pMenu ); PopupMenu* GetPopupMenu( sal_uInt16 nItemId ) const; @@ -497,7 +497,7 @@ private: SAL_DLLPRIVATE MenuFloatingWindow* ImplGetFloatingWindow() const { return (MenuFloatingWindow*)Menu::ImplGetWindow(); } protected: - SAL_DLLPRIVATE sal_uInt16 ImplExecute( Window* pWindow, const Rectangle& rRect, sal_uIntPtr nPopupFlags, Menu* pStaredFrom, sal_Bool bPreSelectFirst ); + SAL_DLLPRIVATE sal_uInt16 ImplExecute( Window* pWindow, const Rectangle& rRect, sal_uLong nPopupFlags, Menu* pStaredFrom, sal_Bool bPreSelectFirst ); SAL_DLLPRIVATE long ImplCalcHeight( sal_uInt16 nEntries ) const; SAL_DLLPRIVATE sal_uInt16 ImplCalcVisEntries( long nMaxHeight, sal_uInt16 nStartEntry = 0, sal_uInt16* pLastVisible = NULL ) const; diff --git a/vcl/inc/vcl/metaact.hxx b/vcl/inc/vcl/metaact.hxx index 413f477b4e88..33120b288a98 100644 --- a/vcl/inc/vcl/metaact.hxx +++ b/vcl/inc/vcl/metaact.hxx @@ -143,7 +143,7 @@ Meta##Name##Action::~Meta##Name##Action() {} class VCL_DLLPUBLIC MetaAction { private: - sal_uIntPtr mnRefCount; + sal_uLong mnRefCount; sal_uInt16 mnType; virtual sal_Bool Compare( const MetaAction& ) const; @@ -168,7 +168,7 @@ public: sal_Bool IsEqual( const MetaAction& ) const; sal_uInt16 GetType() const { return mnType; } - sal_uIntPtr GetRefCount() const { return mnRefCount; } + sal_uLong GetRefCount() const { return mnRefCount; } void ResetRefCount() { mnRefCount = 1; } void Duplicate() { mnRefCount++; } void Delete() { if ( 0 == --mnRefCount ) delete this; } diff --git a/vcl/inc/vcl/morebtn.hxx b/vcl/inc/vcl/morebtn.hxx index 90ce463042f9..fdf7d5a74cfc 100644 --- a/vcl/inc/vcl/morebtn.hxx +++ b/vcl/inc/vcl/morebtn.hxx @@ -43,7 +43,7 @@ class VCL_DLLPUBLIC MoreButton : public PushButton { private: ImplMoreButtonData* mpMBData; - sal_uIntPtr mnDelta; + sal_uLong mnDelta; MapUnit meUnit; sal_Bool mbState; @@ -67,8 +67,8 @@ public: void AddWindow( Window* pWindow ); void RemoveWindow( Window* pWindow ); - void SetDelta( sal_uIntPtr nNewDelta ) { mnDelta = nNewDelta; } - sal_uIntPtr GetDelta() const { return mnDelta; } + void SetDelta( sal_uLong nNewDelta ) { mnDelta = nNewDelta; } + sal_uLong GetDelta() const { return mnDelta; } void SetMapUnit( MapUnit eNewUnit = MAP_PIXEL ) { meUnit = eNewUnit; } MapUnit GetMapUnit() const { return meUnit; } diff --git a/vcl/inc/vcl/octree.hxx b/vcl/inc/vcl/octree.hxx index 43c46afac56a..684155d075f9 100644 --- a/vcl/inc/vcl/octree.hxx +++ b/vcl/inc/vcl/octree.hxx @@ -44,10 +44,10 @@ typedef struct OctreeNode { - sal_uIntPtr nCount; - sal_uIntPtr nRed; - sal_uIntPtr nGreen; - sal_uIntPtr nBlue; + sal_uLong nCount; + sal_uLong nRed; + sal_uLong nGreen; + sal_uLong nBlue; OctreeNode* pChild[ 8 ]; OctreeNode* pNext; OctreeNode* pNextInCache; @@ -70,9 +70,9 @@ class VCL_DLLPUBLIC Octree private: BitmapPalette aPal; - sal_uIntPtr nMax; - sal_uIntPtr nLeafCount; - sal_uIntPtr nLevel; + sal_uLong nMax; + sal_uLong nLeafCount; + sal_uLong nLevel; PNODE pTree; PNODE pReduce[ OCTREE_BITS + 1 ]; BitmapColor* pColor; @@ -92,8 +92,8 @@ private: public: - Octree( const BitmapReadAccess& rReadAcc, sal_uIntPtr nColors ); - Octree( sal_uIntPtr nColors ); + Octree( const BitmapReadAccess& rReadAcc, sal_uLong nColors ); + Octree( sal_uLong nColors ); ~Octree(); void AddColor( const BitmapColor& rColor ); @@ -133,11 +133,11 @@ private: sal_uInt8* pBuffer; sal_uInt8* pMap; - const sal_uIntPtr nBits; + const sal_uLong nBits; //#if 0 // _SOLAR__PRIVATE - SAL_DLLPRIVATE void ImplCreateBuffers( const sal_uIntPtr nMax ); + SAL_DLLPRIVATE void ImplCreateBuffers( const sal_uLong nMax ); //#endif // __PRIVATE @@ -153,9 +153,9 @@ public: inline sal_uInt16 InverseColorMap::GetBestPaletteIndex( const BitmapColor& rColor ) { - return pMap[ ( ( (sal_uIntPtr) rColor.GetRed() >> nBits ) << OCTREE_BITS_1 ) | - ( ( (sal_uIntPtr) rColor.GetGreen() >> nBits ) << OCTREE_BITS ) | - ( (sal_uIntPtr) rColor.GetBlue() >> nBits ) ]; + return pMap[ ( ( (sal_uLong) rColor.GetRed() >> nBits ) << OCTREE_BITS_1 ) | + ( ( (sal_uLong) rColor.GetGreen() >> nBits ) << OCTREE_BITS ) | + ( (sal_uLong) rColor.GetBlue() >> nBits ) ]; } #endif // _SV_OCTREE_HXX diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx index 3503e111fb95..88c31bd17752 100644 --- a/vcl/inc/vcl/outdev.hxx +++ b/vcl/inc/vcl/outdev.hxx @@ -211,52 +211,52 @@ struct KerningPair #define WAVE_NORMAL 3 // Grid -#define GRID_DOTS ((sal_uIntPtr)0x00000001) -#define GRID_HORZLINES ((sal_uIntPtr)0x00000002) -#define GRID_VERTLINES ((sal_uIntPtr)0x00000004) +#define GRID_DOTS ((sal_uLong)0x00000001) +#define GRID_HORZLINES ((sal_uLong)0x00000002) +#define GRID_VERTLINES ((sal_uLong)0x00000004) #define GRID_LINES (GRID_HORZLINES | GRID_VERTLINES) // LayoutModes for Complex Text Layout -#define TEXT_LAYOUT_DEFAULT ((sal_uIntPtr)0x00000000) -#define TEXT_LAYOUT_BIDI_LTR ((sal_uIntPtr)0x00000000) -#define TEXT_LAYOUT_BIDI_RTL ((sal_uIntPtr)0x00000001) -#define TEXT_LAYOUT_BIDI_STRONG ((sal_uIntPtr)0x00000002) -#define TEXT_LAYOUT_TEXTORIGIN_LEFT ((sal_uIntPtr)0x00000004) -#define TEXT_LAYOUT_TEXTORIGIN_RIGHT ((sal_uIntPtr)0x00000008) -#define TEXT_LAYOUT_COMPLEX_DISABLED ((sal_uIntPtr)0x00000100) -#define TEXT_LAYOUT_ENABLE_LIGATURES ((sal_uIntPtr)0x00000200) -#define TEXT_LAYOUT_SUBSTITUTE_DIGITS ((sal_uIntPtr)0x00000400) +#define TEXT_LAYOUT_DEFAULT ((sal_uLong)0x00000000) +#define TEXT_LAYOUT_BIDI_LTR ((sal_uLong)0x00000000) +#define TEXT_LAYOUT_BIDI_RTL ((sal_uLong)0x00000001) +#define TEXT_LAYOUT_BIDI_STRONG ((sal_uLong)0x00000002) +#define TEXT_LAYOUT_TEXTORIGIN_LEFT ((sal_uLong)0x00000004) +#define TEXT_LAYOUT_TEXTORIGIN_RIGHT ((sal_uLong)0x00000008) +#define TEXT_LAYOUT_COMPLEX_DISABLED ((sal_uLong)0x00000100) +#define TEXT_LAYOUT_ENABLE_LIGATURES ((sal_uLong)0x00000200) +#define TEXT_LAYOUT_SUBSTITUTE_DIGITS ((sal_uLong)0x00000400) // DrawModes -#define DRAWMODE_DEFAULT ((sal_uIntPtr)0x00000000) -#define DRAWMODE_BLACKLINE ((sal_uIntPtr)0x00000001) -#define DRAWMODE_BLACKFILL ((sal_uIntPtr)0x00000002) -#define DRAWMODE_BLACKTEXT ((sal_uIntPtr)0x00000004) -#define DRAWMODE_BLACKBITMAP ((sal_uIntPtr)0x00000008) -#define DRAWMODE_BLACKGRADIENT ((sal_uIntPtr)0x00000010) -#define DRAWMODE_GRAYLINE ((sal_uIntPtr)0x00000020) -#define DRAWMODE_GRAYFILL ((sal_uIntPtr)0x00000040) -#define DRAWMODE_GRAYTEXT ((sal_uIntPtr)0x00000080) -#define DRAWMODE_GRAYBITMAP ((sal_uIntPtr)0x00000100) -#define DRAWMODE_GRAYGRADIENT ((sal_uIntPtr)0x00000200) -#define DRAWMODE_NOFILL ((sal_uIntPtr)0x00000400) -#define DRAWMODE_NOBITMAP ((sal_uIntPtr)0x00000800) -#define DRAWMODE_NOGRADIENT ((sal_uIntPtr)0x00001000) -#define DRAWMODE_GHOSTEDLINE ((sal_uIntPtr)0x00002000) -#define DRAWMODE_GHOSTEDFILL ((sal_uIntPtr)0x00004000) -#define DRAWMODE_GHOSTEDTEXT ((sal_uIntPtr)0x00008000) -#define DRAWMODE_GHOSTEDBITMAP ((sal_uIntPtr)0x00010000) -#define DRAWMODE_GHOSTEDGRADIENT ((sal_uIntPtr)0x00020000) -#define DRAWMODE_WHITELINE ((sal_uIntPtr)0x00100000) -#define DRAWMODE_WHITEFILL ((sal_uIntPtr)0x00200000) -#define DRAWMODE_WHITETEXT ((sal_uIntPtr)0x00400000) -#define DRAWMODE_WHITEBITMAP ((sal_uIntPtr)0x00800000) -#define DRAWMODE_WHITEGRADIENT ((sal_uIntPtr)0x01000000) -#define DRAWMODE_SETTINGSLINE ((sal_uIntPtr)0x02000000) -#define DRAWMODE_SETTINGSFILL ((sal_uIntPtr)0x04000000) -#define DRAWMODE_SETTINGSTEXT ((sal_uIntPtr)0x08000000) -#define DRAWMODE_SETTINGSGRADIENT ((sal_uIntPtr)0x10000000) -#define DRAWMODE_NOTRANSPARENCY ((sal_uIntPtr)0x80000000) +#define DRAWMODE_DEFAULT ((sal_uLong)0x00000000) +#define DRAWMODE_BLACKLINE ((sal_uLong)0x00000001) +#define DRAWMODE_BLACKFILL ((sal_uLong)0x00000002) +#define DRAWMODE_BLACKTEXT ((sal_uLong)0x00000004) +#define DRAWMODE_BLACKBITMAP ((sal_uLong)0x00000008) +#define DRAWMODE_BLACKGRADIENT ((sal_uLong)0x00000010) +#define DRAWMODE_GRAYLINE ((sal_uLong)0x00000020) +#define DRAWMODE_GRAYFILL ((sal_uLong)0x00000040) +#define DRAWMODE_GRAYTEXT ((sal_uLong)0x00000080) +#define DRAWMODE_GRAYBITMAP ((sal_uLong)0x00000100) +#define DRAWMODE_GRAYGRADIENT ((sal_uLong)0x00000200) +#define DRAWMODE_NOFILL ((sal_uLong)0x00000400) +#define DRAWMODE_NOBITMAP ((sal_uLong)0x00000800) +#define DRAWMODE_NOGRADIENT ((sal_uLong)0x00001000) +#define DRAWMODE_GHOSTEDLINE ((sal_uLong)0x00002000) +#define DRAWMODE_GHOSTEDFILL ((sal_uLong)0x00004000) +#define DRAWMODE_GHOSTEDTEXT ((sal_uLong)0x00008000) +#define DRAWMODE_GHOSTEDBITMAP ((sal_uLong)0x00010000) +#define DRAWMODE_GHOSTEDGRADIENT ((sal_uLong)0x00020000) +#define DRAWMODE_WHITELINE ((sal_uLong)0x00100000) +#define DRAWMODE_WHITEFILL ((sal_uLong)0x00200000) +#define DRAWMODE_WHITETEXT ((sal_uLong)0x00400000) +#define DRAWMODE_WHITEBITMAP ((sal_uLong)0x00800000) +#define DRAWMODE_WHITEGRADIENT ((sal_uLong)0x01000000) +#define DRAWMODE_SETTINGSLINE ((sal_uLong)0x02000000) +#define DRAWMODE_SETTINGSFILL ((sal_uLong)0x04000000) +#define DRAWMODE_SETTINGSTEXT ((sal_uLong)0x08000000) +#define DRAWMODE_SETTINGSGRADIENT ((sal_uLong)0x10000000) +#define DRAWMODE_NOTRANSPARENCY ((sal_uLong)0x80000000) // Antialiasing #define ANTIALIASING_DISABLE_TEXT ((sal_uInt16)0x0001) @@ -267,7 +267,7 @@ struct KerningPair #define FONT_SUBSTITUTE_ALWAYS ((sal_uInt16)0x0001) #define FONT_SUBSTITUTE_SCREENONLY ((sal_uInt16)0x0002) -#define DEFAULTFONT_FLAGS_ONLYONE ((sal_uIntPtr)0x00000001) +#define DEFAULTFONT_FLAGS_ONLYONE ((sal_uLong)0x00000001) enum OutDevType { OUTDEV_DONTKNOW, OUTDEV_WINDOW, OUTDEV_PRINTER, OUTDEV_VIRDEV }; @@ -338,8 +338,8 @@ private: mutable long mnTextOffY; mutable long mnEmphasisAscent; mutable long mnEmphasisDescent; - sal_uIntPtr mnDrawMode; - sal_uIntPtr mnTextLayoutMode; + sal_uLong mnDrawMode; + sal_uLong mnTextLayoutMode; ImplMapRes maMapRes; ImplThresholdRes maThresRes; OutDevType meOutDevType; @@ -490,14 +490,14 @@ public: SAL_DLLPRIVATE void ImplDrawOutDevDirect( const OutputDevice* pSrcDev, void* pPosAry ); SAL_DLLPRIVATE void ImplDrawBitmap( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, - const Bitmap& rBitmap, const sal_uIntPtr nAction ); + const Bitmap& rBitmap, const sal_uLong nAction ); SAL_DLLPRIVATE void ImplDrawBitmapEx( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, - const BitmapEx& rBitmapEx, const sal_uIntPtr nAction ); + const BitmapEx& rBitmapEx, const sal_uLong nAction ); SAL_DLLPRIVATE void ImplDrawMask( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, const Bitmap& rBitmap, const Color& rMaskColor, - const sal_uIntPtr nAction ); + const sal_uLong nAction ); SAL_DLLPRIVATE void ImplDrawAlpha( const Bitmap& rBmp, const AlphaMask& rAlpha, const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel ); @@ -614,7 +614,7 @@ public: xub_StrLen nIndex, xub_StrLen nLen, sal_Int32* pDXAry = NULL, long nWidth = 0, sal_Bool bCellBreaking = sal_True ) const; - void DrawStretchText( const Point& rStartPt, sal_uIntPtr nWidth, + void DrawStretchText( const Point& rStartPt, sal_uLong nWidth, const XubString& rStr, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN ); xub_StrLen GetTextBreak( const XubString& rStr, long nTextWidth, @@ -656,24 +656,24 @@ public: static XubString GetNonMnemonicString( const XubString& rStr ) { xub_StrLen nDummy; return GetNonMnemonicString( rStr, nDummy ); } - sal_uIntPtr GetKerningPairCount() const; - void GetKerningPairs( sal_uIntPtr nPairs, KerningPair* pKernPairs ) const; + sal_uLong GetKerningPairCount() const; + void GetKerningPairs( sal_uLong nPairs, KerningPair* pKernPairs ) const; sal_Bool GetTextBoundRect( Rectangle& rRect, const String& rStr, xub_StrLen nBase = 0, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN, - sal_uIntPtr nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const; + sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const; sal_Bool GetTextOutline( PolyPolygon&, const String& rStr, xub_StrLen nBase = 0, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN, sal_Bool bOptimize = sal_True, - sal_uIntPtr nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const; + sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const; sal_Bool GetTextOutlines( PolyPolyVector&, const String& rStr, xub_StrLen nBase = 0, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN, sal_Bool bOptimize = sal_True, - sal_uIntPtr nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const; + sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const; sal_Bool GetTextOutlines( ::basegfx::B2DPolyPolygonVector&, const String& rStr, xub_StrLen nBase = 0, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN, sal_Bool bOptimize = sal_True, - sal_uIntPtr nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const; + sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const; sal_Bool GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ); @@ -738,7 +738,7 @@ public: void DrawRect( const Rectangle& rRect ); void DrawRect( const Rectangle& rRect, - sal_uIntPtr nHorzRount, sal_uIntPtr nVertRound ); + sal_uLong nHorzRount, sal_uLong nVertRound ); void DrawEllipse( const Rectangle& rRect ); void DrawArc( const Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ); @@ -805,7 +805,7 @@ public: void DrawWallpaper( const Rectangle& rRect, const Wallpaper& rWallpaper ); void DrawWaveLine( const Point& rStartPos, const Point& rEndPos, sal_uInt16 nStyle ); - void DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uIntPtr nFlags ); + void DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uLong nFlags ); void DrawTransparent( const PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ); void DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly, double fTransparency); @@ -850,11 +850,11 @@ public: void SetAntialiasing( sal_uInt16 nMode = 0 ); sal_uInt16 GetAntialiasing() const { return mnAntialiasing; } - void SetDrawMode( sal_uIntPtr nDrawMode ); - sal_uIntPtr GetDrawMode() const { return mnDrawMode; } + void SetDrawMode( sal_uLong nDrawMode ); + sal_uLong GetDrawMode() const { return mnDrawMode; } - void SetLayoutMode( sal_uIntPtr nTextLayoutMode ); - sal_uIntPtr GetLayoutMode() const { return mnTextLayoutMode; } + void SetLayoutMode( sal_uLong nTextLayoutMode ); + sal_uLong GetLayoutMode() const { return mnTextLayoutMode; } void SetDigitLanguage( LanguageType ); LanguageType GetDigitLanguage() const { return meTextLanguage; } @@ -1104,7 +1104,7 @@ public: the alpha channel otherwise. */ sal_uInt16 GetAlphaBitCount() const; - sal_uIntPtr GetColorCount() const; + sal_uLong GetColorCount() const; void Push( sal_uInt16 nFlags = PUSH_ALL ); void Pop(); @@ -1145,7 +1145,7 @@ public: static Font GetDefaultFont( sal_uInt16 nType, LanguageType eLang, - sal_uIntPtr nFlags, + sal_uLong nFlags, const OutputDevice* pOutDev = NULL ); /** helper method removing transparencies from a metafile (e.g. for printing) diff --git a/vcl/inc/vcl/outfont.hxx b/vcl/inc/vcl/outfont.hxx index 86b992e16031..972709a41dea 100644 --- a/vcl/inc/vcl/outfont.hxx +++ b/vcl/inc/vcl/outfont.hxx @@ -235,7 +235,7 @@ protected: ImplDevFontListData* ImplFindByTokenNames( const String& ) const; ImplDevFontListData* ImplFindByAliasName( const String& rSearchName, const String& rShortName ) const; ImplDevFontListData* ImplFindBySubstFontAttr( const utl::FontNameAttr& ) const; - ImplDevFontListData* ImplFindByAttributes( sal_uIntPtr nSearchType, FontWeight, FontWidth, + ImplDevFontListData* ImplFindByAttributes( sal_uLong nSearchType, FontWeight, FontWidth, FontFamily, FontItalic, const String& rSearchFamily ) const; ImplDevFontListData* FindDefaultFont() const; @@ -335,7 +335,7 @@ public: // TODO: make data members private ImplFontMetricData maMetric; // Font Metric const ConvertChar* mpConversion; // used e.g. for StarBats->StarSymbol long mnLineHeight; - sal_uIntPtr mnRefCount; + sal_uLong mnRefCount; sal_uInt16 mnSetFontFlags; // Flags returned by SalGraphics::SetFont() short mnOwnOrientation; // text angle if lower layers don't rotate text themselves short mnOrientation; // text angle in 3600 system diff --git a/vcl/inc/vcl/pdfwriter.hxx b/vcl/inc/vcl/pdfwriter.hxx index 98c80153dbdf..87b7bce3f621 100644 --- a/vcl/inc/vcl/pdfwriter.hxx +++ b/vcl/inc/vcl/pdfwriter.hxx @@ -711,7 +711,7 @@ The following structure describes the permissions used in PDF security void SetAntialiasing( sal_uInt16 nMode = 0 ); - void SetLayoutMode( sal_uIntPtr nMode ); + void SetLayoutMode( sal_uLong nMode ); void SetDigitLanguage( LanguageType eLang ); void SetLineColor( const Color& rColor ); @@ -747,7 +747,7 @@ The following structure describes the permissions used in PDF security const sal_Int32* pDXAry = NULL, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN ); - void DrawStretchText( const Point& rStartPt, sal_uIntPtr nWidth, + void DrawStretchText( const Point& rStartPt, sal_uLong nWidth, const XubString& rStr, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN ); void DrawText( const Rectangle& rRect, @@ -771,7 +771,7 @@ The following structure describes the permissions used in PDF security void DrawPolyPolygon( const PolyPolygon& rPolyPoly ); void DrawRect( const Rectangle& rRect ); void DrawRect( const Rectangle& rRect, - sal_uIntPtr nHorzRount, sal_uIntPtr nVertRound ); + sal_uLong nHorzRount, sal_uLong nVertRound ); void DrawEllipse( const Rectangle& rRect ); void DrawArc( const Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ); diff --git a/vcl/inc/vcl/polyscan.hxx b/vcl/inc/vcl/polyscan.hxx index 7c1ac4fd1184..de9f62184483 100644 --- a/vcl/inc/vcl/polyscan.hxx +++ b/vcl/inc/vcl/polyscan.hxx @@ -148,8 +148,8 @@ public: Rectangle GetBoundRect() const { return Rectangle( mnLeft, mnTop, mnRight, mnBottom ); } - sal_uIntPtr Count() const { return Height(); } - PolyScanline* operator[]( sal_uIntPtr nPos ) const; + sal_uLong Count() const { return Height(); } + PolyScanline* operator[]( sal_uLong nPos ) const; }; #endif // _SV_POLYSCAN_HXX diff --git a/vcl/inc/vcl/ppdparser.hxx b/vcl/inc/vcl/ppdparser.hxx index 5e95ac48f724..01cbcbb5fc81 100644 --- a/vcl/inc/vcl/ppdparser.hxx +++ b/vcl/inc/vcl/ppdparser.hxx @@ -157,7 +157,7 @@ private: // some basic attributes bool m_bColorDevice; bool m_bType42Capable; - sal_uIntPtr m_nLanguageLevel; + sal_uLong m_nLanguageLevel; rtl_TextEncoding m_aFileEncoding; @@ -219,7 +219,7 @@ public: bool isColorDevice() const { return m_bColorDevice; } bool isType42Capable() const { return m_bType42Capable; } - sal_uIntPtr getLanguageLevel() const { return m_nLanguageLevel; } + sal_uLong getLanguageLevel() const { return m_nLanguageLevel; } String getDefaultPaperDimension() const; void getDefaultPaperDimension( int& rWidth, int& rHeight ) const @@ -327,8 +327,8 @@ public: void getUnconstrainedValues( const PPDKey*, ::std::list< const PPDValue* >& rValues ); // for printer setup - void* getStreamableBuffer( sal_uIntPtr& rBytes ) const; - void rebuildFromStreamBuffer( void* pBuffer, sal_uIntPtr nBytes ); + void* getStreamableBuffer( sal_uLong& rBytes ) const; + void rebuildFromStreamBuffer( void* pBuffer, sal_uLong nBytes ); // convenience int getRenderResolution() const; diff --git a/vcl/inc/vcl/print.hxx b/vcl/inc/vcl/print.hxx index d70717e2b05e..6ba8ed7637d5 100644 --- a/vcl/inc/vcl/print.hxx +++ b/vcl/inc/vcl/print.hxx @@ -234,7 +234,7 @@ private: JobSetup maJobSetup; Point maPageOffset; Size maPaperSize; - sal_uIntPtr mnError; + sal_uLong mnError; sal_uInt16 mnCurPage; sal_uInt16 mnCurPrintPage; sal_uInt16 mnPageQueueSize; @@ -263,7 +263,7 @@ private: SAL_DLLPRIVATE bool StartJob( const rtl::OUString& rJobName, boost::shared_ptr<vcl::PrinterController>& ); - static SAL_DLLPRIVATE sal_uIntPtr ImplSalPrinterErrorCodeToVCL( sal_uIntPtr nError ); + static SAL_DLLPRIVATE sal_uLong ImplSalPrinterErrorCodeToVCL( sal_uLong nError ); private: SAL_DLLPRIVATE void ImplEndPrint(); @@ -302,7 +302,7 @@ public: sal_Bool IsDisplayPrinter() const { return mpDisplayDev != NULL; } sal_Bool IsValid() const { return !IsDisplayPrinter(); } - sal_uIntPtr GetCapabilities( sal_uInt16 nType ) const; + sal_uLong GetCapabilities( sal_uInt16 nType ) const; sal_Bool HasSupport( PrinterSupport eFeature ) const; sal_Bool SetJobSetup( const JobSetup& rSetup ); @@ -358,8 +358,8 @@ public: sal_uInt16 GetCurPage() const { return mnCurPage; } sal_Bool IsJobActive() const { return mbJobActive; } - sal_uIntPtr GetError() const { return ERRCODE_TOERROR(mnError); } - sal_uIntPtr GetErrorCode() const { return mnError; } + sal_uLong GetError() const { return ERRCODE_TOERROR(mnError); } + sal_uLong GetErrorCode() const { return mnError; } void SetErrorHdl( const Link& rLink ) { maErrorHdl = rLink; } const Link& GetErrorHdl() const { return maErrorHdl; } @@ -537,7 +537,7 @@ public: SAL_DLLPRIVATE int getPageCountProtected() const; SAL_DLLPRIVATE com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > getPageParametersProtected( int i_nPage ) const; - SAL_DLLPRIVATE sal_uIntPtr removeTransparencies( GDIMetaFile& i_rIn, GDIMetaFile& o_rOut ); + SAL_DLLPRIVATE sal_uLong removeTransparencies( GDIMetaFile& i_rIn, GDIMetaFile& o_rOut ); }; class VCL_DLLPUBLIC PrinterOptionsHelper diff --git a/vcl/inc/vcl/prntypes.hxx b/vcl/inc/vcl/prntypes.hxx index be9d760d2ca5..bb1911f0e5a2 100644 --- a/vcl/inc/vcl/prntypes.hxx +++ b/vcl/inc/vcl/prntypes.hxx @@ -48,33 +48,33 @@ enum Orientation { ORIENTATION_PORTRAIT, ORIENTATION_LANDSCAPE }; // - QueueInfo-Types - // ------------------- -#define QUEUE_STATUS_READY ((sal_uIntPtr)0x00000001) -#define QUEUE_STATUS_PAUSED ((sal_uIntPtr)0x00000002) -#define QUEUE_STATUS_PENDING_DELETION ((sal_uIntPtr)0x00000004) -#define QUEUE_STATUS_BUSY ((sal_uIntPtr)0x00000008) -#define QUEUE_STATUS_INITIALIZING ((sal_uIntPtr)0x00000010) -#define QUEUE_STATUS_WAITING ((sal_uIntPtr)0x00000020) -#define QUEUE_STATUS_WARMING_UP ((sal_uIntPtr)0x00000040) -#define QUEUE_STATUS_PROCESSING ((sal_uIntPtr)0x00000080) -#define QUEUE_STATUS_PRINTING ((sal_uIntPtr)0x00000100) -#define QUEUE_STATUS_OFFLINE ((sal_uIntPtr)0x00000200) -#define QUEUE_STATUS_ERROR ((sal_uIntPtr)0x00000400) -#define QUEUE_STATUS_SERVER_UNKNOWN ((sal_uIntPtr)0x00000800) -#define QUEUE_STATUS_PAPER_JAM ((sal_uIntPtr)0x00001000) -#define QUEUE_STATUS_PAPER_OUT ((sal_uIntPtr)0x00002000) -#define QUEUE_STATUS_MANUAL_FEED ((sal_uIntPtr)0x00004000) -#define QUEUE_STATUS_PAPER_PROBLEM ((sal_uIntPtr)0x00008000) -#define QUEUE_STATUS_IO_ACTIVE ((sal_uIntPtr)0x00010000) -#define QUEUE_STATUS_OUTPUT_BIN_FULL ((sal_uIntPtr)0x00020000) -#define QUEUE_STATUS_TONER_LOW ((sal_uIntPtr)0x00040000) -#define QUEUE_STATUS_NO_TONER ((sal_uIntPtr)0x00080000) -#define QUEUE_STATUS_PAGE_PUNT ((sal_uIntPtr)0x00100000) -#define QUEUE_STATUS_USER_INTERVENTION ((sal_uIntPtr)0x00200000) -#define QUEUE_STATUS_OUT_OF_MEMORY ((sal_uIntPtr)0x00400000) -#define QUEUE_STATUS_DOOR_OPEN ((sal_uIntPtr)0x00800000) -#define QUEUE_STATUS_POWER_SAVE ((sal_uIntPtr)0x01000000) +#define QUEUE_STATUS_READY ((sal_uLong)0x00000001) +#define QUEUE_STATUS_PAUSED ((sal_uLong)0x00000002) +#define QUEUE_STATUS_PENDING_DELETION ((sal_uLong)0x00000004) +#define QUEUE_STATUS_BUSY ((sal_uLong)0x00000008) +#define QUEUE_STATUS_INITIALIZING ((sal_uLong)0x00000010) +#define QUEUE_STATUS_WAITING ((sal_uLong)0x00000020) +#define QUEUE_STATUS_WARMING_UP ((sal_uLong)0x00000040) +#define QUEUE_STATUS_PROCESSING ((sal_uLong)0x00000080) +#define QUEUE_STATUS_PRINTING ((sal_uLong)0x00000100) +#define QUEUE_STATUS_OFFLINE ((sal_uLong)0x00000200) +#define QUEUE_STATUS_ERROR ((sal_uLong)0x00000400) +#define QUEUE_STATUS_SERVER_UNKNOWN ((sal_uLong)0x00000800) +#define QUEUE_STATUS_PAPER_JAM ((sal_uLong)0x00001000) +#define QUEUE_STATUS_PAPER_OUT ((sal_uLong)0x00002000) +#define QUEUE_STATUS_MANUAL_FEED ((sal_uLong)0x00004000) +#define QUEUE_STATUS_PAPER_PROBLEM ((sal_uLong)0x00008000) +#define QUEUE_STATUS_IO_ACTIVE ((sal_uLong)0x00010000) +#define QUEUE_STATUS_OUTPUT_BIN_FULL ((sal_uLong)0x00020000) +#define QUEUE_STATUS_TONER_LOW ((sal_uLong)0x00040000) +#define QUEUE_STATUS_NO_TONER ((sal_uLong)0x00080000) +#define QUEUE_STATUS_PAGE_PUNT ((sal_uLong)0x00100000) +#define QUEUE_STATUS_USER_INTERVENTION ((sal_uLong)0x00200000) +#define QUEUE_STATUS_OUT_OF_MEMORY ((sal_uLong)0x00400000) +#define QUEUE_STATUS_DOOR_OPEN ((sal_uLong)0x00800000) +#define QUEUE_STATUS_POWER_SAVE ((sal_uLong)0x01000000) -#define QUEUE_JOBS_DONTKNOW ((sal_uIntPtr)0xFFFFFFFF) +#define QUEUE_JOBS_DONTKNOW ((sal_uLong)0xFFFFFFFF) // ----------------- // - Printer-Types - diff --git a/vcl/inc/vcl/region.hxx b/vcl/inc/vcl/region.hxx index ba33d69485b8..d4a9f5f5c0ab 100644 --- a/vcl/inc/vcl/region.hxx +++ b/vcl/inc/vcl/region.hxx @@ -119,7 +119,7 @@ public: // or created from the constituent rectangles basegfx::B2DPolyPolygon ConvertToB2DPolyPolygon(); - sal_uIntPtr GetRectCount() const; + sal_uLong GetRectCount() const; RegionHandle BeginEnumRects(); sal_Bool GetEnumRects( RegionHandle hRegionHandle, Rectangle& rRect ); sal_Bool GetNextEnumRect( RegionHandle hRegionHandle, Rectangle& rRect ) diff --git a/vcl/inc/vcl/salbtype.hxx b/vcl/inc/vcl/salbtype.hxx index 7105313da5cf..be8faccdc771 100644 --- a/vcl/inc/vcl/salbtype.hxx +++ b/vcl/inc/vcl/salbtype.hxx @@ -84,9 +84,9 @@ typedef ConstHPBYTE ConstScanline; // ------------------------------------------------------------------ #define MASK_TO_COLOR( d_nVal, d_RM, d_GM, d_BM, d_RS, d_GS, d_BS, d_Col ) \ -sal_uIntPtr _def_cR = (sal_uInt8) ( d_RS < 0L ? ( (d_nVal) & d_RM ) << -d_RS : ( (d_nVal) & d_RM ) >> d_RS ); \ -sal_uIntPtr _def_cG = (sal_uInt8) ( d_GS < 0L ? ( (d_nVal) & d_GM ) << -d_GS : ( (d_nVal) & d_GM ) >> d_GS ); \ -sal_uIntPtr _def_cB = (sal_uInt8) ( d_BS < 0L ? ( (d_nVal) & d_BM ) << -d_BS : ( (d_nVal) & d_BM ) >> d_BS ); \ +sal_uLong _def_cR = (sal_uInt8) ( d_RS < 0L ? ( (d_nVal) & d_RM ) << -d_RS : ( (d_nVal) & d_RM ) >> d_RS ); \ +sal_uLong _def_cG = (sal_uInt8) ( d_GS < 0L ? ( (d_nVal) & d_GM ) << -d_GS : ( (d_nVal) & d_GM ) >> d_GS ); \ +sal_uLong _def_cB = (sal_uInt8) ( d_BS < 0L ? ( (d_nVal) & d_BM ) << -d_BS : ( (d_nVal) & d_BM ) >> d_BS ); \ d_Col = BitmapColor( (sal_uInt8) ( _def_cR | ( ( _def_cR & mnROr ) >> mnROrShift ) ), \ (sal_uInt8) ( _def_cG | ( ( _def_cG & mnGOr ) >> mnGOrShift ) ), \ (sal_uInt8) ( _def_cB | ( ( _def_cB & mnBOr ) >> mnBOrShift ) ) ); @@ -162,7 +162,7 @@ public: inline BitmapColor& Merge( const BitmapColor& rColor, sal_uInt8 cTransparency ); inline BitmapColor& Merge( sal_uInt8 cR, sal_uInt8 cG, sal_uInt8 cB, sal_uInt8 cTransparency ); - inline sal_uIntPtr GetColorError( const BitmapColor& rBitmapColor ) const; + inline sal_uLong GetColorError( const BitmapColor& rBitmapColor ) const; }; // --------------- @@ -217,29 +217,29 @@ public: class VCL_DLLPUBLIC ColorMask { - sal_uIntPtr mnRMask; - sal_uIntPtr mnGMask; - sal_uIntPtr mnBMask; + sal_uLong mnRMask; + sal_uLong mnGMask; + sal_uLong mnBMask; long mnRShift; long mnGShift; long mnBShift; - sal_uIntPtr mnROrShift; - sal_uIntPtr mnGOrShift; - sal_uIntPtr mnBOrShift; - sal_uIntPtr mnROr; - sal_uIntPtr mnGOr; - sal_uIntPtr mnBOr; + sal_uLong mnROrShift; + sal_uLong mnGOrShift; + sal_uLong mnBOrShift; + sal_uLong mnROr; + sal_uLong mnGOr; + sal_uLong mnBOr; - SAL_DLLPRIVATE inline long ImplCalcMaskShift( sal_uIntPtr nMask, sal_uIntPtr& rOr, sal_uIntPtr& rOrShift ) const; + SAL_DLLPRIVATE inline long ImplCalcMaskShift( sal_uLong nMask, sal_uLong& rOr, sal_uLong& rOrShift ) const; public: - inline ColorMask( sal_uIntPtr nRedMask = 0UL, sal_uIntPtr nGreenMask = 0UL, sal_uIntPtr nBlueMask = 0UL ); + inline ColorMask( sal_uLong nRedMask = 0UL, sal_uLong nGreenMask = 0UL, sal_uLong nBlueMask = 0UL ); inline ~ColorMask() {} - inline sal_uIntPtr GetRedMask() const; - inline sal_uIntPtr GetGreenMask() const; - inline sal_uIntPtr GetBlueMask() const; + inline sal_uLong GetRedMask() const; + inline sal_uLong GetGreenMask() const; + inline sal_uLong GetBlueMask() const; inline void GetColorFor8Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const; inline void SetColorFor8Bit( const BitmapColor& rColor, HPBYTE pPixel ) const; @@ -262,7 +262,7 @@ public: struct VCL_DLLPUBLIC BitmapBuffer { - sal_uIntPtr mnFormat; + sal_uLong mnFormat; long mnWidth; long mnHeight; long mnScanlineSize; @@ -280,7 +280,7 @@ struct VCL_DLLPUBLIC BitmapBuffer // --------------------- VCL_DLLPUBLIC BitmapBuffer* StretchAndConvert( const BitmapBuffer& rSrcBuffer, const SalTwoRect& rTwoRect, - sal_uIntPtr nDstBitmapFormat, BitmapPalette* pDstPal = NULL, ColorMask* pDstMask = NULL ); + sal_uLong nDstBitmapFormat, BitmapPalette* pDstPal = NULL, ColorMask* pDstMask = NULL ); // ------------------------------------------------------------------ @@ -524,11 +524,11 @@ inline BitmapColor& BitmapColor::Merge( sal_uInt8 cR, sal_uInt8 cG, sal_uInt8 cB // ------------------------------------------------------------------ -inline sal_uIntPtr BitmapColor::GetColorError( const BitmapColor& rBitmapColor ) const +inline sal_uLong BitmapColor::GetColorError( const BitmapColor& rBitmapColor ) const { DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" ); DBG_ASSERT( !rBitmapColor.mbIndex, "Pixel represents index into colortable!" ); - return( (sal_uIntPtr) ( labs( mcBlueOrIndex - rBitmapColor.mcBlueOrIndex ) + + return( (sal_uLong) ( labs( mcBlueOrIndex - rBitmapColor.mcBlueOrIndex ) + labs( mcGreen - rBitmapColor.mcGreen ) + labs( mcRed - rBitmapColor.mcRed ) ) ); } @@ -548,7 +548,7 @@ inline BitmapPalette::BitmapPalette( const BitmapPalette& rBitmapPalette ) : { if( mnCount ) { - const sal_uIntPtr nSize = mnCount * sizeof( BitmapColor ); + const sal_uLong nSize = mnCount * sizeof( BitmapColor ); mpBitmapColor = (BitmapColor*) new sal_uInt8[ nSize ]; memcpy( mpBitmapColor, rBitmapPalette.mpBitmapColor, nSize ); } @@ -563,7 +563,7 @@ inline BitmapPalette::BitmapPalette( sal_uInt16 nCount ) : { if( mnCount ) { - const sal_uIntPtr nSize = mnCount * sizeof( BitmapColor ); + const sal_uLong nSize = mnCount * sizeof( BitmapColor ); mpBitmapColor = (BitmapColor*) new sal_uInt8[ nSize ]; memset( mpBitmapColor, 0, nSize ); } @@ -587,7 +587,7 @@ inline BitmapPalette& BitmapPalette::operator=( const BitmapPalette& rBitmapPale if( mnCount ) { - const sal_uIntPtr nSize = mnCount * sizeof( BitmapColor ); + const sal_uLong nSize = mnCount * sizeof( BitmapColor ); mpBitmapColor = (BitmapColor*) new sal_uInt8[ nSize ]; memcpy( mpBitmapColor, rBitmapPalette.mpBitmapColor, nSize ); } @@ -653,8 +653,8 @@ inline void BitmapPalette::SetEntryCount( sal_uInt16 nCount ) } else if( nCount != mnCount ) { - const sal_uIntPtr nNewSize = nCount * sizeof( BitmapColor ); - const sal_uIntPtr nMinSize = Min( mnCount, nCount ) * sizeof( BitmapColor ); + const sal_uLong nNewSize = nCount * sizeof( BitmapColor ); + const sal_uLong nMinSize = Min( mnCount, nCount ) * sizeof( BitmapColor ); sal_uInt8* pNewColor = new sal_uInt8[ nNewSize ]; if ( nMinSize && mpBitmapColor ) @@ -720,7 +720,7 @@ inline sal_uInt16 BitmapPalette::GetBestIndex( const BitmapColor& rCol ) const // ------------------------------------------------------------------ -inline ColorMask::ColorMask( sal_uIntPtr nRedMask, sal_uIntPtr nGreenMask, sal_uIntPtr nBlueMask ) : +inline ColorMask::ColorMask( sal_uLong nRedMask, sal_uLong nGreenMask, sal_uLong nBlueMask ) : mnRMask( nRedMask ), mnGMask( nGreenMask ), mnBMask( nBlueMask ), @@ -738,20 +738,20 @@ inline ColorMask::ColorMask( sal_uIntPtr nRedMask, sal_uIntPtr nGreenMask, sal_u // ------------------------------------------------------------------ -inline long ColorMask::ImplCalcMaskShift( sal_uIntPtr nMask, sal_uIntPtr& rOr, sal_uIntPtr& rOrShift ) const +inline long ColorMask::ImplCalcMaskShift( sal_uLong nMask, sal_uLong& rOr, sal_uLong& rOrShift ) const { long nShift; long nRet; - sal_uIntPtr nLen = 0UL; + sal_uLong nLen = 0UL; // bei welchen Bits faengt die Maske an - for( nShift = 31L; ( nShift >= 0L ) && !( nMask & ( 1 << (sal_uIntPtr) nShift ) ); nShift-- ) + for( nShift = 31L; ( nShift >= 0L ) && !( nMask & ( 1 << (sal_uLong) nShift ) ); nShift-- ) {} nRet = nShift; // XXX Anzahl der gesetzten Bits ermitteln => nach rechts bis Null laufen - while( ( nShift >= 0L ) && ( nMask & ( 1 << (sal_uIntPtr) nShift ) ) ) + while( ( nShift >= 0L ) && ( nMask & ( 1 << (sal_uLong) nShift ) ) ) { nShift--; nLen++; @@ -765,21 +765,21 @@ inline long ColorMask::ImplCalcMaskShift( sal_uIntPtr nMask, sal_uIntPtr& rOr, s // ------------------------------------------------------------------ -inline sal_uIntPtr ColorMask::GetRedMask() const +inline sal_uLong ColorMask::GetRedMask() const { return mnRMask; } // ------------------------------------------------------------------ -inline sal_uIntPtr ColorMask::GetGreenMask() const +inline sal_uLong ColorMask::GetGreenMask() const { return mnGMask; } // ------------------------------------------------------------------ -inline sal_uIntPtr ColorMask::GetBlueMask() const +inline sal_uLong ColorMask::GetBlueMask() const { return mnBMask; } diff --git a/vcl/inc/vcl/salctype.hxx b/vcl/inc/vcl/salctype.hxx index 837deabf73ce..ccc1d5fa5248 100644 --- a/vcl/inc/vcl/salctype.hxx +++ b/vcl/inc/vcl/salctype.hxx @@ -62,9 +62,9 @@ public: Graphic maGraphic; SvStream& mrStm; - sal_uIntPtr mnFormat; + sal_uLong mnFormat; - ConvertData( const Graphic& rGraphic, SvStream& rStm, sal_uIntPtr nFormat ) : + ConvertData( const Graphic& rGraphic, SvStream& rStm, sal_uLong nFormat ) : maGraphic( rGraphic ), mrStm( rStm ), mnFormat( nFormat ) {} ~ConvertData() {} }; @@ -73,8 +73,8 @@ public: // - Callback - // ------------ -typedef sal_uIntPtr (*SALGRFCVTPROC)( void* pInst, - sal_uIntPtr nInFormat, void* pInBuffer, sal_uIntPtr nInBufSize, - sal_uIntPtr nOutFormat, void** ppOutBuffer ); +typedef sal_uLong (*SALGRFCVTPROC)( void* pInst, + sal_uLong nInFormat, void* pInBuffer, sal_uLong nInBufSize, + sal_uLong nOutFormat, void** ppOutBuffer ); #endif // _SV_SALCTYPE_HXX diff --git a/vcl/inc/vcl/salframe.hxx b/vcl/inc/vcl/salframe.hxx index ee59cdd397f8..c5e9aba8d272 100644 --- a/vcl/inc/vcl/salframe.hxx +++ b/vcl/inc/vcl/salframe.hxx @@ -78,42 +78,42 @@ struct SystemEnvData; // - SalFrameStyle - // ----------------- -#define SAL_FRAME_STYLE_DEFAULT ((sal_uIntPtr)0x00000001) -#define SAL_FRAME_STYLE_MOVEABLE ((sal_uIntPtr)0x00000002) -#define SAL_FRAME_STYLE_SIZEABLE ((sal_uIntPtr)0x00000004) -#define SAL_FRAME_STYLE_CLOSEABLE ((sal_uIntPtr)0x00000008) +#define SAL_FRAME_STYLE_DEFAULT ((sal_uLong)0x00000001) +#define SAL_FRAME_STYLE_MOVEABLE ((sal_uLong)0x00000002) +#define SAL_FRAME_STYLE_SIZEABLE ((sal_uLong)0x00000004) +#define SAL_FRAME_STYLE_CLOSEABLE ((sal_uLong)0x00000008) // no shadow effect on WindowsXP -#define SAL_FRAME_STYLE_NOSHADOW ((sal_uIntPtr)0x00000010) +#define SAL_FRAME_STYLE_NOSHADOW ((sal_uLong)0x00000010) // indicate tooltip windows, so they can always be topmost -#define SAL_FRAME_STYLE_TOOLTIP ((sal_uIntPtr)0x00000020) +#define SAL_FRAME_STYLE_TOOLTIP ((sal_uLong)0x00000020) // windows without windowmanager decoration, this typically only applies to floating windows -#define SAL_FRAME_STYLE_OWNERDRAWDECORATION ((sal_uIntPtr)0x00000040) +#define SAL_FRAME_STYLE_OWNERDRAWDECORATION ((sal_uLong)0x00000040) // dialogs -#define SAL_FRAME_STYLE_DIALOG ((sal_uIntPtr)0x00000080) +#define SAL_FRAME_STYLE_DIALOG ((sal_uLong)0x00000080) // partial fullscreen: fullscreen on one monitor of a multimonitor display -#define SAL_FRAME_STYLE_PARTIAL_FULLSCREEN ((sal_uIntPtr)0x00800000) +#define SAL_FRAME_STYLE_PARTIAL_FULLSCREEN ((sal_uLong)0x00800000) // plugged system child window -#define SAL_FRAME_STYLE_PLUG ((sal_uIntPtr)0x10000000) +#define SAL_FRAME_STYLE_PLUG ((sal_uLong)0x10000000) // system child window inside another SalFrame -#define SAL_FRAME_STYLE_SYSTEMCHILD ((sal_uIntPtr)0x08000000) +#define SAL_FRAME_STYLE_SYSTEMCHILD ((sal_uLong)0x08000000) // floating window -#define SAL_FRAME_STYLE_FLOAT ((sal_uIntPtr)0x20000000) +#define SAL_FRAME_STYLE_FLOAT ((sal_uLong)0x20000000) // floating window that needs to be focusable -#define SAL_FRAME_STYLE_FLOAT_FOCUSABLE ((sal_uIntPtr)0x04000000) +#define SAL_FRAME_STYLE_FLOAT_FOCUSABLE ((sal_uLong)0x04000000) // toolwindows should be painted with a smaller decoration -#define SAL_FRAME_STYLE_TOOLWINDOW ((sal_uIntPtr)0x40000000) +#define SAL_FRAME_STYLE_TOOLWINDOW ((sal_uLong)0x40000000) // the window containing the intro bitmap, aka splashscreen -#define SAL_FRAME_STYLE_INTRO ((sal_uIntPtr)0x80000000) +#define SAL_FRAME_STYLE_INTRO ((sal_uLong)0x80000000) /* -#define SAL_FRAME_STYLE_MINABLE ((sal_uIntPtr)0x00000008) -#define SAL_FRAME_STYLE_MAXABLE ((sal_uIntPtr)0x00000010) -#define SAL_FRAME_STYLE_BORDER ((sal_uIntPtr)0x00000040) -#define SAL_FRAME_STYLE_DOC ((sal_uIntPtr)0x00004000) -#define SAL_FRAME_STYLE_DIALOG ((sal_uIntPtr)0x00008000) -#define SAL_FRAME_STYLE_TOOL ((sal_uIntPtr)0x00010000) -#define SAL_FRAME_STYLE_FULLSIZE ((sal_uIntPtr)0x00020000) +#define SAL_FRAME_STYLE_MINABLE ((sal_uLong)0x00000008) +#define SAL_FRAME_STYLE_MAXABLE ((sal_uLong)0x00000010) +#define SAL_FRAME_STYLE_BORDER ((sal_uLong)0x00000040) +#define SAL_FRAME_STYLE_DOC ((sal_uLong)0x00004000) +#define SAL_FRAME_STYLE_DIALOG ((sal_uLong)0x00008000) +#define SAL_FRAME_STYLE_TOOL ((sal_uLong)0x00010000) +#define SAL_FRAME_STYLE_FULLSIZE ((sal_uLong)0x00020000) */ // ---------------------------------------- @@ -244,7 +244,7 @@ public: // get current modifier, button mask and mouse position struct SalPointerState { - sal_uIntPtr mnState; + sal_uLong mnState; Point maPos; // in frame coordinates }; @@ -264,7 +264,7 @@ public: // set clip region to none (-> rectangular windows, normal state) virtual void ResetClipRegion() = 0; // start setting the clipregion consisting of nRects rectangles - virtual void BeginSetClipRegion( sal_uIntPtr nRects ) = 0; + virtual void BeginSetClipRegion( sal_uLong nRects ) = 0; // add a rectangle to the clip region virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) = 0; // done setting up the clipregion diff --git a/vcl/inc/vcl/salgdi.hxx b/vcl/inc/vcl/salgdi.hxx index a6f7d5b3e8dc..530d75f9ad4d 100644 --- a/vcl/inc/vcl/salgdi.hxx +++ b/vcl/inc/vcl/salgdi.hxx @@ -121,13 +121,13 @@ protected: virtual void drawPixel( long nX, long nY, SalColor nSalColor ) = 0; virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ) = 0; virtual void drawRect( long nX, long nY, long nWidth, long nHeight ) = 0; - virtual void drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry ) = 0; - virtual void drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry ) = 0; + virtual void drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry ) = 0; + virtual void drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry ) = 0; virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ) = 0; virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) = 0; virtual bool drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin ) = 0; - virtual sal_Bool drawPolyLineBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) = 0; - virtual sal_Bool drawPolygonBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) = 0; + virtual sal_Bool drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) = 0; + virtual sal_Bool drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) = 0; virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry ) = 0; // CopyArea --> No RasterOp, but ClipRegion @@ -153,9 +153,9 @@ protected: // invert --> ClipRegion (only Windows or VirDevs) virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) = 0; - virtual void invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert nFlags ) = 0; + virtual void invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags ) = 0; - virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ) = 0; + virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) = 0; // native widget rendering methods that require mirroring virtual sal_Bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, @@ -207,7 +207,7 @@ public: virtual void ResetClipRegion() = 0; // begin setting the clip region, add rectangles to the // region with the UnionClipRegion call - virtual void BeginSetClipRegion( sal_uIntPtr nCount ) = 0; + virtual void BeginSetClipRegion( sal_uLong nCount ) = 0; // all rectangles were added and the clip region should be set now virtual void EndSetClipRegion() = 0; @@ -237,7 +237,7 @@ public: // get kernign pairs of the current font // return only PairCount if (pKernPairs == NULL) - virtual sal_uIntPtr GetKernPairs( sal_uIntPtr nMaxPairCount, ImplKernPairData* ) = 0; + virtual sal_uLong GetKernPairs( sal_uLong nMaxPairCount, ImplKernPairData* ) = 0; // get the repertoire of the current font virtual const ImplFontCharMap* GetImplFontCharMap() const = 0; // graphics must fill supplied font list @@ -366,19 +366,19 @@ public: void DrawPixel( long nX, long nY, SalColor nSalColor, const OutputDevice *pOutDev ); void DrawLine( long nX1, long nY1, long nX2, long nY2, const OutputDevice *pOutDev ); void DrawRect( long nX, long nY, long nWidth, long nHeight, const OutputDevice *pOutDev ); - void DrawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev ); - void DrawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev ); + void DrawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev ); + void DrawPolygon( sal_uLong nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev ); void DrawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry, const OutputDevice *pOutDev ); bool DrawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency, const OutputDevice* ); bool DrawPolyLine( const basegfx::B2DPolygon&, double fTransparency, const basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin, const OutputDevice* ); - sal_Bool DrawPolyLineBezier( sal_uIntPtr nPoints, + sal_Bool DrawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry, const OutputDevice *pOutDev ); - sal_Bool DrawPolygonBezier( sal_uIntPtr nPoints, + sal_Bool DrawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry, const OutputDevice *pOutDev ); @@ -426,9 +426,9 @@ public: // invert --> ClipRegion (only Windows) void Invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags, const OutputDevice *pOutDev ); - void Invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert nFlags, const OutputDevice *pOutDev ); + void Invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags, const OutputDevice *pOutDev ); - sal_Bool DrawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize, const OutputDevice *pOutDev ); + sal_Bool DrawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize, const OutputDevice *pOutDev ); //------------------------------------- // Native Widget Rendering functions diff --git a/vcl/inc/vcl/salinst.hxx b/vcl/inc/vcl/salinst.hxx index 31d07eac397d..e1ed7288651a 100644 --- a/vcl/inc/vcl/salinst.hxx +++ b/vcl/inc/vcl/salinst.hxx @@ -89,8 +89,8 @@ public: // Frame // DisplayName for Unix ??? - virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uIntPtr nStyle ) = 0; - virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle ) = 0; + virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle ) = 0; + virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle ) = 0; virtual void DestroyFrame( SalFrame* pFrame ) = 0; // Object (System Child Window) @@ -132,8 +132,8 @@ public: // YieldMutex virtual vos::IMutex* GetYieldMutex() = 0; - virtual sal_uIntPtr ReleaseYieldMutex() = 0; - virtual void AcquireYieldMutex( sal_uIntPtr nCount ) = 0; + virtual sal_uLong ReleaseYieldMutex() = 0; + virtual void AcquireYieldMutex( sal_uLong nCount ) = 0; // return true, if yield mutex is owned by this thread, else false virtual bool CheckYieldMutex() = 0; diff --git a/vcl/inc/vcl/salmenu.hxx b/vcl/inc/vcl/salmenu.hxx index d6b5bd784079..ab9f44922aa8 100644 --- a/vcl/inc/vcl/salmenu.hxx +++ b/vcl/inc/vcl/salmenu.hxx @@ -86,7 +86,7 @@ public: virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage ) = 0; virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const XubString& rKeyName ) = 0; virtual void GetSystemMenuData( SystemMenuData* pData ) = 0; - virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, sal_uIntPtr nFlags); + virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, sal_uLong nFlags); virtual bool AddMenuBarButton( const SalMenuButtonItem& ); // return false if not implemented or failure virtual void RemoveMenuBarButton( sal_uInt16 nId ); diff --git a/vcl/inc/vcl/salobj.hxx b/vcl/inc/vcl/salobj.hxx index 4132a02ef736..649058289699 100644 --- a/vcl/inc/vcl/salobj.hxx +++ b/vcl/inc/vcl/salobj.hxx @@ -59,7 +59,7 @@ public: virtual void ResetClipRegion() = 0; virtual sal_uInt16 GetClipRegionType() = 0; - virtual void BeginSetClipRegion( sal_uIntPtr nRects ) = 0; + virtual void BeginSetClipRegion( sal_uLong nRects ) = 0; virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) = 0; virtual void EndSetClipRegion() = 0; diff --git a/vcl/inc/vcl/salprn.hxx b/vcl/inc/vcl/salprn.hxx index b85c3430001f..ae21a8a5b438 100644 --- a/vcl/inc/vcl/salprn.hxx +++ b/vcl/inc/vcl/salprn.hxx @@ -50,8 +50,8 @@ struct VCL_DLLPUBLIC SalPrinterQueueInfo XubString maDriver; XubString maLocation; XubString maComment; - sal_uIntPtr mnStatus; - sal_uIntPtr mnJobs; + sal_uLong mnStatus; + sal_uLong mnJobs; void* mpSysData; SalPrinterQueueInfo(); @@ -85,15 +85,15 @@ public: // and set the new indepen data in pSetupData // Only the data must changed, where the bit // in nFlags is set - virtual sal_Bool SetData( sal_uIntPtr nFlags, ImplJobSetup* pSetupData ) = 0; + virtual sal_Bool SetData( sal_uLong nFlags, ImplJobSetup* pSetupData ) = 0; virtual void GetPageInfo( const ImplJobSetup* pSetupData, long& rOutWidth, long& rOutHeight, long& rPageOffX, long& rPageOffY, long& rPageWidth, long& rPageHeight ) = 0; - virtual sal_uIntPtr GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ) = 0; - virtual sal_uIntPtr GetPaperBinCount( const ImplJobSetup* pSetupData ) = 0; - virtual String GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin ) = 0; + virtual sal_uLong GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ) = 0; + virtual sal_uLong GetPaperBinCount( const ImplJobSetup* pSetupData ) = 0; + virtual String GetPaperBinName( const ImplJobSetup* pSetupData, sal_uLong nPaperBin ) = 0; // fills m_aPaperFormats and sets m_bPapersInit to true virtual void InitPaperFormats( const ImplJobSetup* pSetupData ) = 0; // returns angle that a landscape page will be turned counterclockwise wrt to portrait @@ -113,7 +113,7 @@ public: // public for Sal Implementation virtual sal_Bool StartJob( const String* pFileName, const String& rJobName, const String& rAppName, - sal_uIntPtr nCopies, + sal_uLong nCopies, bool bCollate, bool bDirect, ImplJobSetup* pSetupData ) = 0; @@ -130,7 +130,7 @@ public: // public for Sal Implementation virtual sal_Bool AbortJob() = 0; virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, sal_Bool bNewJobData ) = 0; virtual sal_Bool EndPage() = 0; - virtual sal_uIntPtr GetErrorCode() = 0; + virtual sal_uLong GetErrorCode() = 0; }; diff --git a/vcl/inc/vcl/salptype.hxx b/vcl/inc/vcl/salptype.hxx index 21c3ca4e71ea..136821b76855 100644 --- a/vcl/inc/vcl/salptype.hxx +++ b/vcl/inc/vcl/salptype.hxx @@ -34,10 +34,10 @@ // - SalJobSetupFlags - // -------------------- -#define SAL_JOBSET_ORIENTATION ((sal_uIntPtr)0x00000001) -#define SAL_JOBSET_PAPERBIN ((sal_uIntPtr)0x00000002) -#define SAL_JOBSET_PAPERSIZE ((sal_uIntPtr)0x00000004) -#define SAL_JOBSET_DUPLEXMODE ((sal_uIntPtr)0x00000008) +#define SAL_JOBSET_ORIENTATION ((sal_uLong)0x00000001) +#define SAL_JOBSET_PAPERBIN ((sal_uLong)0x00000002) +#define SAL_JOBSET_PAPERSIZE ((sal_uLong)0x00000004) +#define SAL_JOBSET_DUPLEXMODE ((sal_uLong)0x00000008) #define SAL_JOBSET_ALL (SAL_JOBSET_ORIENTATION |\ SAL_JOBSET_PAPERBIN |\ SAL_JOBSET_PAPERSIZE |\ diff --git a/vcl/inc/vcl/saltimer.hxx b/vcl/inc/vcl/saltimer.hxx index d92721e64351..13b85d609e9e 100644 --- a/vcl/inc/vcl/saltimer.hxx +++ b/vcl/inc/vcl/saltimer.hxx @@ -50,7 +50,7 @@ public: virtual ~SalTimer(); // AutoRepeat and Restart - virtual void Start( sal_uIntPtr nMS ) = 0; + virtual void Start( sal_uLong nMS ) = 0; virtual void Stop() = 0; // Callbacks (indepen in \sv\source\app\timer.cxx) diff --git a/vcl/inc/vcl/salwtype.hxx b/vcl/inc/vcl/salwtype.hxx index ceb49d2cefa6..55753465a860 100644 --- a/vcl/inc/vcl/salwtype.hxx +++ b/vcl/inc/vcl/salwtype.hxx @@ -114,7 +114,7 @@ class ImplFontSelectData; // MAC: Ctrl+Button is MOUSE_RIGHT struct SalMouseEvent { - sal_uIntPtr mnTime; // Time in ms, when event is created + sal_uLong mnTime; // Time in ms, when event is created long mnX; // X-Position (Pixel, TopLeft-Output) long mnY; // Y-Position (Pixel, TopLeft-Output) sal_uInt16 mnButton; // 0-MouseMove/MouseLeave, MOUSE_LEFT, MOUSE_RIGHT, MOUSE_MIDDLE @@ -124,7 +124,7 @@ struct SalMouseEvent // KEYINPUT and KEYUP struct SalKeyEvent { - sal_uIntPtr mnTime; // Time in ms, when event is created + sal_uLong mnTime; // Time in ms, when event is created sal_uInt16 mnCode; // SV-KeyCode (KEY_xxx | KEY_SHIFT | KEY_MOD1 | KEY_MOD2) sal_uInt16 mnCharCode; // SV-CharCode sal_uInt16 mnRepeat; // Repeat-Count (KeyInputs-1) @@ -144,7 +144,7 @@ struct SalMenuEvent // KEYMODCHANGE struct SalKeyModEvent { - sal_uIntPtr mnTime; // Time in ms, when event is created + sal_uLong mnTime; // Time in ms, when event is created sal_uInt16 mnCode; // SV-ModifierCode (KEY_SHIFT | KEY_MOD1 | KEY_MOD2) sal_uInt16 mnModKeyCode; // extended Modifier (MODKEY_LEFT, MODKEY_RIGHT, MODKEY_PRESS, MODKEY_RELEASE) }; @@ -169,15 +169,15 @@ struct SalPaintEvent // pEvent == pData // WHEELMOUSE -#define SAL_WHEELMOUSE_EVENT_PAGESCROLL ((sal_uIntPtr)0xFFFFFFFF) +#define SAL_WHEELMOUSE_EVENT_PAGESCROLL ((sal_uLong)0xFFFFFFFF) struct SalWheelMouseEvent { - sal_uIntPtr mnTime; // Time in ms, when event is created + sal_uLong mnTime; // Time in ms, when event is created long mnX; // X-Position (Pixel, TopLeft-Output) long mnY; // Y-Position (Pixel, TopLeft-Output) long mnDelta; // Anzahl Drehungen long mnNotchDelta; // Anzahl feste Drehungen - sal_uIntPtr mnScrollLines; // Aktuelle Anzahl zu scrollende Zeilen + sal_uLong mnScrollLines; // Aktuelle Anzahl zu scrollende Zeilen sal_uInt16 mnCode; // SV-ModifierCode (KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT) sal_Bool mbHorz; // Horizontal sal_Bool mbDeltaIsPixel; // delta value is a pixel value (on mac) @@ -199,11 +199,11 @@ struct SalMouseActivateEvent // EXTTEXTINPUT struct SalExtTextInputEvent { - sal_uIntPtr mnTime; // Time in ms, when event is created + sal_uLong mnTime; // Time in ms, when event is created UniString maText; // Text const sal_uInt16* mpTextAttr; // Text-Attribute - sal_uIntPtr mnCursorPos; // Cursor-Position - sal_uIntPtr mnDeltaStart; // Start-Position der letzten Aenderung + sal_uLong mnCursorPos; // Cursor-Position + sal_uLong mnDeltaStart; // Start-Position der letzten Aenderung sal_uInt8 mnCursorFlags; // SAL_EXTTEXTINPUT_CURSOR_xxx sal_Bool mbOnlyCursor; // sal_True: Nur Cursor-Position wurde geaendert }; @@ -237,8 +237,8 @@ struct SalInputContextChangeEvent struct SalSurroundingTextRequestEvent { UniString maText; // Text - sal_uIntPtr mnStart; // The beggining index of selected range - sal_uIntPtr mnEnd; // The end index of selected range + sal_uLong mnStart; // The beggining index of selected range + sal_uLong mnEnd; // The end index of selected range }; #endif // __cplusplus @@ -248,8 +248,8 @@ struct SalSurroundingTextRequestEvent // SURROUNDINGTEXTSELECTIONCHANGE struct SalSurroundingTextSelectionChangeEvent { - sal_uIntPtr mnStart; // The beggining index of selected range - sal_uIntPtr mnEnd; // The end index of selected range + sal_uLong mnStart; // The beggining index of selected range + sal_uLong mnEnd; // The end index of selected range }; #endif // __cplusplus @@ -282,27 +282,27 @@ typedef long (*SALOBJECTPROC)( void* pInst, SalObject* pObject, // ----------------- // Must be the same as in syswin.hxx -#define SAL_FRAMESTATE_MASK_X ((sal_uIntPtr)0x00000001) -#define SAL_FRAMESTATE_MASK_Y ((sal_uIntPtr)0x00000002) -#define SAL_FRAMESTATE_MASK_WIDTH ((sal_uIntPtr)0x00000004) -#define SAL_FRAMESTATE_MASK_HEIGHT ((sal_uIntPtr)0x00000008) -#define SAL_FRAMESTATE_MASK_MAXIMIZED_X ((sal_uIntPtr)0x00000100) -#define SAL_FRAMESTATE_MASK_MAXIMIZED_Y ((sal_uIntPtr)0x00000200) -#define SAL_FRAMESTATE_MASK_MAXIMIZED_WIDTH ((sal_uIntPtr)0x00000400) -#define SAL_FRAMESTATE_MASK_MAXIMIZED_HEIGHT ((sal_uIntPtr)0x00000800) -#define SAL_FRAMESTATE_MASK_STATE ((sal_uIntPtr)0x00000010) - -#define SAL_FRAMESTATE_NORMAL ((sal_uIntPtr)0x00000001) -#define SAL_FRAMESTATE_MINIMIZED ((sal_uIntPtr)0x00000002) -#define SAL_FRAMESTATE_MAXIMIZED ((sal_uIntPtr)0x00000004) -#define SAL_FRAMESTATE_ROLLUP ((sal_uIntPtr)0x00000008) -#define SAL_FRAMESTATE_MAXIMIZED_HORZ ((sal_uIntPtr)0x00000010) -#define SAL_FRAMESTATE_MAXIMIZED_VERT ((sal_uIntPtr)0x00000020) -#define SAL_FRAMESTATE_SYSTEMMASK ((sal_uIntPtr)0x0000FFFF) +#define SAL_FRAMESTATE_MASK_X ((sal_uLong)0x00000001) +#define SAL_FRAMESTATE_MASK_Y ((sal_uLong)0x00000002) +#define SAL_FRAMESTATE_MASK_WIDTH ((sal_uLong)0x00000004) +#define SAL_FRAMESTATE_MASK_HEIGHT ((sal_uLong)0x00000008) +#define SAL_FRAMESTATE_MASK_MAXIMIZED_X ((sal_uLong)0x00000100) +#define SAL_FRAMESTATE_MASK_MAXIMIZED_Y ((sal_uLong)0x00000200) +#define SAL_FRAMESTATE_MASK_MAXIMIZED_WIDTH ((sal_uLong)0x00000400) +#define SAL_FRAMESTATE_MASK_MAXIMIZED_HEIGHT ((sal_uLong)0x00000800) +#define SAL_FRAMESTATE_MASK_STATE ((sal_uLong)0x00000010) + +#define SAL_FRAMESTATE_NORMAL ((sal_uLong)0x00000001) +#define SAL_FRAMESTATE_MINIMIZED ((sal_uLong)0x00000002) +#define SAL_FRAMESTATE_MAXIMIZED ((sal_uLong)0x00000004) +#define SAL_FRAMESTATE_ROLLUP ((sal_uLong)0x00000008) +#define SAL_FRAMESTATE_MAXIMIZED_HORZ ((sal_uLong)0x00000010) +#define SAL_FRAMESTATE_MAXIMIZED_VERT ((sal_uLong)0x00000020) +#define SAL_FRAMESTATE_SYSTEMMASK ((sal_uLong)0x0000FFFF) struct SalFrameState { - sal_uIntPtr mnMask; + sal_uLong mnMask; long mnX; long mnY; long mnWidth; @@ -311,7 +311,7 @@ struct SalFrameState long mnMaximizedY; long mnMaximizedWidth; long mnMaximizedHeight; - sal_uIntPtr mnState; + sal_uLong mnState; }; // ------------------- @@ -320,11 +320,11 @@ struct SalFrameState // Muessen mit den Defines in inputctx.hxx uebereinstimmen, da diese // nicht konvertiert werden -#define SAL_INPUTCONTEXT_TEXT ((sal_uIntPtr)0x00000001) -#define SAL_INPUTCONTEXT_EXTTEXTINPUT ((sal_uIntPtr)0x00000002) -#define SAL_INPUTCONTEXT_EXTTEXTINPUT_ON ((sal_uIntPtr)0x00000004) -#define SAL_INPUTCONTEXT_EXTTEXTINPUT_OFF ((sal_uIntPtr)0x00000008) -#define SAL_INPUTCONTEXT_CHANGELANGUAGE ((sal_uIntPtr)0x00000010) +#define SAL_INPUTCONTEXT_TEXT ((sal_uLong)0x00000001) +#define SAL_INPUTCONTEXT_EXTTEXTINPUT ((sal_uLong)0x00000002) +#define SAL_INPUTCONTEXT_EXTTEXTINPUT_ON ((sal_uLong)0x00000004) +#define SAL_INPUTCONTEXT_EXTTEXTINPUT_OFF ((sal_uLong)0x00000008) +#define SAL_INPUTCONTEXT_CHANGELANGUAGE ((sal_uLong)0x00000010) #ifdef __cplusplus @@ -332,7 +332,7 @@ struct SalInputContext { ImplFontSelectData* mpFont; LanguageType meLanguage; - sal_uIntPtr mnOptions; + sal_uLong mnOptions; }; #endif // __cplusplus diff --git a/vcl/inc/vcl/scrbar.hxx b/vcl/inc/vcl/scrbar.hxx index 9025da334d44..f608ec123818 100644 --- a/vcl/inc/vcl/scrbar.hxx +++ b/vcl/inc/vcl/scrbar.hxx @@ -105,7 +105,7 @@ public: virtual void Tracking( const TrackingEvent& rTEvt ); virtual void KeyInput( const KeyEvent& rKEvt ); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx index 56eb0eedf8c3..a09e9617504a 100644 --- a/vcl/inc/vcl/settings.hxx +++ b/vcl/inc/vcl/settings.hxx @@ -56,10 +56,10 @@ class ImplMachineData ImplMachineData( const ImplMachineData& rData ); private: - sal_uIntPtr mnRefCount; - sal_uIntPtr mnOptions; - sal_uIntPtr mnScreenOptions; - sal_uIntPtr mnPrintOptions; + sal_uLong mnRefCount; + sal_uLong mnOptions; + sal_uLong mnScreenOptions; + sal_uLong mnPrintOptions; long mnScreenRasterFontDeviation; }; @@ -79,17 +79,17 @@ public: MachineSettings( const MachineSettings& rSet ); ~MachineSettings(); - void SetOptions( sal_uIntPtr nOptions ) + void SetOptions( sal_uLong nOptions ) { CopyData(); mpData->mnOptions = nOptions; } - sal_uIntPtr GetOptions() const + sal_uLong GetOptions() const { return mpData->mnOptions; } - void SetScreenOptions( sal_uIntPtr nOptions ) + void SetScreenOptions( sal_uLong nOptions ) { CopyData(); mpData->mnScreenOptions = nOptions; } - sal_uIntPtr GetScreenOptions() const + sal_uLong GetScreenOptions() const { return mpData->mnScreenOptions; } - void SetPrintOptions( sal_uIntPtr nOptions ) + void SetPrintOptions( sal_uLong nOptions ) { CopyData(); mpData->mnPrintOptions = nOptions; } - sal_uIntPtr GetPrintOptions() const + sal_uLong GetPrintOptions() const { return mpData->mnPrintOptions; } void SetScreenRasterFontDeviation( long nDeviation ) @@ -116,9 +116,9 @@ class ImplMouseData ImplMouseData( const ImplMouseData& rData ); private: - sal_uIntPtr mnRefCount; - sal_uIntPtr mnOptions; - sal_uIntPtr mnDoubleClkTime; + sal_uLong mnRefCount; + sal_uLong mnOptions; + sal_uLong mnDoubleClkTime; long mnDoubleClkWidth; long mnDoubleClkHeight; long mnStartDragWidth; @@ -130,12 +130,12 @@ private: sal_uInt16 mnContextMenuCode; sal_uInt16 mnContextMenuClicks; sal_Bool mbContextMenuDown; - sal_uIntPtr mnScrollRepeat; - sal_uIntPtr mnButtonStartRepeat; - sal_uIntPtr mnButtonRepeat; - sal_uIntPtr mnActionDelay; - sal_uIntPtr mnMenuDelay; - sal_uIntPtr mnFollow; + sal_uLong mnScrollRepeat; + sal_uLong mnButtonStartRepeat; + sal_uLong mnButtonRepeat; + sal_uLong mnActionDelay; + sal_uLong mnMenuDelay; + sal_uLong mnFollow; sal_uInt16 mnMiddleButtonAction; sal_uInt16 mnWheelBehavior; sal_Bool mbAlign1; @@ -145,12 +145,12 @@ private: // - MouseSettings - // ----------------- -#define MOUSE_OPTION_AUTOFOCUS ((sal_uIntPtr)0x00000001) -#define MOUSE_OPTION_AUTOCENTERPOS ((sal_uIntPtr)0x00000002) -#define MOUSE_OPTION_AUTODEFBTNPOS ((sal_uIntPtr)0x00000004) +#define MOUSE_OPTION_AUTOFOCUS ((sal_uLong)0x00000001) +#define MOUSE_OPTION_AUTOCENTERPOS ((sal_uLong)0x00000002) +#define MOUSE_OPTION_AUTODEFBTNPOS ((sal_uLong)0x00000004) -#define MOUSE_FOLLOW_MENU ((sal_uIntPtr)0x00000001) -#define MOUSE_FOLLOW_DDLIST ((sal_uIntPtr)0x00000002) +#define MOUSE_FOLLOW_MENU ((sal_uLong)0x00000001) +#define MOUSE_FOLLOW_DDLIST ((sal_uLong)0x00000002) #define MOUSE_MIDDLE_NOTHING ((sal_uInt16)0) #define MOUSE_MIDDLE_AUTOSCROLL ((sal_uInt16)1) @@ -172,14 +172,14 @@ public: MouseSettings( const MouseSettings& rSet ); ~MouseSettings(); - void SetOptions( sal_uIntPtr nOptions ) + void SetOptions( sal_uLong nOptions ) { CopyData(); mpData->mnOptions = nOptions; } - sal_uIntPtr GetOptions() const + sal_uLong GetOptions() const { return mpData->mnOptions; } - void SetDoubleClickTime( sal_uIntPtr nDoubleClkTime ) + void SetDoubleClickTime( sal_uLong nDoubleClkTime ) { CopyData(); mpData->mnDoubleClkTime = nDoubleClkTime; } - sal_uIntPtr GetDoubleClickTime() const + sal_uLong GetDoubleClickTime() const { return mpData->mnDoubleClkTime; } void SetDoubleClickWidth( long nDoubleClkWidth ) { CopyData(); mpData->mnDoubleClkWidth = nDoubleClkWidth; } @@ -228,30 +228,30 @@ public: sal_Bool GetContextMenuDown() const { return mpData->mbContextMenuDown; } - void SetScrollRepeat( sal_uIntPtr nRepeat ) + void SetScrollRepeat( sal_uLong nRepeat ) { CopyData(); mpData->mnScrollRepeat = nRepeat; } - sal_uIntPtr GetScrollRepeat() const + sal_uLong GetScrollRepeat() const { return mpData->mnScrollRepeat; } - void SetButtonStartRepeat( sal_uIntPtr nRepeat ) + void SetButtonStartRepeat( sal_uLong nRepeat ) { CopyData(); mpData->mnButtonStartRepeat = nRepeat; } - sal_uIntPtr GetButtonStartRepeat() const + sal_uLong GetButtonStartRepeat() const { return mpData->mnButtonStartRepeat; } - void SetButtonRepeat( sal_uIntPtr nRepeat ) + void SetButtonRepeat( sal_uLong nRepeat ) { CopyData(); mpData->mnButtonRepeat = nRepeat; } - sal_uIntPtr GetButtonRepeat() const + sal_uLong GetButtonRepeat() const { return mpData->mnButtonRepeat; } - void SetActionDelay( sal_uIntPtr nDelay ) + void SetActionDelay( sal_uLong nDelay ) { CopyData(); mpData->mnActionDelay = nDelay; } - sal_uIntPtr GetActionDelay() const + sal_uLong GetActionDelay() const { return mpData->mnActionDelay; } - void SetMenuDelay( sal_uIntPtr nDelay ) + void SetMenuDelay( sal_uLong nDelay ) { CopyData(); mpData->mnMenuDelay = nDelay; } - sal_uIntPtr GetMenuDelay() const + sal_uLong GetMenuDelay() const { return mpData->mnMenuDelay; } - void SetFollow( sal_uIntPtr nFollow ) + void SetFollow( sal_uLong nFollow ) { CopyData(); mpData->mnFollow = nFollow; } - sal_uIntPtr GetFollow() const + sal_uLong GetFollow() const { return mpData->mnFollow; } void SetMiddleButtonAction( sal_uInt16 nAction ) @@ -283,16 +283,16 @@ class ImplKeyboardData ImplKeyboardData( const ImplKeyboardData& rData ); private: - sal_uIntPtr mnRefCount; + sal_uLong mnRefCount; Accelerator maStandardAccel; - sal_uIntPtr mnOptions; + sal_uLong mnOptions; }; // -------------------- // - KeyboardSettings - // -------------------- -#define KEYBOARD_OPTION_QUICKCURSOR ((sal_uIntPtr)0x00000001) +#define KEYBOARD_OPTION_QUICKCURSOR ((sal_uLong)0x00000001) class VCL_DLLPUBLIC KeyboardSettings { @@ -311,9 +311,9 @@ public: const Accelerator& GetStandardAccel() const { return mpData->maStandardAccel; } - void SetOptions( sal_uIntPtr nOptions ) + void SetOptions( sal_uLong nOptions ) { CopyData(); mpData->mnOptions = nOptions; } - sal_uIntPtr GetOptions() const + sal_uLong GetOptions() const { return mpData->mnOptions; } const KeyboardSettings& operator =( const KeyboardSettings& rSet ); @@ -336,7 +336,7 @@ class ImplStyleData void SetStandardStyles(); private: - sal_uIntPtr mnRefCount; + sal_uLong mnRefCount; void* mpStyleData_NotUsedYet; @@ -412,15 +412,15 @@ private: long mnIconHorzSpace; long mnIconVertSpace; long mnAntialiasedMin; - sal_uIntPtr mnCursorBlinkTime; - sal_uIntPtr mnDragFullOptions; - sal_uIntPtr mnAnimationOptions; - sal_uIntPtr mnSelectionOptions; - sal_uIntPtr mnLogoDisplayTime; - sal_uIntPtr mnDisplayOptions; - sal_uIntPtr mnToolbarIconSize; - sal_uIntPtr mnUseFlatMenues; - sal_uIntPtr mnOptions; + sal_uLong mnCursorBlinkTime; + sal_uLong mnDragFullOptions; + sal_uLong mnAnimationOptions; + sal_uLong mnSelectionOptions; + sal_uLong mnLogoDisplayTime; + sal_uLong mnDisplayOptions; + sal_uLong mnToolbarIconSize; + sal_uLong mnUseFlatMenues; + sal_uLong mnOptions; sal_uInt16 mnScreenZoom; sal_uInt16 mnScreenFontZoom; sal_uInt16 mnRadioButtonStyle; @@ -431,10 +431,10 @@ private: sal_uInt16 mnUseSystemUIFonts; sal_uInt16 mnAutoMnemonic; sal_uInt16 mnUseImagesInMenus; - sal_uIntPtr mnUseFlatBorders; + sal_uLong mnUseFlatBorders; long mnMinThumbSize; - sal_uIntPtr mnSymbolsStyle; - sal_uIntPtr mnPreferredSymbolsStyle; + sal_uLong mnSymbolsStyle; + sal_uLong mnPreferredSymbolsStyle; sal_uInt16 mnSkipDisabledInMenus; Wallpaper maWorkspaceGradient; const void* mpFontOptions; @@ -447,46 +447,46 @@ private: // - StyleSettings - // ----------------- -#define STYLE_OPTION_MONO ((sal_uIntPtr)0x00000001) -#define STYLE_OPTION_COLOR ((sal_uIntPtr)0x00000002) -#define STYLE_OPTION_FLAT ((sal_uIntPtr)0x00000004) -#define STYLE_OPTION_GREAT ((sal_uIntPtr)0x00000008) -#define STYLE_OPTION_HIGHLIGHT ((sal_uIntPtr)0x00000010) -#define STYLE_OPTION_ADVANCEDUSER ((sal_uIntPtr)0x00000020) -#define STYLE_OPTION_SCROLLARROW ((sal_uIntPtr)0x00000040) -#define STYLE_OPTION_SPINARROW ((sal_uIntPtr)0x00000080) -#define STYLE_OPTION_SPINUPDOWN ((sal_uIntPtr)0x00000100) -#define STYLE_OPTION_NOMNEMONICS ((sal_uIntPtr)0x00000200) -#define STYLE_OPTION_WINSTYLE ((sal_uIntPtr)0x00010000) -#define STYLE_OPTION_OS2STYLE ((sal_uIntPtr)0x00020000) -#define STYLE_OPTION_MACSTYLE ((sal_uIntPtr)0x00040000) -#define STYLE_OPTION_UNIXSTYLE ((sal_uIntPtr)0x00080000) -#define STYLE_OPTION_SYSTEMSTYLE ((sal_uIntPtr)0x000F0000) -#define STYLE_OPTION_HIDEDISABLED ((sal_uIntPtr)0x00100000) - -#define DRAGFULL_OPTION_WINDOWMOVE ((sal_uIntPtr)0x00000001) -#define DRAGFULL_OPTION_WINDOWSIZE ((sal_uIntPtr)0x00000002) -#define DRAGFULL_OPTION_OBJECTMOVE ((sal_uIntPtr)0x00000004) -#define DRAGFULL_OPTION_OBJECTSIZE ((sal_uIntPtr)0x00000008) -#define DRAGFULL_OPTION_DOCKING ((sal_uIntPtr)0x00000010) -#define DRAGFULL_OPTION_SPLIT ((sal_uIntPtr)0x00000020) -#define DRAGFULL_OPTION_SCROLL ((sal_uIntPtr)0x00000040) - -#define LOGO_DISPLAYTIME_NOLOGO ((sal_uIntPtr)0) -#define LOGO_DISPLAYTIME_STARTTIME ((sal_uIntPtr)0xFFFFFFFF) - -#define ANIMATION_OPTION_MINIMIZE ((sal_uIntPtr)0x00000001) -#define ANIMATION_OPTION_POPUP ((sal_uIntPtr)0x00000002) -#define ANIMATION_OPTION_DIALOG ((sal_uIntPtr)0x00000004) -#define ANIMATION_OPTION_TREE ((sal_uIntPtr)0x00000008) -#define ANIMATION_OPTION_SCROLL ((sal_uIntPtr)0x00000010) - -#define SELECTION_OPTION_WORD ((sal_uIntPtr)0x00000001) -#define SELECTION_OPTION_FOCUS ((sal_uIntPtr)0x00000002) -#define SELECTION_OPTION_INVERT ((sal_uIntPtr)0x00000004) -#define SELECTION_OPTION_SHOWFIRST ((sal_uIntPtr)0x00000008) - -#define DISPLAY_OPTION_AA_DISABLE ((sal_uIntPtr)0x00000001) +#define STYLE_OPTION_MONO ((sal_uLong)0x00000001) +#define STYLE_OPTION_COLOR ((sal_uLong)0x00000002) +#define STYLE_OPTION_FLAT ((sal_uLong)0x00000004) +#define STYLE_OPTION_GREAT ((sal_uLong)0x00000008) +#define STYLE_OPTION_HIGHLIGHT ((sal_uLong)0x00000010) +#define STYLE_OPTION_ADVANCEDUSER ((sal_uLong)0x00000020) +#define STYLE_OPTION_SCROLLARROW ((sal_uLong)0x00000040) +#define STYLE_OPTION_SPINARROW ((sal_uLong)0x00000080) +#define STYLE_OPTION_SPINUPDOWN ((sal_uLong)0x00000100) +#define STYLE_OPTION_NOMNEMONICS ((sal_uLong)0x00000200) +#define STYLE_OPTION_WINSTYLE ((sal_uLong)0x00010000) +#define STYLE_OPTION_OS2STYLE ((sal_uLong)0x00020000) +#define STYLE_OPTION_MACSTYLE ((sal_uLong)0x00040000) +#define STYLE_OPTION_UNIXSTYLE ((sal_uLong)0x00080000) +#define STYLE_OPTION_SYSTEMSTYLE ((sal_uLong)0x000F0000) +#define STYLE_OPTION_HIDEDISABLED ((sal_uLong)0x00100000) + +#define DRAGFULL_OPTION_WINDOWMOVE ((sal_uLong)0x00000001) +#define DRAGFULL_OPTION_WINDOWSIZE ((sal_uLong)0x00000002) +#define DRAGFULL_OPTION_OBJECTMOVE ((sal_uLong)0x00000004) +#define DRAGFULL_OPTION_OBJECTSIZE ((sal_uLong)0x00000008) +#define DRAGFULL_OPTION_DOCKING ((sal_uLong)0x00000010) +#define DRAGFULL_OPTION_SPLIT ((sal_uLong)0x00000020) +#define DRAGFULL_OPTION_SCROLL ((sal_uLong)0x00000040) + +#define LOGO_DISPLAYTIME_NOLOGO ((sal_uLong)0) +#define LOGO_DISPLAYTIME_STARTTIME ((sal_uLong)0xFFFFFFFF) + +#define ANIMATION_OPTION_MINIMIZE ((sal_uLong)0x00000001) +#define ANIMATION_OPTION_POPUP ((sal_uLong)0x00000002) +#define ANIMATION_OPTION_DIALOG ((sal_uLong)0x00000004) +#define ANIMATION_OPTION_TREE ((sal_uLong)0x00000008) +#define ANIMATION_OPTION_SCROLL ((sal_uLong)0x00000010) + +#define SELECTION_OPTION_WORD ((sal_uLong)0x00000001) +#define SELECTION_OPTION_FOCUS ((sal_uLong)0x00000002) +#define SELECTION_OPTION_INVERT ((sal_uLong)0x00000004) +#define SELECTION_OPTION_SHOWFIRST ((sal_uLong)0x00000008) + +#define DISPLAY_OPTION_AA_DISABLE ((sal_uLong)0x00000001) #define STYLE_RADIOBUTTON_WIN ((sal_uInt16)0x0001) #define STYLE_RADIOBUTTON_OS2 ((sal_uInt16)0x0002) @@ -511,21 +511,21 @@ private: #define STYLE_TABCONTROL_SINGLELINE ((sal_uInt16)0x0001) #define STYLE_TABCONTROL_COLOR ((sal_uInt16)0x0002) -#define STYLE_TOOLBAR_ICONSIZE_UNKNOWN ((sal_uIntPtr)0) -#define STYLE_TOOLBAR_ICONSIZE_SMALL ((sal_uIntPtr)1) -#define STYLE_TOOLBAR_ICONSIZE_LARGE ((sal_uIntPtr)2) +#define STYLE_TOOLBAR_ICONSIZE_UNKNOWN ((sal_uLong)0) +#define STYLE_TOOLBAR_ICONSIZE_SMALL ((sal_uLong)1) +#define STYLE_TOOLBAR_ICONSIZE_LARGE ((sal_uLong)2) -#define STYLE_SYMBOLS_AUTO ((sal_uIntPtr)0) -#define STYLE_SYMBOLS_DEFAULT ((sal_uIntPtr)1) -#define STYLE_SYMBOLS_HICONTRAST ((sal_uIntPtr)2) -#define STYLE_SYMBOLS_INDUSTRIAL ((sal_uIntPtr)3) -#define STYLE_SYMBOLS_CRYSTAL ((sal_uIntPtr)4) -#define STYLE_SYMBOLS_TANGO ((sal_uIntPtr)5) -#define STYLE_SYMBOLS_OXYGEN ((sal_uIntPtr)6) -#define STYLE_SYMBOLS_CLASSIC ((sal_uIntPtr)7) -#define STYLE_SYMBOLS_THEMES_MAX ((sal_uIntPtr)8) +#define STYLE_SYMBOLS_AUTO ((sal_uLong)0) +#define STYLE_SYMBOLS_DEFAULT ((sal_uLong)1) +#define STYLE_SYMBOLS_HICONTRAST ((sal_uLong)2) +#define STYLE_SYMBOLS_INDUSTRIAL ((sal_uLong)3) +#define STYLE_SYMBOLS_CRYSTAL ((sal_uLong)4) +#define STYLE_SYMBOLS_TANGO ((sal_uLong)5) +#define STYLE_SYMBOLS_OXYGEN ((sal_uLong)6) +#define STYLE_SYMBOLS_CLASSIC ((sal_uLong)7) +#define STYLE_SYMBOLS_THEMES_MAX ((sal_uLong)8) -#define STYLE_CURSOR_NOBLINKTIME ((sal_uIntPtr)0xFFFFFFFF) +#define STYLE_CURSOR_NOBLINKTIME ((sal_uLong)0xFFFFFFFF) class VCL_DLLPUBLIC StyleSettings { @@ -894,38 +894,38 @@ public: sal_uInt16 GetScreenFontZoom() const { return mpData->mnScreenFontZoom; } - void SetLogoDisplayTime( sal_uIntPtr nDisplayTime ) + void SetLogoDisplayTime( sal_uLong nDisplayTime ) { CopyData(); mpData->mnLogoDisplayTime = nDisplayTime; } - sal_uIntPtr GetLogoDisplayTime() const + sal_uLong GetLogoDisplayTime() const { return mpData->mnLogoDisplayTime; } - void SetDragFullOptions( sal_uIntPtr nOptions ) + void SetDragFullOptions( sal_uLong nOptions ) { CopyData(); mpData->mnDragFullOptions = nOptions; } - sal_uIntPtr GetDragFullOptions() const + sal_uLong GetDragFullOptions() const { return mpData->mnDragFullOptions; } - void SetAnimationOptions( sal_uIntPtr nOptions ) + void SetAnimationOptions( sal_uLong nOptions ) { CopyData(); mpData->mnAnimationOptions = nOptions; } - sal_uIntPtr GetAnimationOptions() const + sal_uLong GetAnimationOptions() const { return mpData->mnAnimationOptions; } - void SetSelectionOptions( sal_uIntPtr nOptions ) + void SetSelectionOptions( sal_uLong nOptions ) { CopyData(); mpData->mnSelectionOptions = nOptions; } - sal_uIntPtr GetSelectionOptions() const + sal_uLong GetSelectionOptions() const { return mpData->mnSelectionOptions; } - void SetDisplayOptions( sal_uIntPtr nOptions ) + void SetDisplayOptions( sal_uLong nOptions ) { CopyData(); mpData->mnDisplayOptions = nOptions; } - sal_uIntPtr GetDisplayOptions() const + sal_uLong GetDisplayOptions() const { return mpData->mnDisplayOptions; } void SetAntialiasingMinPixelHeight( long nMinPixel ) { CopyData(); mpData->mnAntialiasedMin = nMinPixel; } - sal_uIntPtr GetAntialiasingMinPixelHeight() const + sal_uLong GetAntialiasingMinPixelHeight() const { return mpData->mnAntialiasedMin; } - void SetOptions( sal_uIntPtr nOptions ) + void SetOptions( sal_uLong nOptions ) { CopyData(); mpData->mnOptions = nOptions; } - sal_uIntPtr GetOptions() const + sal_uLong GetOptions() const { return mpData->mnOptions; } void SetAutoMnemonic( sal_Bool bAutoMnemonic ) { CopyData(); mpData->mnAutoMnemonic = (sal_uInt16)bAutoMnemonic; } @@ -937,26 +937,26 @@ public: const Color& GetFontColor() const { return mpData->maFontColor; } - void SetToolbarIconSize( sal_uIntPtr nSize ) + void SetToolbarIconSize( sal_uLong nSize ) { CopyData(); mpData->mnToolbarIconSize = nSize; } - sal_uIntPtr GetToolbarIconSize() const + sal_uLong GetToolbarIconSize() const { return mpData->mnToolbarIconSize; } - void SetSymbolsStyle( sal_uIntPtr nStyle ) + void SetSymbolsStyle( sal_uLong nStyle ) { CopyData(); mpData->mnSymbolsStyle = nStyle; } - sal_uIntPtr GetSymbolsStyle() const + sal_uLong GetSymbolsStyle() const { return mpData->mnSymbolsStyle; } - void SetPreferredSymbolsStyle( sal_uIntPtr nStyle ) + void SetPreferredSymbolsStyle( sal_uLong nStyle ) { CopyData(); mpData->mnPreferredSymbolsStyle = nStyle; } void SetPreferredSymbolsStyleName( const ::rtl::OUString &rName ); - sal_uIntPtr GetPreferredSymbolsStyle() const + sal_uLong GetPreferredSymbolsStyle() const { return mpData->mnPreferredSymbolsStyle; } // check whether the symbols style is supported (icons are installed) - bool CheckSymbolStyle( sal_uIntPtr nStyle ) const; - sal_uIntPtr GetAutoSymbolsStyle() const; + bool CheckSymbolStyle( sal_uLong nStyle ) const; + sal_uLong GetAutoSymbolsStyle() const; - sal_uIntPtr GetCurrentSymbolsStyle() const; + sal_uLong GetCurrentSymbolsStyle() const; void SetSymbolsStyleName( const ::rtl::OUString &rName ) { return SetSymbolsStyle( ImplNameToSymbolsStyle( rName ) ); } @@ -983,8 +983,8 @@ public: { return !(*this == rSet); } protected: - ::rtl::OUString ImplSymbolsStyleToName( sal_uIntPtr nStyle ) const; - sal_uIntPtr ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) const; + ::rtl::OUString ImplSymbolsStyleToName( sal_uLong nStyle ) const; + sal_uLong ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) const; }; // ---------------- @@ -999,7 +999,7 @@ class ImplMiscData ImplMiscData( const ImplMiscData& rData ); private: - sal_uIntPtr mnRefCount; + sal_uLong mnRefCount; sal_uInt16 mnEnableATT; sal_Bool mbEnableLocalizedDecimalSep; sal_uInt16 mnDisablePrinting; @@ -1046,8 +1046,8 @@ class ImplNotificationData ImplNotificationData( const ImplNotificationData& rData ); private: - sal_uIntPtr mnRefCount; - sal_uIntPtr mnOptions; + sal_uLong mnRefCount; + sal_uLong mnOptions; }; // ------------------------ @@ -1066,9 +1066,9 @@ public: NotificationSettings( const NotificationSettings& rSet ); ~NotificationSettings(); - void SetOptions( sal_uIntPtr nOptions ) + void SetOptions( sal_uLong nOptions ) { CopyData(); mpData->mnOptions = nOptions; } - sal_uIntPtr GetOptions() const + sal_uLong GetOptions() const { return mpData->mnOptions; } const NotificationSettings& operator =( const NotificationSettings& rSet ); @@ -1090,19 +1090,19 @@ class ImplHelpData ImplHelpData( const ImplHelpData& rData ); private: - sal_uIntPtr mnRefCount; - sal_uIntPtr mnOptions; - sal_uIntPtr mnTipDelay; - sal_uIntPtr mnTipTimeout; - sal_uIntPtr mnBalloonDelay; + sal_uLong mnRefCount; + sal_uLong mnOptions; + sal_uLong mnTipDelay; + sal_uLong mnTipTimeout; + sal_uLong mnBalloonDelay; }; // ---------------- // - HelpSettings - // ---------------- -#define HELP_OPTION_QUICK ((sal_uIntPtr)0x00000001) -#define HELP_OPTION_ACTIVE ((sal_uIntPtr)0x00000002) +#define HELP_OPTION_QUICK ((sal_uLong)0x00000001) +#define HELP_OPTION_ACTIVE ((sal_uLong)0x00000002) class VCL_DLLPUBLIC HelpSettings { @@ -1116,21 +1116,21 @@ public: HelpSettings( const HelpSettings& rSet ); ~HelpSettings(); - void SetOptions( sal_uIntPtr nOptions ) + void SetOptions( sal_uLong nOptions ) { CopyData(); mpData->mnOptions = nOptions; } - sal_uIntPtr GetOptions() const + sal_uLong GetOptions() const { return mpData->mnOptions; } - void SetTipDelay( sal_uIntPtr nTipDelay ) + void SetTipDelay( sal_uLong nTipDelay ) { CopyData(); mpData->mnTipDelay = nTipDelay; } - sal_uIntPtr GetTipDelay() const + sal_uLong GetTipDelay() const { return mpData->mnTipDelay; } - void SetTipTimeout( sal_uIntPtr nTipTimeout ) + void SetTipTimeout( sal_uLong nTipTimeout ) { CopyData(); mpData->mnTipTimeout = nTipTimeout; } - sal_uIntPtr GetTipTimeout() const + sal_uLong GetTipTimeout() const { return mpData->mnTipTimeout; } - void SetBalloonDelay( sal_uIntPtr nBalloonDelay ) + void SetBalloonDelay( sal_uLong nBalloonDelay ) { CopyData(); mpData->mnBalloonDelay = nBalloonDelay; } - sal_uIntPtr GetBalloonDelay() const + sal_uLong GetBalloonDelay() const { return mpData->mnBalloonDelay; } const HelpSettings& operator =( const HelpSettings& rSet ); @@ -1153,7 +1153,7 @@ class ImplAllSettingsData ~ImplAllSettingsData(); private: - sal_uIntPtr mnRefCount; + sal_uLong mnRefCount; MachineSettings maMachineSettings; MouseSettings maMouseSettings; KeyboardSettings maKeyboardSettings; @@ -1162,8 +1162,8 @@ private: NotificationSettings maNotificationSettings; HelpSettings maHelpSettings; ::com::sun::star::lang::Locale maLocale; - sal_uIntPtr mnSystemUpdate; - sal_uIntPtr mnWindowUpdate; + sal_uLong mnSystemUpdate; + sal_uLong mnWindowUpdate; ::com::sun::star::lang::Locale maUILocale; LanguageType meLanguage; LanguageType meUILanguage; @@ -1181,24 +1181,24 @@ private: // - AllSettings - // --------------- -#define SETTINGS_MACHINE ((sal_uIntPtr)0x00000001) -#define SETTINGS_MOUSE ((sal_uIntPtr)0x00000002) -#define SETTINGS_KEYBOARD ((sal_uIntPtr)0x00000004) -#define SETTINGS_STYLE ((sal_uIntPtr)0x00000008) -#define SETTINGS_MISC ((sal_uIntPtr)0x00000010) -#define SETTINGS_SOUND ((sal_uIntPtr)0x00000020) -#define SETTINGS_NOTIFICATION ((sal_uIntPtr)0x00000040) -#define SETTINGS_HELP ((sal_uIntPtr)0x00000080) -#define SETTINGS_INTERNATIONAL ((sal_uIntPtr)0x00000100) /* was for class International, has no effect anymore */ -#define SETTINGS_LOCALE ((sal_uIntPtr)0x00000200) -#define SETTINGS_UILOCALE ((sal_uIntPtr)0x00000400) +#define SETTINGS_MACHINE ((sal_uLong)0x00000001) +#define SETTINGS_MOUSE ((sal_uLong)0x00000002) +#define SETTINGS_KEYBOARD ((sal_uLong)0x00000004) +#define SETTINGS_STYLE ((sal_uLong)0x00000008) +#define SETTINGS_MISC ((sal_uLong)0x00000010) +#define SETTINGS_SOUND ((sal_uLong)0x00000020) +#define SETTINGS_NOTIFICATION ((sal_uLong)0x00000040) +#define SETTINGS_HELP ((sal_uLong)0x00000080) +#define SETTINGS_INTERNATIONAL ((sal_uLong)0x00000100) /* was for class International, has no effect anymore */ +#define SETTINGS_LOCALE ((sal_uLong)0x00000200) +#define SETTINGS_UILOCALE ((sal_uLong)0x00000400) #define SETTINGS_ALLSETTINGS (SETTINGS_MACHINE |\ SETTINGS_MOUSE | SETTINGS_KEYBOARD |\ SETTINGS_STYLE | SETTINGS_MISC |\ SETTINGS_SOUND | SETTINGS_NOTIFICATION |\ SETTINGS_HELP |\ SETTINGS_LOCALE | SETTINGS_UILOCALE ) -#define SETTINGS_IN_UPDATE_SETTINGS ((sal_uIntPtr)0x00000800) // this flag indicates that the data changed event was created +#define SETTINGS_IN_UPDATE_SETTINGS ((sal_uLong)0x00000800) // this flag indicates that the data changed event was created // in Windows::UpdateSettings probably because of a global // settings changed @@ -1274,17 +1274,17 @@ public: const String& rStr2, xub_StrLen nPos2, xub_StrLen nCount2 ) const; */ - void SetSystemUpdate( sal_uIntPtr nUpdate ) + void SetSystemUpdate( sal_uLong nUpdate ) { CopyData(); mpData->mnSystemUpdate = nUpdate; } - sal_uIntPtr GetSystemUpdate() const + sal_uLong GetSystemUpdate() const { return mpData->mnSystemUpdate; } - void SetWindowUpdate( sal_uIntPtr nUpdate ) + void SetWindowUpdate( sal_uLong nUpdate ) { CopyData(); mpData->mnWindowUpdate = nUpdate; } - sal_uIntPtr GetWindowUpdate() const + sal_uLong GetWindowUpdate() const { return mpData->mnWindowUpdate; } - sal_uIntPtr Update( sal_uIntPtr nFlags, const AllSettings& rSettings ); - sal_uIntPtr GetChangeFlags( const AllSettings& rSettings ) const; + sal_uLong Update( sal_uLong nFlags, const AllSettings& rSettings ); + sal_uLong GetChangeFlags( const AllSettings& rSettings ) const; const AllSettings& operator =( const AllSettings& rSet ); diff --git a/vcl/inc/vcl/spin.hxx b/vcl/inc/vcl/spin.hxx index ac8396bab3c3..9b49652fad15 100644 --- a/vcl/inc/vcl/spin.hxx +++ b/vcl/inc/vcl/spin.hxx @@ -73,7 +73,7 @@ public: virtual void Resize(); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void MouseButtonUp( const MouseEvent& rMEvt ); virtual void MouseMove( const MouseEvent& rMEvt ); diff --git a/vcl/inc/vcl/spinfld.hxx b/vcl/inc/vcl/spinfld.hxx index 8b3e1e484465..ca81f01ac128 100644 --- a/vcl/inc/vcl/spinfld.hxx +++ b/vcl/inc/vcl/spinfld.hxx @@ -92,7 +92,7 @@ public: virtual void MouseButtonUp( const MouseEvent& rMEvt ); virtual void MouseMove( const MouseEvent& rMEvt ); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/vcl/inc/vcl/status.hxx b/vcl/inc/vcl/status.hxx index a6e742d23312..97ea5c94c715 100644 --- a/vcl/inc/vcl/status.hxx +++ b/vcl/inc/vcl/status.hxx @@ -137,7 +137,7 @@ public: virtual void DoubleClick(); virtual void UserDraw( const UserDrawEvent& rUDEvt ); - void InsertItem( sal_uInt16 nItemId, sal_uIntPtr nWidth, + void InsertItem( sal_uInt16 nItemId, sal_uLong nWidth, StatusBarItemBits nBits = SIB_CENTER | SIB_IN, long nOffset = STATUSBAR_OFFSET, sal_uInt16 nPos = STATUSBAR_APPEND ); @@ -162,7 +162,7 @@ public: Point GetItemTextPos( sal_uInt16 nItemId ) const; sal_uInt16 GetCurItemId() const { return mnCurItemId; } - sal_uIntPtr GetItemWidth( sal_uInt16 nItemId ) const; + sal_uLong GetItemWidth( sal_uInt16 nItemId ) const; StatusBarItemBits GetItemBits( sal_uInt16 nItemId ) const; long GetItemOffset( sal_uInt16 nItemId ) const; diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx index 555f4868ab2f..c98e2fe9703e 100644 --- a/vcl/inc/vcl/svapp.hxx +++ b/vcl/inc/vcl/svapp.hxx @@ -249,7 +249,7 @@ public: virtual sal_Bool QueryExit(); - virtual void UserEvent( sal_uIntPtr nEvent, void* pEventData ); + virtual void UserEvent( sal_uLong nEvent, void* pEventData ); virtual void ActivateExtHelp(); virtual void DeactivateExtHelp(); @@ -282,8 +282,8 @@ public: static void EndYield(); static vos::IMutex& GetSolarMutex(); static vos::OThread::TThreadIdentifier GetMainThreadIdentifier(); - static sal_uIntPtr ReleaseSolarMutex(); - static void AcquireSolarMutex( sal_uIntPtr nCount ); + static sal_uLong ReleaseSolarMutex(); + static void AcquireSolarMutex( sal_uLong nCount ); static void EnableNoYieldMode( bool i_bNoYield ); static void AddPostYieldListener( const Link& i_rListener ); static void RemovePostYieldListener( const Link& i_rListener ); @@ -296,7 +296,7 @@ public: static sal_uInt16 GetDispatchLevel(); static sal_Bool AnyInput( sal_uInt16 nType = INPUT_ANY ); - static sal_uIntPtr GetLastInputInterval(); + static sal_uLong GetLastInputInterval(); static sal_Bool IsUICaptured(); static sal_Bool IsUserActive( sal_uInt16 nTest = USERACTIVE_ALL ); @@ -325,20 +325,20 @@ public: static void RemoveEventListener( const Link& rEventListener ); static void AddKeyListener( const Link& rKeyListener ); static void RemoveKeyListener( const Link& rKeyListener ); - static void ImplCallEventListeners( sal_uIntPtr nEvent, Window* pWin, void* pData ); + static void ImplCallEventListeners( sal_uLong nEvent, Window* pWin, void* pData ); static void ImplCallEventListeners( VclSimpleEvent* pEvent ); - static sal_Bool HandleKey( sal_uIntPtr nEvent, Window *pWin, KeyEvent* pKeyEvent ); + static sal_Bool HandleKey( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent ); - static sal_uIntPtr PostKeyEvent( sal_uIntPtr nEvent, Window *pWin, KeyEvent* pKeyEvent ); - static sal_uIntPtr PostMouseEvent( sal_uIntPtr nEvent, Window *pWin, MouseEvent* pMouseEvent ); + static sal_uLong PostKeyEvent( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent ); + static sal_uLong PostMouseEvent( sal_uLong nEvent, Window *pWin, MouseEvent* pMouseEvent ); static void RemoveMouseAndKeyEvents( Window *pWin ); - static sal_Bool IsProcessedMouseOrKeyEvent( sal_uIntPtr nEventId ); + static sal_Bool IsProcessedMouseOrKeyEvent( sal_uLong nEventId ); - static sal_uIntPtr PostUserEvent( sal_uIntPtr nEvent, void* pEventData = NULL ); - static sal_uIntPtr PostUserEvent( const Link& rLink, void* pCaller = NULL ); - static sal_Bool PostUserEvent( sal_uIntPtr& rEventId, sal_uIntPtr nEvent, void* pEventData = NULL ); - static sal_Bool PostUserEvent( sal_uIntPtr& rEventId, const Link& rLink, void* pCaller = NULL ); - static void RemoveUserEvent( sal_uIntPtr nUserEvent ); + static sal_uLong PostUserEvent( sal_uLong nEvent, void* pEventData = NULL ); + static sal_uLong PostUserEvent( const Link& rLink, void* pCaller = NULL ); + static sal_Bool PostUserEvent( sal_uLong& rEventId, sal_uLong nEvent, void* pEventData = NULL ); + static sal_Bool PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller = NULL ); + static void RemoveUserEvent( sal_uLong nUserEvent ); static sal_Bool InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority ); static void RemoveIdleHdl( const Link& rLink ); @@ -393,10 +393,10 @@ public: static void FlushAccel(); static sal_Bool CallAccel( const KeyCode& rKeyCode, sal_uInt16 nRepeat = 0 ); - static sal_uIntPtr AddHotKey( const KeyCode& rKeyCode, const Link& rLink, void* pData = NULL ); - static void RemoveHotKey( sal_uIntPtr nId ); - static sal_uIntPtr AddEventHook( VCLEventHookProc pProc, void* pData = NULL ); - static void RemoveEventHook( sal_uIntPtr nId ); + static sal_uLong AddHotKey( const KeyCode& rKeyCode, const Link& rLink, void* pData = NULL ); + static void RemoveHotKey( sal_uLong nId ); + static sal_uLong AddEventHook( VCLEventHookProc pProc, void* pData = NULL ); + static void RemoveEventHook( sal_uLong nId ); static long CallEventHooks( NotifyEvent& rEvt ); static long CallPreNotify( NotifyEvent& rEvt ); static long CallEvent( NotifyEvent& rEvt ); @@ -410,9 +410,9 @@ public: static void EnableAutoMnemonic( sal_Bool bEnabled = sal_True ); static sal_Bool IsAutoMnemonicEnabled(); - static sal_uIntPtr GetReservedKeyCodeCount(); - static const KeyCode* GetReservedKeyCode( sal_uIntPtr i ); - static String GetReservedKeyCodeDescription( sal_uIntPtr i ); + static sal_uLong GetReservedKeyCodeCount(); + static const KeyCode* GetReservedKeyCode( sal_uLong i ); + static String GetReservedKeyCodeDescription( sal_uLong i ); static void SetDefDialogParent( Window* pWindow ); static Window* GetDefDialogParent(); diff --git a/vcl/inc/vcl/svcompat.hxx b/vcl/inc/vcl/svcompat.hxx index 39d325321f3d..dce884cdf776 100644 --- a/vcl/inc/vcl/svcompat.hxx +++ b/vcl/inc/vcl/svcompat.hxx @@ -35,10 +35,10 @@ // ----------- #define COMPAT_FORMAT( char1, char2, char3, char4 ) \ - ((sal_uIntPtr)((((sal_uIntPtr)(char)(char1)))| \ - (((sal_uIntPtr)(char)(char2))<<8UL)| \ - (((sal_uIntPtr)(char)(char3))<<16UL)| \ - ((sal_uIntPtr)(char)(char4))<<24UL)) + ((sal_uLong)((((sal_uLong)(char)(char1)))| \ + (((sal_uLong)(char)(char2))<<8UL)| \ + (((sal_uLong)(char)(char3))<<16UL)| \ + ((sal_uLong)(char)(char4))<<24UL)) class SvStream; diff --git a/vcl/inc/vcl/svdata.hxx b/vcl/inc/vcl/svdata.hxx index 363668749f8e..24d85c873572 100644 --- a/vcl/inc/vcl/svdata.hxx +++ b/vcl/inc/vcl/svdata.hxx @@ -152,7 +152,7 @@ struct ImplSVAppData ImplHotKey* mpFirstHotKey; // HotKey-Verwaltung ImplEventHook* mpFirstEventHook; // Event-Hooks VclEventListeners2* mpPostYieldListeners; // post yield listeners - sal_uIntPtr mnLastInputTime; // GetLastInputTime() + sal_uLong mnLastInputTime; // GetLastInputTime() sal_uInt16 mnDispatchLevel; // DispatchLevel sal_uInt16 mnModalMode; // ModalMode Count sal_uInt16 mnModalDialog; // ModalDialog Count @@ -266,13 +266,13 @@ struct ImplSVCtrlData ImplTBDragMgr* mpTBDragMgr; // DragMgr for ToolBox sal_uInt16 mnCheckStyle; // CheckBox-Style for ImageList-Update sal_uInt16 mnRadioStyle; // Radio-Style for ImageList-Update - sal_uIntPtr mnLastCheckFColor; // Letzte FaceColor fuer CheckImage - sal_uIntPtr mnLastCheckWColor; // Letzte WindowColor fuer CheckImage - sal_uIntPtr mnLastCheckWTextColor; // Letzte WindowTextColor fuer CheckImage - sal_uIntPtr mnLastCheckLColor; // Letzte LightColor fuer CheckImage - sal_uIntPtr mnLastRadioFColor; // Letzte FaceColor fuer RadioImage - sal_uIntPtr mnLastRadioWColor; // Letzte WindowColor fuer RadioImage - sal_uIntPtr mnLastRadioLColor; // Letzte LightColor fuer RadioImage + sal_uLong mnLastCheckFColor; // Letzte FaceColor fuer CheckImage + sal_uLong mnLastCheckWColor; // Letzte WindowColor fuer CheckImage + sal_uLong mnLastCheckWTextColor; // Letzte WindowTextColor fuer CheckImage + sal_uLong mnLastCheckLColor; // Letzte LightColor fuer CheckImage + sal_uLong mnLastRadioFColor; // Letzte FaceColor fuer RadioImage + sal_uLong mnLastRadioWColor; // Letzte WindowColor fuer RadioImage + sal_uLong mnLastRadioLColor; // Letzte LightColor fuer RadioImage FieldUnitStringList* mpFieldUnitStrings; // list with field units FieldUnitStringList* mpCleanUnitStrings; // same list but with some "fluff" like spaces removed }; @@ -295,7 +295,7 @@ struct ImplSVHelpData sal_Bool mbAutoHelpId : 1; // generate HelpIds sal_Bool mbRequestingHelp : 1; // In Window::RequestHelp HelpTextWindow* mpHelpWin; // HelpWindow - sal_uIntPtr mnLastHelpHideTime; // ticks of last show + sal_uLong mnLastHelpHideTime; // ticks of last show }; struct ImplSVNWFData @@ -338,15 +338,15 @@ struct ImplSVData Application* mpApp; // pApp WorkWindow* mpDefaultWin; // Default-Window sal_Bool mbDeInit; // Is VCL deinitializing - sal_uIntPtr mnThreadCount; // is VCL MultiThread enabled + sal_uLong mnThreadCount; // is VCL MultiThread enabled ImplConfigData* mpFirstConfigData; // Zeiger auf ersten Config-Block ImplTimerData* mpFirstTimerData; // list of all running timers SalTimer* mpSalTimer; // interface to sal event loop/timers SalI18NImeStatus* mpImeStatus; // interface to ime status window SalSystem* mpSalSystem; // SalSystem interface ResMgr* mpResMgr; // SV-Resource-Manager - sal_uIntPtr mnTimerPeriod; // current timer period - sal_uIntPtr mnTimerUpdate; // TimerCallbackProcs on stack + sal_uLong mnTimerPeriod; // current timer period + sal_uLong mnTimerUpdate; // TimerCallbackProcs on stack sal_Bool mbNotAllTimerCalled;// sal_True: Es muessen noch Timer abgearbeitet werden sal_Bool mbNoCallTimer; // sal_True: No Timeout calls ImplSVAppData maAppData; // indepen data for class Application @@ -452,7 +452,7 @@ private: struct ImplSVEvent { - sal_uIntPtr mnEvent; + sal_uLong mnEvent; void* mpData; Link* mpLink; Window* mpWindow; diff --git a/vcl/inc/vcl/syswin.hxx b/vcl/inc/vcl/syswin.hxx index 0d78c7579a16..6f8273731f36 100644 --- a/vcl/inc/vcl/syswin.hxx +++ b/vcl/inc/vcl/syswin.hxx @@ -65,25 +65,25 @@ class TaskPaneList; // - WindowStateData - // ------------------- -#define WINDOWSTATE_MASK_X ((sal_uIntPtr)0x00000001) -#define WINDOWSTATE_MASK_Y ((sal_uIntPtr)0x00000002) -#define WINDOWSTATE_MASK_WIDTH ((sal_uIntPtr)0x00000004) -#define WINDOWSTATE_MASK_HEIGHT ((sal_uIntPtr)0x00000008) -#define WINDOWSTATE_MASK_STATE ((sal_uIntPtr)0x00000010) -#define WINDOWSTATE_MASK_MINIMIZED ((sal_uIntPtr)0x00000020) -#define WINDOWSTATE_MASK_MAXIMIZED_X ((sal_uIntPtr)0x00000100) -#define WINDOWSTATE_MASK_MAXIMIZED_Y ((sal_uIntPtr)0x00000200) -#define WINDOWSTATE_MASK_MAXIMIZED_WIDTH ((sal_uIntPtr)0x00000400) -#define WINDOWSTATE_MASK_MAXIMIZED_HEIGHT ((sal_uIntPtr)0x00000800) +#define WINDOWSTATE_MASK_X ((sal_uLong)0x00000001) +#define WINDOWSTATE_MASK_Y ((sal_uLong)0x00000002) +#define WINDOWSTATE_MASK_WIDTH ((sal_uLong)0x00000004) +#define WINDOWSTATE_MASK_HEIGHT ((sal_uLong)0x00000008) +#define WINDOWSTATE_MASK_STATE ((sal_uLong)0x00000010) +#define WINDOWSTATE_MASK_MINIMIZED ((sal_uLong)0x00000020) +#define WINDOWSTATE_MASK_MAXIMIZED_X ((sal_uLong)0x00000100) +#define WINDOWSTATE_MASK_MAXIMIZED_Y ((sal_uLong)0x00000200) +#define WINDOWSTATE_MASK_MAXIMIZED_WIDTH ((sal_uLong)0x00000400) +#define WINDOWSTATE_MASK_MAXIMIZED_HEIGHT ((sal_uLong)0x00000800) #define WINDOWSTATE_MASK_POS (WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y) #define WINDOWSTATE_MASK_ALL (WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT | WINDOWSTATE_MASK_MAXIMIZED_X | WINDOWSTATE_MASK_MAXIMIZED_Y | WINDOWSTATE_MASK_MAXIMIZED_WIDTH | WINDOWSTATE_MASK_MAXIMIZED_HEIGHT | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED) -#define WINDOWSTATE_STATE_NORMAL ((sal_uIntPtr)0x00000001) -#define WINDOWSTATE_STATE_MINIMIZED ((sal_uIntPtr)0x00000002) -#define WINDOWSTATE_STATE_MAXIMIZED ((sal_uIntPtr)0x00000004) -#define WINDOWSTATE_STATE_ROLLUP ((sal_uIntPtr)0x00000008) -#define WINDOWSTATE_STATE_MAXIMIZED_HORZ ((sal_uIntPtr)0x00000010) -#define WINDOWSTATE_STATE_MAXIMIZED_VERT ((sal_uIntPtr)0x00000020) +#define WINDOWSTATE_STATE_NORMAL ((sal_uLong)0x00000001) +#define WINDOWSTATE_STATE_MINIMIZED ((sal_uLong)0x00000002) +#define WINDOWSTATE_STATE_MAXIMIZED ((sal_uLong)0x00000004) +#define WINDOWSTATE_STATE_ROLLUP ((sal_uLong)0x00000008) +#define WINDOWSTATE_STATE_MAXIMIZED_HORZ ((sal_uLong)0x00000010) +#define WINDOWSTATE_STATE_MAXIMIZED_VERT ((sal_uLong)0x00000020) class VCL_DLLPUBLIC WindowStateData { @@ -106,7 +106,7 @@ public: mnMaximizedX = mnMaximizedY = mnMaximizedWidth = mnMaximizedHeight = 0; } - void SetMask( sal_uIntPtr nValidMask ) { mnValidMask = nValidMask; } + void SetMask( sal_uLong nValidMask ) { mnValidMask = nValidMask; } sal_uInt32 GetMask() const { return mnValidMask; } void SetX( int nX ) { mnX = nX; } @@ -231,7 +231,7 @@ public: Size GetResizeOutputSizePixel() const; void SetWindowState( const ByteString& rStr ); - ByteString GetWindowState( sal_uIntPtr nMask = WINDOWSTATE_MASK_ALL ) const; + ByteString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const; void SetMenuBar( MenuBar* pMenuBar ); MenuBar* GetMenuBar() const { return mpMenuBar; } diff --git a/vcl/inc/vcl/tabpage.hxx b/vcl/inc/vcl/tabpage.hxx index fb5779b3741f..4ed42914e655 100644 --- a/vcl/inc/vcl/tabpage.hxx +++ b/vcl/inc/vcl/tabpage.hxx @@ -48,7 +48,7 @@ public: TabPage( Window* pParent, const ResId& rResId ); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void StateChanged( StateChangedType nStateChange ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/vcl/inc/vcl/timer.hxx b/vcl/inc/vcl/timer.hxx index b0c7a72f3aa1..76857f6c08c5 100644 --- a/vcl/inc/vcl/timer.hxx +++ b/vcl/inc/vcl/timer.hxx @@ -43,7 +43,7 @@ class VCL_DLLPUBLIC Timer { protected: ImplTimerData* mpTimerData; - sal_uIntPtr mnTimeout; + sal_uLong mnTimeout; sal_Bool mbActive; sal_Bool mbAuto; Link maTimeoutHdl; @@ -58,8 +58,8 @@ public: void Start(); void Stop(); - void SetTimeout( sal_uIntPtr nTimeout ); - sal_uIntPtr GetTimeout() const { return mnTimeout; } + void SetTimeout( sal_uLong nTimeout ); + sal_uLong GetTimeout() const { return mnTimeout; } sal_Bool IsActive() const { return mbActive; } void SetTimeoutHdl( const Link& rLink ) { maTimeoutHdl = rLink; } diff --git a/vcl/inc/vcl/vclevent.hxx b/vcl/inc/vcl/vclevent.hxx index 2e06e448d628..d6f8af298593 100644 --- a/vcl/inc/vcl/vclevent.hxx +++ b/vcl/inc/vcl/vclevent.hxx @@ -197,13 +197,13 @@ namespace com { namespace sun { namespace star { class VCL_DLLPUBLIC VclSimpleEvent { private: - sal_uIntPtr nId; + sal_uLong nId; public: - VclSimpleEvent( sal_uIntPtr n ) { nId = n; } + VclSimpleEvent( sal_uLong n ) { nId = n; } TYPEINFO(); - sal_uIntPtr GetId() const { return nId; } + sal_uLong GetId() const { return nId; } }; class VCL_DLLPUBLIC VclWindowEvent : public VclSimpleEvent @@ -213,7 +213,7 @@ private: void* pData; public: - VclWindowEvent( Window* pWin, sal_uIntPtr n, void* pDat = NULL ) : VclSimpleEvent(n) { pWindow = pWin; pData = pDat; } + VclWindowEvent( Window* pWin, sal_uLong n, void* pDat = NULL ) : VclSimpleEvent(n) { pWindow = pWin; pData = pDat; } TYPEINFO(); Window* GetWindow() const { return pWindow; } @@ -227,7 +227,7 @@ private: MouseEvent aEvent; public: - VclMouseEvent( Window* pWin, sal_uIntPtr n, const MouseEvent& rEvent ) : VclWindowEvent( pWin, n ), aEvent(rEvent) { ; } + VclMouseEvent( Window* pWin, sal_uLong n, const MouseEvent& rEvent ) : VclWindowEvent( pWin, n ), aEvent(rEvent) { ; } TYPEINFO(); const MouseEvent& GetEvent() const { return aEvent; } @@ -241,7 +241,7 @@ private: sal_uInt16 mnPos; public: - VclMenuEvent( Menu* pM, sal_uIntPtr n, sal_uInt16 nPos ) : VclSimpleEvent(n) { pMenu = pM; mnPos = nPos; } + VclMenuEvent( Menu* pM, sal_uLong n, sal_uInt16 nPos ) : VclSimpleEvent(n) { pMenu = pM; mnPos = nPos; } TYPEINFO(); Menu* GetMenu() const { return pMenu; } @@ -251,7 +251,7 @@ public: class VCL_DLLPUBLIC VclAccessibleEvent: public VclSimpleEvent { public: - VclAccessibleEvent( sal_uIntPtr n, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible ); + VclAccessibleEvent( sal_uLong n, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible ); virtual ~VclAccessibleEvent(); ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessible() const; diff --git a/vcl/inc/vcl/wall2.hxx b/vcl/inc/vcl/wall2.hxx index 7e91f4c78df4..12ef95e017d7 100644 --- a/vcl/inc/vcl/wall2.hxx +++ b/vcl/inc/vcl/wall2.hxx @@ -40,7 +40,7 @@ private: Gradient* mpGradient; Rectangle* mpRect; WallpaperStyle meStyle; - sal_uIntPtr mnRefCount; + sal_uLong mnRefCount; BitmapEx* mpCache; friend SvStream& operator>>( SvStream& rIStm, ImplWallpaper& rImplWallpaper ); diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index 3ff97902c8f6..0bba376b43a3 100755 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -284,15 +284,15 @@ typedef sal_uInt16 StateChangedType; #define GETFOCUS_FLOATWIN_POPUPMODEEND_CANCEL ((sal_uInt16)0x0400) // Draw-Flags fuer Draw() -#define WINDOW_DRAW_MONO ((sal_uIntPtr)0x00000001) -#define WINDOW_DRAW_NOBORDER ((sal_uIntPtr)0x00000002) -#define WINDOW_DRAW_NOCONTROLS ((sal_uIntPtr)0x00000004) -#define WINDOW_DRAW_NODISABLE ((sal_uIntPtr)0x00000008) -#define WINDOW_DRAW_NOMNEMONIC ((sal_uIntPtr)0x00000010) -#define WINDOW_DRAW_NOSELECTION ((sal_uIntPtr)0x00000020) -#define WINDOW_DRAW_NOFOCUS ((sal_uIntPtr)0x00000040) -#define WINDOW_DRAW_NOBACKGROUND ((sal_uIntPtr)0x00000080) -#define WINDOW_DRAW_ROLLOVER ((sal_uIntPtr)0x00000100) +#define WINDOW_DRAW_MONO ((sal_uLong)0x00000001) +#define WINDOW_DRAW_NOBORDER ((sal_uLong)0x00000002) +#define WINDOW_DRAW_NOCONTROLS ((sal_uLong)0x00000004) +#define WINDOW_DRAW_NODISABLE ((sal_uLong)0x00000008) +#define WINDOW_DRAW_NOMNEMONIC ((sal_uLong)0x00000010) +#define WINDOW_DRAW_NOSELECTION ((sal_uLong)0x00000020) +#define WINDOW_DRAW_NOFOCUS ((sal_uLong)0x00000040) +#define WINDOW_DRAW_NOBACKGROUND ((sal_uLong)0x00000080) +#define WINDOW_DRAW_ROLLOVER ((sal_uLong)0x00000100) // Border-Styles fuer SetBorder() #define WINDOW_BORDER_NORMAL ((sal_uInt16)0x0001) @@ -595,8 +595,8 @@ protected: void SetCompoundControl( sal_Bool bCompound ); - void ImplCallEventListeners( sal_uIntPtr nEvent, void* pData = NULL ); - void CallEventListeners( sal_uIntPtr nEvent, void* pData = NULL ); + void ImplCallEventListeners( sal_uLong nEvent, void* pData = NULL ); + void CallEventListeners( sal_uLong nEvent, void* pData = NULL ); void FireVclEvent( VclSimpleEvent* pEvent ); // FIXME: this is a hack to workaround missing layout functionality @@ -617,7 +617,7 @@ public: virtual void Paint( const Rectangle& rRect ); virtual void PostPaint(); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Move(); virtual void Resize(); virtual void Activate(); @@ -627,7 +627,7 @@ public: virtual void RequestHelp( const HelpEvent& rHEvt ); virtual void Command( const CommandEvent& rCEvt ); virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void UserEvent( sal_uIntPtr nEvent, void* pEventData ); + virtual void UserEvent( sal_uLong nEvent, void* pEventData ); virtual void StateChanged( StateChangedType nStateChange ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual long PreNotify( NotifyEvent& rNEvt ); @@ -639,11 +639,11 @@ public: /*virtual*/ void AddChildEventListener( const Link& rEventListener ); /*virtual*/ void RemoveChildEventListener( const Link& rEventListener ); - sal_uIntPtr PostUserEvent( sal_uIntPtr nEvent, void* pEventData = NULL ); - sal_uIntPtr PostUserEvent( const Link& rLink, void* pCaller = NULL ); - sal_Bool PostUserEvent( sal_uIntPtr& rEventId, sal_uIntPtr nEvent, void* pEventData = NULL ); - sal_Bool PostUserEvent( sal_uIntPtr& rEventId, const Link& rLink, void* pCaller = NULL ); - void RemoveUserEvent( sal_uIntPtr nUserEvent ); + sal_uLong PostUserEvent( sal_uLong nEvent, void* pEventData = NULL ); + sal_uLong PostUserEvent( const Link& rLink, void* pCaller = NULL ); + sal_Bool PostUserEvent( sal_uLong& rEventId, sal_uLong nEvent, void* pEventData = NULL ); + sal_Bool PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller = NULL ); + void RemoveUserEvent( sal_uLong nUserEvent ); void PostStateChanged( StateChangedType nState ); void IncrementLockCount(); @@ -697,13 +697,13 @@ public: struct PointerState { - sal_uIntPtr mnState; // the button state + sal_uLong mnState; // the button state Point maPos; // mouse position in output coordinates }; PointerState GetPointerState(); sal_Bool IsMouseOver(); - sal_uIntPtr GetCurrentModButtons(); + sal_uLong GetCurrentModButtons(); void SetInputContext( const InputContext& rInputContext ); const InputContext& GetInputContext() const; diff --git a/vcl/inc/vcl/wrkwin.hxx b/vcl/inc/vcl/wrkwin.hxx index f41dab25ea58..863b84131a79 100644 --- a/vcl/inc/vcl/wrkwin.hxx +++ b/vcl/inc/vcl/wrkwin.hxx @@ -68,7 +68,7 @@ protected: WorkWindow( WindowType nType ); SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData = NULL ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - SAL_DLLPRIVATE void ImplSetFrameState( sal_uIntPtr aFrameState ); + SAL_DLLPRIVATE void ImplSetFrameState( sal_uLong aFrameState ); public: WorkWindow( Window* pParent, const ResId& rResId ); diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index 354a4124d9e3..a50c8aeec149 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -457,7 +457,7 @@ namespace } // ------------------------------------------------------------------- - void ImplSelectChannel( ListBox& rList, sal_uIntPtr nChannelToSelect, sal_uInt16 nPositionOffset ) + void ImplSelectChannel( ListBox& rList, sal_uLong nChannelToSelect, sal_uInt16 nPositionOffset ) { if ( nChannelToSelect < DBG_OUT_USER_CHANNEL_0 ) rList.SelectEntryPos( (sal_uInt16)( nChannelToSelect - nPositionOffset ) ); @@ -2002,7 +2002,7 @@ void DbgGUIStart() { DbgDialog* pDialog = new DbgDialog; // Fuer den Debug-Dialog schalten wir Dialogtests aus - sal_uIntPtr nOldFlags = pData->nTestFlags; + sal_uLong nOldFlags = pData->nTestFlags; pData->nTestFlags &= ~DBG_TEST_DIALOG; if ( !pDialog->Execute() ) pData->nTestFlags |= (nOldFlags & DBG_TEST_DIALOG); diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index 26722188e7e5..275280eff692 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -290,7 +290,7 @@ sal_uIntPtr Help::ShowTip( Window* pParent, const Rectangle& rRect, // ----------------------------------------------------------------------- -void Help::HideTip( sal_uIntPtr nId ) +void Help::HideTip( sal_uLong nId ) { HelpTextWindow* pHelpWin = (HelpTextWindow*)nId; Window* pFrameWindow = pHelpWin->ImplGetFrameWindow(); @@ -338,7 +338,7 @@ HelpTextWindow::HelpTextWindow( Window* pParent, const XubString& rText, sal_uIn if( mnStyle & QUICKHELP_BIDI_RTL ) { - sal_uIntPtr nLayoutMode = GetLayoutMode(); + sal_uLong nLayoutMode = GetLayoutMode(); nLayoutMode |= TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_TEXTORIGIN_LEFT; SetLayoutMode( nLayoutMode ); } @@ -481,7 +481,7 @@ void HelpTextWindow::Paint( const Rectangle& ) void HelpTextWindow::ShowHelp( sal_uInt16 nDelayMode ) { - sal_uIntPtr nTimeout = 0; + sal_uLong nTimeout = 0; if ( nDelayMode != HELPDELAY_NONE ) { // Im ExtendedHelp-Fall die Hilfe schneller anzeigen @@ -624,7 +624,7 @@ void ImplShowHelpWindow( Window* pParent, sal_uInt16 nHelpWinStyle, sal_uInt16 n if ( !pHelpWin && rHelpText.Len() ) { - sal_uIntPtr nCurTime = Time::GetSystemTicks(); + sal_uLong nCurTime = Time::GetSystemTicks(); if( (nCurTime - pSVData->maHelpData.mnLastHelpHideTime) < pParent->GetSettings().GetHelpSettings().GetTipDelay() ) nDelayMode = HELPDELAY_NONE; diff --git a/vcl/source/app/idlemgr.cxx b/vcl/source/app/idlemgr.cxx index 59d4aa587b64..42e4cf09fdb0 100644 --- a/vcl/source/app/idlemgr.cxx +++ b/vcl/source/app/idlemgr.cxx @@ -73,7 +73,7 @@ ImplIdleMgr::~ImplIdleMgr() sal_Bool ImplIdleMgr::InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority ) { - sal_uIntPtr nPos = LIST_APPEND; + sal_uLong nPos = LIST_APPEND; ImplIdleData* pIdleData = mpIdleList->First(); while ( pIdleData ) { diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 7123b9bc5184..9c642946a34e 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -139,7 +139,7 @@ SalMenu::~SalMenu() { } -bool SalMenu::ShowNativePopupMenu(FloatingWindow *, const Rectangle&, sal_uIntPtr ) +bool SalMenu::ShowNativePopupMenu(FloatingWindow *, const Rectangle&, sal_uLong ) { return false; } diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx index 986db388df79..066d58ce4eec 100644 --- a/vcl/source/app/session.cxx +++ b/vcl/source/app/session.cxx @@ -146,7 +146,7 @@ void VCLSession::callSaveRequested( bool bShutdown, bool bCancelable ) } } - sal_uIntPtr nAcquireCount = Application::ReleaseSolarMutex(); + sal_uLong nAcquireCount = Application::ReleaseSolarMutex(); for( std::list< Listener >::const_iterator it = aListeners.begin(); it != aListeners.end(); ++it ) it->m_xListener->doSave( bShutdown, bCancelable ); Application::AcquireSolarMutex( nAcquireCount ); @@ -174,7 +174,7 @@ void VCLSession::callInteractionGranted( bool bInteractionGranted ) } } - sal_uIntPtr nAcquireCount = Application::ReleaseSolarMutex(); + sal_uLong nAcquireCount = Application::ReleaseSolarMutex(); for( std::list< Listener >::const_iterator it = aListeners.begin(); it != aListeners.end(); ++it ) it->m_xListener->approveInteraction( bInteractionGranted ); @@ -192,7 +192,7 @@ void VCLSession::callShutdownCancelled() m_bInteractionRequested = m_bInteractionDone = m_bInteractionGranted = false; } - sal_uIntPtr nAcquireCount = Application::ReleaseSolarMutex(); + sal_uLong nAcquireCount = Application::ReleaseSolarMutex(); for( std::list< Listener >::const_iterator it = aListeners.begin(); it != aListeners.end(); ++it ) it->m_xListener->shutdownCanceled(); Application::AcquireSolarMutex( nAcquireCount ); @@ -209,7 +209,7 @@ void VCLSession::callQuit() m_bInteractionRequested = m_bInteractionDone = m_bInteractionGranted = false; } - sal_uIntPtr nAcquireCount = Application::ReleaseSolarMutex(); + sal_uLong nAcquireCount = Application::ReleaseSolarMutex(); for( std::list< Listener >::const_iterator it = aListeners.begin(); it != aListeners.end(); ++it ) { Reference< XSessionManagerListener2 > xListener2( it->m_xListener, UNO_QUERY ); diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index f675301de198..84856aa2b47f 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -683,12 +683,12 @@ void StyleSettings::Set3DColors( const Color& rColor ) mpData->maShadowColor = rColor; mpData->maLightColor.IncreaseLuminance( 64 ); mpData->maShadowColor.DecreaseLuminance( 64 ); - sal_uIntPtr nRed = mpData->maLightColor.GetRed(); - sal_uIntPtr nGreen = mpData->maLightColor.GetGreen(); - sal_uIntPtr nBlue = mpData->maLightColor.GetBlue(); - nRed += (sal_uIntPtr)(mpData->maShadowColor.GetRed()); - nGreen += (sal_uIntPtr)(mpData->maShadowColor.GetGreen()); - nBlue += (sal_uIntPtr)(mpData->maShadowColor.GetBlue()); + sal_uLong nRed = mpData->maLightColor.GetRed(); + sal_uLong nGreen = mpData->maLightColor.GetGreen(); + sal_uLong nBlue = mpData->maLightColor.GetBlue(); + nRed += (sal_uLong)(mpData->maShadowColor.GetRed()); + nGreen += (sal_uLong)(mpData->maShadowColor.GetGreen()); + nBlue += (sal_uLong)(mpData->maShadowColor.GetBlue()); mpData->maCheckedColor = Color( (sal_uInt8)(nRed/2), (sal_uInt8)(nGreen/2), (sal_uInt8)(nBlue/2) ); } else @@ -701,7 +701,7 @@ void StyleSettings::Set3DColors( const Color& rColor ) // ----------------------------------------------------------------------- -::rtl::OUString StyleSettings::ImplSymbolsStyleToName( sal_uIntPtr nStyle ) const +::rtl::OUString StyleSettings::ImplSymbolsStyleToName( sal_uLong nStyle ) const { switch ( nStyle ) { @@ -719,7 +719,7 @@ void StyleSettings::Set3DColors( const Color& rColor ) // ----------------------------------------------------------------------- -sal_uIntPtr StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) const +sal_uLong StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) const { if ( rName == ::rtl::OUString::createFromAscii( "default" ) ) return STYLE_SYMBOLS_DEFAULT; @@ -761,22 +761,22 @@ void StyleSettings::SetPreferredSymbolsStyleName( const ::rtl::OUString &rName ) // ----------------------------------------------------------------------- -sal_uIntPtr StyleSettings::GetCurrentSymbolsStyle() const +sal_uLong StyleSettings::GetCurrentSymbolsStyle() const { // style selected in Tools -> Options... -> OpenOffice.org -> View - sal_uIntPtr nStyle = GetSymbolsStyle(); + sal_uLong nStyle = GetSymbolsStyle(); if ( nStyle == STYLE_SYMBOLS_AUTO || ( !CheckSymbolStyle (nStyle) ) ) { // the preferred style can be read from the desktop setting by the desktop native widgets modules - sal_uIntPtr nPreferredStyle = GetPreferredSymbolsStyle(); + sal_uLong nPreferredStyle = GetPreferredSymbolsStyle(); if ( nPreferredStyle == STYLE_SYMBOLS_AUTO || ( !CheckSymbolStyle (nPreferredStyle) ) ) { // use a hardcoded desktop-specific fallback if no preferred style has been detected static bool sbFallbackDesktopChecked = false; - static sal_uIntPtr snFallbackDesktopStyle = STYLE_SYMBOLS_DEFAULT; + static sal_uLong snFallbackDesktopStyle = STYLE_SYMBOLS_DEFAULT; if ( !sbFallbackDesktopChecked ) { @@ -798,10 +798,10 @@ sal_uIntPtr StyleSettings::GetCurrentSymbolsStyle() const // ----------------------------------------------------------------------- -sal_uIntPtr StyleSettings::GetAutoSymbolsStyle() const +sal_uLong StyleSettings::GetAutoSymbolsStyle() const { const ::rtl::OUString& rDesktopEnvironment = Application::GetDesktopEnvironment(); - sal_uIntPtr nRet = STYLE_SYMBOLS_DEFAULT; + sal_uLong nRet = STYLE_SYMBOLS_DEFAULT; bool bCont = true; try @@ -831,9 +831,9 @@ sal_uIntPtr StyleSettings::GetAutoSymbolsStyle() const // falback to any existing style if ( ! CheckSymbolStyle (nRet) ) { - for ( sal_uIntPtr n = 0 ; n <= STYLE_SYMBOLS_THEMES_MAX ; n++ ) + for ( sal_uLong n = 0 ; n <= STYLE_SYMBOLS_THEMES_MAX ; n++ ) { - sal_uIntPtr nStyleToCheck = n; + sal_uLong nStyleToCheck = n; // auto is not a real theme => can't be fallback if ( nStyleToCheck == STYLE_SYMBOLS_AUTO ) @@ -858,7 +858,7 @@ sal_uIntPtr StyleSettings::GetAutoSymbolsStyle() const // ----------------------------------------------------------------------- -bool StyleSettings::CheckSymbolStyle( sal_uIntPtr nStyle ) const +bool StyleSettings::CheckSymbolStyle( sal_uLong nStyle ) const { static ImplImageTreeSingletonRef aImageTree; return aImageTree->checkStyle( ImplSymbolsStyleToName( nStyle ) ); @@ -1689,12 +1689,12 @@ void AllSettings::CopyData() // ----------------------------------------------------------------------- -sal_uIntPtr AllSettings::Update( sal_uIntPtr nFlags, const AllSettings& rSet ) +sal_uLong AllSettings::Update( sal_uLong nFlags, const AllSettings& rSet ) { DBG_CHKTHIS( AllSettings, NULL ); DBG_CHKOBJ( &rSet, AllSettings, NULL ); - sal_uIntPtr nChangeFlags = 0; + sal_uLong nChangeFlags = 0; if ( nFlags & SETTINGS_MACHINE ) { @@ -1791,12 +1791,12 @@ sal_uIntPtr AllSettings::Update( sal_uIntPtr nFlags, const AllSettings& rSet ) // ----------------------------------------------------------------------- -sal_uIntPtr AllSettings::GetChangeFlags( const AllSettings& rSet ) const +sal_uLong AllSettings::GetChangeFlags( const AllSettings& rSet ) const { DBG_CHKTHIS( AllSettings, NULL ); DBG_CHKOBJ( &rSet, AllSettings, NULL ); - sal_uIntPtr nChangeFlags = 0; + sal_uLong nChangeFlags = 0; if ( mpData->maMachineSettings != rSet.mpData->maMachineSettings ) nChangeFlags |= SETTINGS_MACHINE; diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 2b07c799bf3a..518b079b166a 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -184,16 +184,16 @@ struct ImplEventHook struct ImplPostEventData { - sal_uIntPtr mnEvent; + sal_uLong mnEvent; const Window* mpWin; - sal_uIntPtr mnEventId; + sal_uLong mnEventId; KeyEvent maKeyEvent; MouseEvent maMouseEvent; - ImplPostEventData( sal_uIntPtr nEvent, const Window* pWin, const KeyEvent& rKeyEvent ) : + ImplPostEventData( sal_uLong nEvent, const Window* pWin, const KeyEvent& rKeyEvent ) : mnEvent( nEvent ), mpWin( pWin ), mnEventId( 0 ), maKeyEvent( rKeyEvent ) {} - ImplPostEventData( sal_uIntPtr nEvent, const Window* pWin, const MouseEvent& rMouseEvent ) : + ImplPostEventData( sal_uLong nEvent, const Window* pWin, const MouseEvent& rMouseEvent ) : mnEvent( nEvent ), mpWin( pWin ), mnEventId( 0 ), maMouseEvent( rMouseEvent ) {} ~ImplPostEventData() {} @@ -255,7 +255,7 @@ sal_Bool Application::QueryExit() // ----------------------------------------------------------------------- -void Application::UserEvent( sal_uIntPtr, void* ) +void Application::UserEvent( sal_uLong, void* ) { } @@ -410,12 +410,12 @@ void Application::Abort( const XubString& rErrorText ) // ----------------------------------------------------------------------- -sal_uIntPtr Application::GetReservedKeyCodeCount() +sal_uLong Application::GetReservedKeyCodeCount() { return ImplReservedKeys::get()->second; } -const KeyCode* Application::GetReservedKeyCode( sal_uIntPtr i ) +const KeyCode* Application::GetReservedKeyCode( sal_uLong i ) { if( i >= GetReservedKeyCodeCount() ) return NULL; @@ -423,7 +423,7 @@ const KeyCode* Application::GetReservedKeyCode( sal_uIntPtr i ) return &ImplReservedKeys::get()->first[i].mKeyCode; } -String Application::GetReservedKeyCodeDescription( sal_uIntPtr i ) +String Application::GetReservedKeyCodeDescription( sal_uLong i ) { ResMgr* pResMgr = ImplGetResMgr(); if( ! pResMgr ) @@ -537,7 +537,7 @@ vos::OThread::TThreadIdentifier Application::GetMainThreadIdentifier() // ----------------------------------------------------------------------- -sal_uIntPtr Application::ReleaseSolarMutex() +sal_uLong Application::ReleaseSolarMutex() { ImplSVData* pSVData = ImplGetSVData(); return pSVData->mpDefInst->ReleaseYieldMutex(); @@ -545,7 +545,7 @@ sal_uIntPtr Application::ReleaseSolarMutex() // ----------------------------------------------------------------------- -void Application::AcquireSolarMutex( sal_uIntPtr nCount ) +void Application::AcquireSolarMutex( sal_uLong nCount ) { ImplSVData* pSVData = ImplGetSVData(); pSVData->mpDefInst->AcquireYieldMutex( nCount ); @@ -602,7 +602,7 @@ sal_Bool Application::AnyInput( sal_uInt16 nType ) // ----------------------------------------------------------------------- -sal_uIntPtr Application::GetLastInputInterval() +sal_uLong Application::GetLastInputInterval() { return (Time::GetSystemTicks()-ImplGetSVData()->maAppData.mnLastInputTime); } @@ -719,7 +719,7 @@ void Application::SetSettings( const AllSettings& rSettings ) } ResMgr::SetDefaultLocale( rSettings.GetUILocale() ); *pSVData->maAppData.mpSettings = rSettings; - sal_uIntPtr nChangeFlags = aOldSettings.GetChangeFlags( *pSVData->maAppData.mpSettings ); + sal_uLong nChangeFlags = aOldSettings.GetChangeFlags( *pSVData->maAppData.mpSettings ); if ( nChangeFlags ) { DataChangedEvent aDCEvt( DATACHANGED_SETTINGS, &aOldSettings, nChangeFlags ); @@ -839,7 +839,7 @@ void Application::NotifyAllWindows( DataChangedEvent& rDCEvt ) // ----------------------------------------------------------------------- -void Application::ImplCallEventListeners( sal_uIntPtr nEvent, Window *pWin, void* pData ) +void Application::ImplCallEventListeners( sal_uLong nEvent, Window *pWin, void* pData ) { ImplSVData* pSVData = ImplGetSVData(); VclWindowEvent aEvent( pWin, nEvent, pData ); @@ -899,7 +899,7 @@ void Application::RemoveKeyListener( const Link& rKeyListener ) // ----------------------------------------------------------------------- -sal_Bool Application::HandleKey( sal_uIntPtr nEvent, Window *pWin, KeyEvent* pKeyEvent ) +sal_Bool Application::HandleKey( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent ) { // let listeners process the key event VclWindowEvent aEvent( pWin, nEvent, (void *) pKeyEvent ); @@ -916,10 +916,10 @@ sal_Bool Application::HandleKey( sal_uIntPtr nEvent, Window *pWin, KeyEvent* pKe // ----------------------------------------------------------------------------- -sal_uIntPtr Application::PostKeyEvent( sal_uIntPtr nEvent, Window *pWin, KeyEvent* pKeyEvent ) +sal_uLong Application::PostKeyEvent( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent ) { const ::vos::OGuard aGuard( GetSolarMutex() ); - sal_uIntPtr nEventId = 0; + sal_uLong nEventId = 0; if( pWin && pKeyEvent ) { @@ -943,10 +943,10 @@ sal_uIntPtr Application::PostKeyEvent( sal_uIntPtr nEvent, Window *pWin, KeyEven // ----------------------------------------------------------------------------- -sal_uIntPtr Application::PostMouseEvent( sal_uIntPtr nEvent, Window *pWin, MouseEvent* pMouseEvent ) +sal_uLong Application::PostMouseEvent( sal_uLong nEvent, Window *pWin, MouseEvent* pMouseEvent ) { const ::vos::OGuard aGuard( GetSolarMutex() ); - sal_uIntPtr nEventId = 0; + sal_uLong nEventId = 0; if( pWin && pMouseEvent ) { @@ -983,8 +983,8 @@ IMPL_STATIC_LINK_NOINSTANCE( Application, PostEventHandler, void*, pCallData ) const ::vos::OGuard aGuard( GetSolarMutex() ); ImplPostEventData* pData = static_cast< ImplPostEventData * >( pCallData ); const void* pEventData; - sal_uIntPtr nEvent; - const sal_uIntPtr nEventId = pData->mnEventId; + sal_uLong nEvent; + const sal_uLong nEventId = pData->mnEventId; switch( pData->mnEvent ) { @@ -1065,7 +1065,7 @@ void Application::RemoveMouseAndKeyEvents( Window* pWin ) // ----------------------------------------------------------------------- -sal_Bool Application::IsProcessedMouseOrKeyEvent( sal_uIntPtr nEventId ) +sal_Bool Application::IsProcessedMouseOrKeyEvent( sal_uLong nEventId ) { const ::vos::OGuard aGuard( GetSolarMutex() ); @@ -1085,25 +1085,25 @@ sal_Bool Application::IsProcessedMouseOrKeyEvent( sal_uIntPtr nEventId ) // ----------------------------------------------------------------------- -sal_uIntPtr Application::PostUserEvent( sal_uIntPtr nEvent, void* pEventData ) +sal_uLong Application::PostUserEvent( sal_uLong nEvent, void* pEventData ) { - sal_uIntPtr nEventId; + sal_uLong nEventId; PostUserEvent( nEventId, nEvent, pEventData ); return nEventId; } // ----------------------------------------------------------------------- -sal_uIntPtr Application::PostUserEvent( const Link& rLink, void* pCaller ) +sal_uLong Application::PostUserEvent( const Link& rLink, void* pCaller ) { - sal_uIntPtr nEventId; + sal_uLong nEventId; PostUserEvent( nEventId, rLink, pCaller ); return nEventId; } // ----------------------------------------------------------------------- -sal_Bool Application::PostUserEvent( sal_uIntPtr& rEventId, sal_uIntPtr nEvent, void* pEventData ) +sal_Bool Application::PostUserEvent( sal_uLong& rEventId, sal_uLong nEvent, void* pEventData ) { ImplSVEvent* pSVEvent = new ImplSVEvent; pSVEvent->mnEvent = nEvent; @@ -1111,7 +1111,7 @@ sal_Bool Application::PostUserEvent( sal_uIntPtr& rEventId, sal_uIntPtr nEvent, pSVEvent->mpLink = NULL; pSVEvent->mpWindow = NULL; pSVEvent->mbCall = sal_True; - rEventId = (sal_uIntPtr)pSVEvent; + rEventId = (sal_uLong)pSVEvent; Window* pDefWindow = ImplGetDefaultWindow(); if ( pDefWindow && pDefWindow->ImplGetFrame()->PostEvent( pSVEvent ) ) return sal_True; @@ -1125,7 +1125,7 @@ sal_Bool Application::PostUserEvent( sal_uIntPtr& rEventId, sal_uIntPtr nEvent, // ----------------------------------------------------------------------- -sal_Bool Application::PostUserEvent( sal_uIntPtr& rEventId, const Link& rLink, void* pCaller ) +sal_Bool Application::PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller ) { ImplSVEvent* pSVEvent = new ImplSVEvent; pSVEvent->mnEvent = 0; @@ -1133,7 +1133,7 @@ sal_Bool Application::PostUserEvent( sal_uIntPtr& rEventId, const Link& rLink, v pSVEvent->mpLink = new Link( rLink ); pSVEvent->mpWindow = NULL; pSVEvent->mbCall = sal_True; - rEventId = (sal_uIntPtr)pSVEvent; + rEventId = (sal_uLong)pSVEvent; Window* pDefWindow = ImplGetDefaultWindow(); if ( pDefWindow && pDefWindow->ImplGetFrame()->PostEvent( pSVEvent ) ) return sal_True; @@ -1147,7 +1147,7 @@ sal_Bool Application::PostUserEvent( sal_uIntPtr& rEventId, const Link& rLink, v // ----------------------------------------------------------------------- -void Application::RemoveUserEvent( sal_uIntPtr nUserEvent ) +void Application::RemoveUserEvent( sal_uLong nUserEvent ) { if(nUserEvent) { diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index d68b0c462ddf..44990c39c05a 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -202,7 +202,7 @@ sal_Bool ImplSVMain() Reference< XComponent > xComponent(pSVData->mxAccessBridge, UNO_QUERY); if( xComponent.is() ) { - sal_uIntPtr nCount = Application::ReleaseSolarMutex(); + sal_uLong nCount = Application::ReleaseSolarMutex(); xComponent->dispose(); Application::AcquireSolarMutex(nCount); pSVData->mxAccessBridge.clear(); diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx index 26cf1b215ea6..f31779f759c6 100644 --- a/vcl/source/app/timer.cxx +++ b/vcl/source/app/timer.cxx @@ -43,7 +43,7 @@ // ======================================================================= -#define MAX_TIMER_PERIOD ((sal_uIntPtr)0xFFFFFFFF) +#define MAX_TIMER_PERIOD ((sal_uLong)0xFFFFFFFF) // --------------------- // - TimeManager-Types - @@ -53,8 +53,8 @@ struct ImplTimerData { ImplTimerData* mpNext; // Pointer to the next Instance Timer* mpSVTimer; // Pointer to SV Timer instance - sal_uIntPtr mnUpdateTime; // Last Update Time - sal_uIntPtr mnTimerUpdate; // TimerCallbackProcs on stack + sal_uLong mnUpdateTime; // Last Update Time + sal_uLong mnTimerUpdate; // TimerCallbackProcs on stack sal_Bool mbDelete; // Wurde Timer waehren Update() geloescht sal_Bool mbInTimeout; // Befinden wir uns im Timeout-Handler }; @@ -90,7 +90,7 @@ void Timer::ImplDeInitTimer() // ----------------------------------------------------------------------- -static void ImplStartTimer( ImplSVData* pSVData, sal_uIntPtr nMS ) +static void ImplStartTimer( ImplSVData* pSVData, sal_uLong nMS ) { if ( !nMS ) nMS = 1; @@ -109,9 +109,9 @@ void Timer::ImplTimerCallbackProc() ImplSVData* pSVData = ImplGetSVData(); ImplTimerData* pTimerData; ImplTimerData* pPrevTimerData; - sal_uIntPtr nMinPeriod = MAX_TIMER_PERIOD; - sal_uIntPtr nDeltaTime; - sal_uIntPtr nTime = Time::GetSystemTicks(); + sal_uLong nMinPeriod = MAX_TIMER_PERIOD; + sal_uLong nDeltaTime; + sal_uLong nTime = Time::GetSystemTicks(); if ( pSVData->mbNoCallTimer ) return; @@ -153,7 +153,7 @@ void Timer::ImplTimerCallbackProc() } // Neue Zeit ermitteln - sal_uIntPtr nNewTime = Time::GetSystemTicks(); + sal_uLong nNewTime = Time::GetSystemTicks(); pPrevTimerData = NULL; pTimerData = pSVData->mpFirstTimerData; while ( pTimerData ) @@ -261,7 +261,7 @@ void Timer::Timeout() // ----------------------------------------------------------------------- -void Timer::SetTimeout( sal_uIntPtr nNewTimeout ) +void Timer::SetTimeout( sal_uLong nNewTimeout ) { mnTimeout = nNewTimeout; diff --git a/vcl/source/app/unohelp2.cxx b/vcl/source/app/unohelp2.cxx index 534f08816739..514d95032d6f 100644 --- a/vcl/source/app/unohelp2.cxx +++ b/vcl/source/app/unohelp2.cxx @@ -84,7 +84,7 @@ namespace vcl { namespace unohelper { { uno::Any aAny; - sal_uIntPtr nT = SotExchange::GetFormat( rFlavor ); + sal_uLong nT = SotExchange::GetFormat( rFlavor ); if ( nT == SOT_FORMAT_STRING ) { aAny <<= (::rtl::OUString)GetString(); @@ -105,7 +105,7 @@ namespace vcl { namespace unohelper { sal_Bool TextDataObject::isDataFlavorSupported( const datatransfer::DataFlavor& rFlavor ) throw(uno::RuntimeException) { - sal_uIntPtr nT = SotExchange::GetFormat( rFlavor ); + sal_uLong nT = SotExchange::GetFormat( rFlavor ); return ( nT == SOT_FORMAT_STRING ); } diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx index 85f02e5237f8..1ae5f7537ca6 100644 --- a/vcl/source/app/vclevent.cxx +++ b/vcl/source/app/vclevent.cxx @@ -40,7 +40,7 @@ TYPEINIT0(VclSimpleEvent); TYPEINIT1(VclWindowEvent, VclSimpleEvent); TYPEINIT1(VclMenuEvent, VclSimpleEvent); -VclAccessibleEvent::VclAccessibleEvent( sal_uIntPtr n, const Reference<XAccessible>& rxAccessible ) : +VclAccessibleEvent::VclAccessibleEvent( sal_uLong n, const Reference<XAccessible>& rxAccessible ) : VclSimpleEvent(n), mxAccessible(rxAccessible) { diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 0db9413dbf1f..5cae5a184d39 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -348,7 +348,7 @@ void Button::ImplSetSymbolRect( const Rectangle& i_rRect ) // ----------------------------------------------------------------------- sal_uInt16 Button::ImplGetTextStyle( XubString& rText, WinBits nWinStyle, - sal_uIntPtr nDrawFlags ) + sal_uLong nDrawFlags ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); sal_uInt16 nTextStyle = FixedText::ImplGetTextStyle( nWinStyle & ~WB_DEFBUTTON ); @@ -379,7 +379,7 @@ sal_uInt16 Button::ImplGetTextStyle( XubString& rText, WinBits nWinStyle, void Button::ImplDrawAlignedImage( OutputDevice* pDev, Point& rPos, Size& rSize, sal_Bool bLayout, - sal_uIntPtr nImageSep, sal_uIntPtr nDrawFlags, + sal_uLong nImageSep, sal_uLong nDrawFlags, sal_uInt16 nTextStyle, Rectangle *pSymbolRect, bool bAddImageSep ) { @@ -1089,7 +1089,7 @@ sal_Bool PushButton::ImplHitTestPushButton( Window* pDev, // ----------------------------------------------------------------------- -sal_uInt16 PushButton::ImplGetTextStyle( sal_uIntPtr nDrawFlags ) const +sal_uInt16 PushButton::ImplGetTextStyle( sal_uLong nDrawFlags ) const { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -1154,7 +1154,7 @@ static void ImplDrawBtnDropDownArrow( OutputDevice* pDev, // ----------------------------------------------------------------------- -void PushButton::ImplDrawPushButtonContent( OutputDevice* pDev, sal_uIntPtr nDrawFlags, +void PushButton::ImplDrawPushButtonContent( OutputDevice* pDev, sal_uLong nDrawFlags, const Rectangle& rRect, bool bLayout, bool bMenuBtnSep @@ -1192,7 +1192,7 @@ void PushButton::ImplDrawPushButtonContent( OutputDevice* pDev, sal_uIntPtr nDra Size aSize = rRect.GetSize(); Point aPos = rRect.TopLeft(); - sal_uIntPtr nImageSep = 1 + (pDev->GetTextHeight()-10)/2; + sal_uLong nImageSep = 1 + (pDev->GetTextHeight()-10)/2; if( nImageSep < 1 ) nImageSep = 1; if ( mnDDStyle == PUSHBUTTON_DROPDOWN_MENUBUTTON ) @@ -1726,7 +1726,7 @@ void PushButton::Paint( const Rectangle& ) // ----------------------------------------------------------------------- void PushButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, - sal_uIntPtr nFlags ) + sal_uLong nFlags ) { Point aPos = pDev->LogicToPixel( rPos ); Size aSize = pDev->LogicToPixel( rSize ); @@ -2038,7 +2038,7 @@ Size PushButton::CalcMinimumSize( long nMaxWidth ) const aSize = GetModeImage().GetSizePixel(); if ( PushButton::GetText().Len() && ! (ImplGetButtonState() & BUTTON_DRAW_NOTEXT) ) { - sal_uIntPtr nDrawFlags = 0; + sal_uLong nDrawFlags = 0; Size textSize = GetTextRect( Rectangle( Point(), Size( nMaxWidth ? nMaxWidth : 0x7fffffff, 0x7fffffff ) ), PushButton::GetText(), ImplGetTextStyle( nDrawFlags ) ).GetSize(); aSize.Width() += int( textSize.Width () * 1.15 ); @@ -2474,7 +2474,7 @@ if ( bNativeOK == sal_False ) // ----------------------------------------------------------------------- -void RadioButton::ImplDraw( OutputDevice* pDev, sal_uIntPtr nDrawFlags, +void RadioButton::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize, const Size& rImageSize, Rectangle& rStateRect, Rectangle& rMouseRect, bool bLayout ) @@ -2918,7 +2918,7 @@ void RadioButton::Paint( const Rectangle& ) // ----------------------------------------------------------------------- void RadioButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, - sal_uIntPtr nFlags ) + sal_uLong nFlags ) { if ( !maImage ) { @@ -3575,7 +3575,7 @@ void CheckBox::ImplDrawCheckBoxState() // ----------------------------------------------------------------------- -void CheckBox::ImplDraw( OutputDevice* pDev, sal_uIntPtr nDrawFlags, +void CheckBox::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize, const Size& rImageSize, Rectangle& rStateRect, Rectangle& rMouseRect, bool bLayout ) @@ -3864,7 +3864,7 @@ void CheckBox::Paint( const Rectangle& ) // ----------------------------------------------------------------------- void CheckBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, - sal_uIntPtr nFlags ) + sal_uLong nFlags ) { MapMode aResMapMode( MAP_100TH_MM ); Point aPos = pDev->LogicToPixel( rPos ); @@ -4347,7 +4347,7 @@ ImageButton::ImageButton( Window* pParent, WinBits nStyle ) : ImageButton::ImageButton( Window* pParent, const ResId& rResId ) : PushButton( pParent, rResId.SetRT( RSC_IMAGEBUTTON ) ) { - sal_uIntPtr nObjMask = ReadLongRes(); + sal_uLong nObjMask = ReadLongRes(); if ( RSC_IMAGEBUTTON_IMAGE & nObjMask ) { @@ -4396,7 +4396,7 @@ ImageRadioButton::ImageRadioButton( Window* pParent, WinBits nStyle ) : ImageRadioButton::ImageRadioButton( Window* pParent, const ResId& rResId ) : RadioButton( pParent, rResId.SetRT( RSC_IMAGERADIOBUTTON ) ) { - sal_uIntPtr nObjMask = ReadLongRes(); + sal_uLong nObjMask = ReadLongRes(); if ( RSC_IMAGERADIOBUTTON_IMAGE & nObjMask ) { @@ -4426,7 +4426,7 @@ TriStateBox::TriStateBox( Window* pParent, const ResId& rResId ) : { EnableTriState( sal_True ); - sal_uIntPtr nTriState = ReadLongRes(); + sal_uLong nTriState = ReadLongRes(); sal_uInt16 bDisableTriState = ReadShortRes(); //anderer Wert als Default ? if ( (TriState)nTriState != STATE_NOCHECK ) diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 6ecf0f1d4696..2fd0ade0f65d 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -47,7 +47,7 @@ // ======================================================================= -inline sal_uIntPtr ImplCreateKey( sal_uInt16 nPos ) +inline sal_uLong ImplCreateKey( sal_uInt16 nPos ) { // Key = Pos+1, wegen Pos 0 return nPos+1; @@ -250,7 +250,7 @@ void ComboBox::ImplLoadRes( const ResId& rResId ) { Edit::ImplLoadRes( rResId ); - sal_uIntPtr nNumber = ReadLongRes(); + sal_uLong nNumber = ReadLongRes(); if( nNumber ) { @@ -491,7 +491,7 @@ IMPL_LINK( ComboBox, ImplSelectionChangedHdl, void*, n ) { if ( !mpImplLB->IsTrackingSelect() ) { - sal_uInt16 nChanged = (sal_uInt16)(sal_uIntPtr)n; + sal_uInt16 nChanged = (sal_uInt16)(sal_uLong)n; if ( !mpSubEdit->IsReadOnly() && mpImplLB->GetEntryList()->IsEntryPosSelected( nChanged ) ) mpSubEdit->SetText( mpImplLB->GetEntryList()->GetEntryText( nChanged ) ); } @@ -1210,7 +1210,7 @@ void ComboBox::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines // ----------------------------------------------------------------------- -void ComboBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ) +void ComboBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { mpImplLB->GetMainWindow()->ImplInitSettings( sal_True, sal_True, sal_True ); diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index 1386cda5f949..6bbe5bb32c38 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -374,7 +374,7 @@ void Control::AppendLayoutData( const Control& rSubControl ) const // ----------------------------------------------------------------- -sal_Bool Control::ImplCallEventListenersAndHandler( sal_uIntPtr nEvent, const Link& rHandler, void* pCaller ) +sal_Bool Control::ImplCallEventListenersAndHandler( sal_uLong nEvent, const Link& rHandler, void* pCaller ) { ImplDelData aCheckDelete; ImplAddDel( &aCheckDelete ); @@ -449,8 +449,8 @@ void Control::DataChanged( const DataChangedEvent& rDCEvt) { AllSettings aSettings = GetSettings(); StyleSettings aStyleSettings = aSettings.GetStyleSettings(); - sal_uIntPtr nOldOptions = rDCEvt.GetOldSettings()->GetStyleSettings().GetOptions(); - sal_uIntPtr nNewOptions = aStyleSettings.GetOptions(); + sal_uLong nOldOptions = rDCEvt.GetOldSettings()->GetStyleSettings().GetOptions(); + sal_uLong nNewOptions = aStyleSettings.GetOptions(); if ( !(nNewOptions & STYLE_OPTION_MONO) && ( nOldOptions & STYLE_OPTION_MONO ) ) { diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index e42dce4880cc..f166a3c1f535 100755 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -1899,7 +1899,7 @@ void Edit::Resize() // ----------------------------------------------------------------------- -void Edit::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ) +void Edit::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { ImplInitSettings( sal_True, sal_True, sal_True ); @@ -2009,7 +2009,7 @@ void Edit::GetFocus() { maUndoText = maText; - sal_uIntPtr nSelOptions = GetSettings().GetStyleSettings().GetSelectionOptions(); + sal_uLong nSelOptions = GetSettings().GetStyleSettings().GetSelectionOptions(); if ( !( GetStyle() & (WB_NOHIDESELECTION|WB_READONLY) ) && ( GetGetFocusFlags() & (GETFOCUS_INIT|GETFOCUS_TAB|GETFOCUS_CURSOR|GETFOCUS_MNEMONIC) ) ) { @@ -2535,7 +2535,7 @@ IMPL_LINK( Edit, ImplUpdateDataHdl, Timer*, EMPTYARG ) // ----------------------------------------------------------------------- -void Edit::EnableUpdateData( sal_uIntPtr nTimeout ) +void Edit::EnableUpdateData( sal_uLong nTimeout ) { if ( !nTimeout ) DisableUpdateData(); diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index b45ea4bdc7af..4a42abd3ea79 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -507,7 +507,7 @@ void NumericFormatter::ImplLoadRes( const ResId& rResId ) if( pMgr ) { - sal_uIntPtr nMask = pMgr->ReadLong(); + sal_uLong nMask = pMgr->ReadLong(); if ( NUMERICFORMATTER_MIN & nMask ) mnMin = pMgr->ReadLong(); @@ -834,7 +834,7 @@ void NumericField::ImplLoadRes( const ResId& rResId ) SpinField::ImplLoadRes( rResId ); NumericFormatter::ImplLoadRes( ResId( (RSHEADER_TYPE *)GetClassRes(), *rResId.GetResMgr() ) ); - sal_uIntPtr nMask = ReadLongRes(); + sal_uLong nMask = ReadLongRes(); if ( NUMERICFIELD_FIRST & nMask ) mnFirst = ReadLongRes(); @@ -1521,7 +1521,7 @@ void MetricFormatter::ImplLoadRes( const ResId& rResId ) ResMgr* pMgr = rResId.GetResMgr(); if( pMgr ) { - sal_uIntPtr nMask = pMgr->ReadLong(); + sal_uLong nMask = pMgr->ReadLong(); if ( METRICFORMATTER_UNIT & nMask ) meUnit = (FieldUnit)pMgr->ReadLong(); @@ -1752,7 +1752,7 @@ void MetricField::ImplLoadRes( const ResId& rResId ) SpinField::ImplLoadRes( rResId ); MetricFormatter::ImplLoadRes( ResId( (RSHEADER_TYPE *)GetClassRes(), *rResId.GetResMgr() ) ); - sal_uIntPtr nMask = ReadLongRes(); + sal_uLong nMask = ReadLongRes(); if ( METRICFIELD_FIRST & nMask ) mnFirst = ReadLongRes(); @@ -2257,7 +2257,7 @@ void CurrencyField::ImplLoadRes( const ResId& rResId ) SpinField::ImplLoadRes( rResId ); CurrencyFormatter::ImplLoadRes( ResId( (RSHEADER_TYPE *)GetClassRes(), *rResId.GetResMgr() ) ); - sal_uIntPtr nMask = ReadLongRes(); + sal_uLong nMask = ReadLongRes(); if ( CURRENCYFIELD_FIRST & nMask ) mnFirst = ReadLongRes(); diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 5e1562a19a10..4b14a5a4b199 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -95,7 +95,7 @@ static sal_Unicode* ImplAddString( sal_Unicode* pBuf, const String& rStr ) // ----------------------------------------------------------------------- -static sal_Unicode* ImplAddNum( sal_Unicode* pBuf, sal_uIntPtr nNumber, int nMinLen ) +static sal_Unicode* ImplAddNum( sal_Unicode* pBuf, sal_uLong nNumber, int nMinLen ) { // fill temp buffer with digits sal_Unicode aTempBuf[30]; @@ -424,7 +424,7 @@ static void ImplPatternProcessStrictModify( Edit* pEdit, // Selection so anpassen, das diese wenn sie vorher am Ende // stand, immer noch am Ende steht Selection aSel = pEdit->GetSelection(); - sal_uIntPtr nMaxSel = Max( aSel.Min(), aSel.Max() ); + sal_uLong nMaxSel = Max( aSel.Min(), aSel.Max() ); if ( nMaxSel >= aText.Len() ) { xub_StrLen nMaxPos = aNewText.Len(); @@ -838,7 +838,7 @@ void PatternFormatter::ImplLoadRes( const ResId& rResId ) ResMgr* pMgr = rResId.GetResMgr(); if( pMgr ) { - sal_uIntPtr nMask = pMgr->ReadLong(); + sal_uLong nMask = pMgr->ReadLong(); if ( PATTERNFORMATTER_STRICTFORMAT & nMask ) SetStrictFormat( (sal_Bool)pMgr->ReadShort() ); @@ -1441,7 +1441,7 @@ XubString DateFormatter::ImplGetDateAsText( const Date& rDate, } } - return String( aBuf, (xub_StrLen)(sal_uIntPtr)(pBuf-aBuf) ); + return String( aBuf, (xub_StrLen)(sal_uLong)(pBuf-aBuf) ); } // ----------------------------------------------------------------------- @@ -1649,7 +1649,7 @@ void DateFormatter::ImplLoadRes( const ResId& rResId ) ResMgr* pMgr = rResId.GetResMgr(); if( pMgr ) { - sal_uIntPtr nMask = pMgr->ReadLong(); + sal_uLong nMask = pMgr->ReadLong(); if ( DATEFORMATTER_MIN & nMask ) { @@ -2092,7 +2092,7 @@ void DateField::ImplLoadRes( const ResId& rResId ) { DateFormatter::ImplLoadRes( ResId( (RSHEADER_TYPE *)GetClassRes(), *pMgr ) ); - sal_uIntPtr nMask = ReadLongRes(); + sal_uLong nMask = ReadLongRes(); if ( DATEFIELD_FIRST & nMask ) { maFirst = Date( ResId( (RSHEADER_TYPE *)GetClassRes(), *pMgr ) ); @@ -2683,7 +2683,7 @@ sal_Bool TimeFormatter::ImplTimeReformat( const XubString& rStr, XubString& rOut if ( meFormat == TIMEF_SEC_CS ) { - sal_uIntPtr n = aTempTime.GetHour() * 3600L; + sal_uLong n = aTempTime.GetHour() * 3600L; n += aTempTime.GetMin() * 60L; n += aTempTime.GetSec(); rOutStr = String::CreateFromInt32( n ); @@ -2818,7 +2818,7 @@ void TimeFormatter::ImplLoadRes( const ResId& rResId ) ResMgr* pMgr = rResId.GetResMgr(); if( pMgr ) { - sal_uIntPtr nMask = pMgr->ReadLong(); + sal_uLong nMask = pMgr->ReadLong(); if ( TIMEFORMATTER_MIN & nMask ) { @@ -2977,7 +2977,7 @@ void TimeFormatter::ImplSetUserTime( const Time& rNewTime, Selection* pNewSelect b100Sec = sal_True; if ( meFormat == TIMEF_SEC_CS ) { - sal_uIntPtr n = aNewTime.GetHour() * 3600L; + sal_uLong n = aNewTime.GetHour() * 3600L; n += aNewTime.GetMin() * 60L; n += aNewTime.GetSec(); aStr = String::CreateFromInt32( n ); @@ -3141,7 +3141,7 @@ void TimeField::ImplLoadRes( const ResId& rResId ) { TimeFormatter::ImplLoadRes( ResId( (RSHEADER_TYPE *)GetClassRes(), *pMgr ) ); - sal_uIntPtr nMask = ReadLongRes(); + sal_uLong nMask = ReadLongRes(); if ( TIMEFIELD_FIRST & nMask ) { diff --git a/vcl/source/control/fixbrd.cxx b/vcl/source/control/fixbrd.cxx index 904a6558d524..cc621e16175d 100644 --- a/vcl/source/control/fixbrd.cxx +++ b/vcl/source/control/fixbrd.cxx @@ -116,7 +116,7 @@ FixedBorder::~FixedBorder() // ----------------------------------------------------------------------- -void FixedBorder::ImplDraw( OutputDevice* pDev, sal_uIntPtr nDrawFlags, +void FixedBorder::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -159,7 +159,7 @@ void FixedBorder::Paint( const Rectangle& ) // ----------------------------------------------------------------------- void FixedBorder::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, - sal_uIntPtr nFlags ) + sal_uLong nFlags ) { Point aPos = pDev->LogicToPixel( rPos ); Size aSize = pDev->LogicToPixel( rSize ); diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 2db2ef005203..db92cd0b09af 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -223,7 +223,7 @@ sal_uInt16 FixedText::ImplGetTextStyle( WinBits nWinStyle ) // ----------------------------------------------------------------------- -void FixedText::ImplDraw( OutputDevice* pDev, sal_uIntPtr nDrawFlags, +void FixedText::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize, bool bFillLayout ) const @@ -279,7 +279,7 @@ void FixedText::Paint( const Rectangle& ) // ----------------------------------------------------------------------- void FixedText::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, - sal_uIntPtr nFlags ) + sal_uLong nFlags ) { ImplInitSettings( sal_True, sal_True, sal_True ); @@ -609,7 +609,7 @@ void FixedLine::Paint( const Rectangle& ) // ----------------------------------------------------------------------- -void FixedLine::Draw( OutputDevice*, const Point&, const Size&, sal_uIntPtr ) +void FixedLine::Draw( OutputDevice*, const Point&, const Size&, sal_uLong ) { } @@ -737,7 +737,7 @@ void FixedBitmap::ImplLoadRes( const ResId& rResId ) { Control::ImplLoadRes( rResId ); - sal_uIntPtr nObjMask = ReadLongRes(); + sal_uLong nObjMask = ReadLongRes(); if ( RSC_FIXEDBITMAP_BITMAP & nObjMask ) { @@ -776,7 +776,7 @@ FixedBitmap::~FixedBitmap() // ----------------------------------------------------------------------- -void FixedBitmap::ImplDraw( OutputDevice* pDev, sal_uIntPtr /* nDrawFlags */, +void FixedBitmap::ImplDraw( OutputDevice* pDev, sal_uLong /* nDrawFlags */, const Point& rPos, const Size& rSize ) { sal_uInt16 nStyle = 0; @@ -829,7 +829,7 @@ void FixedBitmap::Paint( const Rectangle& ) // ----------------------------------------------------------------------- void FixedBitmap::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, - sal_uIntPtr nFlags ) + sal_uLong nFlags ) { Point aPos = pDev->LogicToPixel( rPos ); Size aSize = pDev->LogicToPixel( rSize ); @@ -982,7 +982,7 @@ void FixedImage::ImplLoadRes( const ResId& rResId ) { Control::ImplLoadRes( rResId ); - sal_uIntPtr nObjMask = ReadLongRes(); + sal_uLong nObjMask = ReadLongRes(); if ( RSC_FIXEDIMAGE_IMAGE & nObjMask ) { @@ -1021,7 +1021,7 @@ FixedImage::~FixedImage() // ----------------------------------------------------------------------- -void FixedImage::ImplDraw( OutputDevice* pDev, sal_uIntPtr nDrawFlags, +void FixedImage::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize ) { sal_uInt16 nStyle = 0; @@ -1081,7 +1081,7 @@ void FixedImage::UserDraw( const UserDrawEvent& ) // ----------------------------------------------------------------------- void FixedImage::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, - sal_uIntPtr nFlags ) + sal_uLong nFlags ) { Point aPos = pDev->LogicToPixel( rPos ); Size aSize = pDev->LogicToPixel( rSize ); diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx index 084dbf96f7f7..5b09bf6bb3b5 100644 --- a/vcl/source/control/group.cxx +++ b/vcl/source/control/group.cxx @@ -133,7 +133,7 @@ GroupBox::GroupBox( Window* pParent, const ResId& rResId ) : // ----------------------------------------------------------------------- -void GroupBox::ImplDraw( OutputDevice* pDev, sal_uIntPtr nDrawFlags, +void GroupBox::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize, bool bLayout ) { long nTop; @@ -241,7 +241,7 @@ void GroupBox::Paint( const Rectangle& ) // ----------------------------------------------------------------------- void GroupBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, - sal_uIntPtr nFlags ) + sal_uLong nFlags ) { Point aPos = pDev->LogicToPixel( rPos ); Size aSize = pDev->LogicToPixel( rSize ); diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index bf4bd72efe98..670d6dad0ada 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -177,7 +177,7 @@ sal_uInt16 ImplEntryList::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry uno::Reference< i18n::XCollator > xCollator = ImplGetCollator(aLocale); const XubString& rStr = pNewEntry->maStr; - sal_uIntPtr nLow, nHigh, nMid; + sal_uLong nLow, nHigh, nMid; nHigh = Count(); @@ -204,7 +204,7 @@ sal_uInt16 ImplEntryList::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry eComp = (StringCompare)xCollator->compareString (rStr, pTemp->maStr); if ( eComp != COMPARE_GREATER ) { - Insert( pNewEntry, (sal_uIntPtr)0 ); + Insert( pNewEntry, (sal_uLong)0 ); } else { @@ -242,7 +242,7 @@ sal_uInt16 ImplEntryList::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry // garbage you wouldn't insert it. If the exception occured because the // Collator implementation is garbage then give the user a chance to see // his stuff - Insert( pNewEntry, (sal_uIntPtr)0 ); + Insert( pNewEntry, (sal_uLong)0 ); } } diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index f53fa08cd4ec..aae78baa3fb7 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -353,7 +353,7 @@ void LongCurrencyFormatter::ImplLoadRes( const ResId& rResId ) ResMgr* pMgr = rResId.GetResMgr(); if( pMgr ) { - sal_uIntPtr nMask = pMgr->ReadLong(); + sal_uLong nMask = pMgr->ReadLong(); if ( NUMERICFORMATTER_MIN & nMask ) mnMin = pMgr->ReadLong(); @@ -635,7 +635,7 @@ void LongCurrencyField::ImplLoadRes( const ResId& rResId ) SpinField::ImplLoadRes( rResId ); LongCurrencyFormatter::ImplLoadRes( ResId( (RSHEADER_TYPE *)GetClassRes(), *rResId.GetResMgr() ) ); - sal_uIntPtr nMask = ReadLongRes(); + sal_uLong nMask = ReadLongRes(); if ( CURRENCYFIELD_FIRST & nMask ) mnFirst = ReadLongRes(); diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index 1c13aef10340..594b76684a1a 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -276,7 +276,7 @@ IMPL_LINK( ListBox, ImplSelectionChangedHdl, void*, n ) { if ( !mpImplLB->IsTrackingSelect() ) { - sal_uInt16 nChanged = (sal_uInt16)(sal_uIntPtr)n; + sal_uInt16 nChanged = (sal_uInt16)(sal_uLong)n; const ImplEntryList* pEntryList = mpImplLB->GetEntryList(); if ( pEntryList->IsEntryPosSelected( nChanged ) ) { @@ -382,7 +382,7 @@ void ListBox::ToggleDropDown() // ----------------------------------------------------------------------- -void ListBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ) +void ListBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { mpImplLB->GetMainWindow()->ImplInitSettings( sal_True, sal_True, sal_True ); diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index ce6d09e3d74e..a1d724619879 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -129,7 +129,7 @@ void MenuButton::ImplLoadRes( const ResId& rResId ) { Control::ImplLoadRes( rResId ); - sal_uIntPtr nObjMask = ReadLongRes(); + sal_uLong nObjMask = ReadLongRes(); if ( RSCMENUBUTTON_MENU & nObjMask ) { diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx index 341de3f5b7ad..f03136394512 100644 --- a/vcl/source/control/morebtn.cxx +++ b/vcl/source/control/morebtn.cxx @@ -119,7 +119,7 @@ void MoreButton::ImplLoadRes( const ResId& rResId ) { PushButton::ImplLoadRes( rResId ); - sal_uIntPtr nObjMask = ReadLongRes(); + sal_uLong nObjMask = ReadLongRes(); if ( nObjMask & RSC_MOREBUTTON_STATE ) { diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index 5ad387190645..8b93f29f3b8b 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -476,7 +476,7 @@ void ScrollBar::ImplCalc( sal_Bool bUpdate ) // ----------------------------------------------------------------------- -void ScrollBar::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ) +void ScrollBar::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { Point aPos = pDev->LogicToPixel( rPos ); Size aSize = pDev->LogicToPixel( rSize ); diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx index 5426412cf7f6..52b3fdca9730 100644 --- a/vcl/source/control/spinbtn.cxx +++ b/vcl/source/control/spinbtn.cxx @@ -163,7 +163,7 @@ void SpinButton::Resize() // ----------------------------------------------------------------------- -void SpinButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ) +void SpinButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { Point aPos = pDev->LogicToPixel( rPos ); Size aSize = pDev->LogicToPixel( rSize ); diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 36003061f513..d7501a6f99b6 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -1030,7 +1030,7 @@ IMPL_LINK( SpinField, ImplTimeout, Timer*, pTimer ) // ----------------------------------------------------------------------- -void SpinField::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ) +void SpinField::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { Edit::Draw( pDev, rPos, rSize, nFlags ); diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 858726778880..e94ecaf8ffe7 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -270,14 +270,14 @@ void TabControl::ImplLoadRes( const ResId& rResId ) { Control::ImplLoadRes( rResId ); - sal_uIntPtr nObjMask = ReadLongRes(); + sal_uLong nObjMask = ReadLongRes(); if ( nObjMask & RSC_TABCONTROL_ITEMLIST ) { - sal_uIntPtr nEle = ReadLongRes(); + sal_uLong nEle = ReadLongRes(); // Item hinzufuegen - for( sal_uIntPtr i = 0; i < nEle; i++ ) + for( sal_uLong i = 0; i < nEle; i++ ) { InsertPage( ResId( (RSHEADER_TYPE *)GetClassRes(), *rResId.GetResMgr() ) ); IncrementRes( GetObjSizeRes( (RSHEADER_TYPE *)GetClassRes() ) ); @@ -1755,7 +1755,7 @@ void TabControl::InsertPage( const ResId& rResId, sal_uInt16 nPos ) { GetRes( rResId.SetRT( RSC_TABCONTROLITEM ) ); - sal_uIntPtr nObjMask = ReadLongRes(); + sal_uLong nObjMask = ReadLongRes(); sal_uInt16 nItemId = 1; // ID @@ -1828,7 +1828,7 @@ void TabControl::InsertPage( sal_uInt16 nPageId, const XubString& rText, if( mpTabCtrlData->mpListBox ) // reposition/resize listbox Resize(); - ImplCallEventListeners( VCLEVENT_TABPAGE_INSERTED, (void*) (sal_uIntPtr)nPageId ); + ImplCallEventListeners( VCLEVENT_TABPAGE_INSERTED, (void*) (sal_uLong)nPageId ); } // ----------------------------------------------------------------------- @@ -1875,7 +1875,7 @@ void TabControl::RemovePage( sal_uInt16 nPageId ) ImplFreeLayoutData(); - ImplCallEventListeners( VCLEVENT_TABPAGE_REMOVED, (void*) (sal_uIntPtr) nPageId ); + ImplCallEventListeners( VCLEVENT_TABPAGE_REMOVED, (void*) (sal_uLong) nPageId ); } } @@ -2026,7 +2026,7 @@ void TabControl::SelectTabPage( sal_uInt16 nPageId ) { ImplFreeLayoutData(); - ImplCallEventListeners( VCLEVENT_TABPAGE_DEACTIVATE, (void*) (sal_uIntPtr) mnCurPageId ); + ImplCallEventListeners( VCLEVENT_TABPAGE_DEACTIVATE, (void*) (sal_uLong) mnCurPageId ); if ( DeactivatePage() ) { mnActPageId = nPageId; @@ -2037,7 +2037,7 @@ void TabControl::SelectTabPage( sal_uInt16 nPageId ) SetCurPageId( nPageId ); if( mpTabCtrlData->mpListBox ) mpTabCtrlData->mpListBox->SelectEntryPos( GetPagePos( nPageId ) ); - ImplCallEventListeners( VCLEVENT_TABPAGE_ACTIVATE, (void*) (sal_uIntPtr) nPageId ); + ImplCallEventListeners( VCLEVENT_TABPAGE_ACTIVATE, (void*) (sal_uLong) nPageId ); } } } @@ -2110,7 +2110,7 @@ void TabControl::SetPageText( sal_uInt16 nPageId, const XubString& rText ) if ( IsUpdateMode() ) Invalidate(); ImplFreeLayoutData(); - ImplCallEventListeners( VCLEVENT_TABPAGE_PAGETEXTCHANGED, (void*) (sal_uIntPtr) nPageId ); + ImplCallEventListeners( VCLEVENT_TABPAGE_PAGETEXTCHANGED, (void*) (sal_uLong) nPageId ); } } diff --git a/vcl/source/fontsubset/gsub.cxx b/vcl/source/fontsubset/gsub.cxx index 4b18af165f74..403e64768872 100644 --- a/vcl/source/fontsubset/gsub.cxx +++ b/vcl/source/fontsubset/gsub.cxx @@ -41,9 +41,7 @@ namespace vcl { -typedef sal_uInt32 sal_uIntPtr; -typedef sal_uInt32 sal_uInt32; -typedef sal_uInt16 sal_uInt16; +typedef sal_uIntPtr sal_uLong; typedef sal_uInt8 FT_Byte; typedef std::map<sal_uInt16,sal_uInt16> GlyphSubstitution; @@ -77,7 +75,7 @@ int ReadGSUB( struct _TrueTypeFont* pTTFile, // parse GSUB header const FT_Byte* pGsubHeader = pGsubBase; - const sal_uIntPtr nVersion = NEXT_Long( pGsubHeader ); + const sal_uLong nVersion = NEXT_Long( pGsubHeader ); const sal_uInt16 nOfsScriptList = NEXT_UShort( pGsubHeader ); const sal_uInt16 nOfsFeatureTable = NEXT_UShort( pGsubHeader ); const sal_uInt16 nOfsLookupList = NEXT_UShort( pGsubHeader ); @@ -87,7 +85,7 @@ int ReadGSUB( struct _TrueTypeFont* pTTFile, if( nVersion != 0x00001000 ) // workaround for SunBatang etc. return -1; // unknown format or broken - typedef std::vector<sal_uIntPtr> ReqFeatureTagList; + typedef std::vector<sal_uLong> ReqFeatureTagList; ReqFeatureTagList aReqFeatureTagList; aReqFeatureTagList.push_back( MKTAG("vert") ); @@ -103,7 +101,7 @@ int ReadGSUB( struct _TrueTypeFont* pTTFile, return false; for( sal_uInt16 nScriptIndex = 0; nScriptIndex < nCntScript; ++nScriptIndex ) { - const sal_uIntPtr nTag = NEXT_Long( pScriptHeader ); // e.g. hani/arab/kana/hang + const sal_uLong nTag = NEXT_Long( pScriptHeader ); // e.g. hani/arab/kana/hang const sal_uInt16 nOfsScriptTable= NEXT_UShort( pScriptHeader ); if( (nTag != (sal_uInt16)nRequestedScript) && (nRequestedScript != 0) ) continue; @@ -118,7 +116,7 @@ int ReadGSUB( struct _TrueTypeFont* pTTFile, return false; for( sal_uInt16 nLangsysIndex = 0; nLangsysIndex < nCntLangSystem; ++nLangsysIndex ) { - const sal_uIntPtr nInnerTag = NEXT_Long( pScriptTable ); // e.g. KOR/ZHS/ZHT/JAN + const sal_uLong nInnerTag = NEXT_Long( pScriptTable ); // e.g. KOR/ZHS/ZHT/JAN const sal_uInt16 nOffset= NEXT_UShort( pScriptTable ); if( (nInnerTag != (sal_uInt16)nRequestedLangsys) && (nRequestedLangsys != 0) ) continue; @@ -178,7 +176,7 @@ int ReadGSUB( struct _TrueTypeFont* pTTFile, return false; for( sal_uInt16 nFeatureIndex = 0; nFeatureIndex < nCntFeature; ++nFeatureIndex ) { - const sal_uIntPtr nTag = NEXT_Long( pFeatureHeader ); // e.g. locl/vert/trad/smpl/liga/fina/... + const sal_uLong nTag = NEXT_Long( pFeatureHeader ); // e.g. locl/vert/trad/smpl/liga/fina/... const sal_uInt16 nOffset= NEXT_UShort( pFeatureHeader ); // ignore unneeded feature lookups diff --git a/vcl/source/gdi/alpha.cxx b/vcl/source/gdi/alpha.cxx index d1feee2b1443..21c3f15f51c0 100644 --- a/vcl/source/gdi/alpha.cxx +++ b/vcl/source/gdi/alpha.cxx @@ -114,7 +114,7 @@ sal_Bool AlphaMask::Crop( const Rectangle& rRectPixel ) // ----------------------------------------------------------------------------- -sal_Bool AlphaMask::Expand( sal_uIntPtr nDX, sal_uIntPtr nDY, sal_uInt8* pInitTransparency ) +sal_Bool AlphaMask::Expand( sal_uLong nDX, sal_uLong nDY, sal_uInt8* pInitTransparency ) { Color aColor; @@ -279,14 +279,14 @@ sal_Bool AlphaMask::Invert() // ----------------------------------------------------------------------------- -sal_Bool AlphaMask::Mirror( sal_uIntPtr nMirrorFlags ) +sal_Bool AlphaMask::Mirror( sal_uLong nMirrorFlags ) { return Bitmap::Mirror( nMirrorFlags ); } // ----------------------------------------------------------------------------- -sal_Bool AlphaMask::Scale( const Size& rNewSize, sal_uIntPtr nScaleFlag ) +sal_Bool AlphaMask::Scale( const Size& rNewSize, sal_uLong nScaleFlag ) { sal_Bool bRet = Bitmap::Scale( rNewSize, nScaleFlag ); @@ -298,7 +298,7 @@ sal_Bool AlphaMask::Scale( const Size& rNewSize, sal_uIntPtr nScaleFlag ) // ----------------------------------------------------------------------------- -sal_Bool AlphaMask::Scale( const double& rScaleX, const double& rScaleY, sal_uIntPtr nScaleFlag ) +sal_Bool AlphaMask::Scale( const double& rScaleX, const double& rScaleY, sal_uLong nScaleFlag ) { sal_Bool bRet = Bitmap::Scale( rScaleX, rScaleY, nScaleFlag ); @@ -344,7 +344,7 @@ sal_Bool AlphaMask::Replace( const Bitmap& rMask, sal_uInt8 cReplaceTransparency // ----------------------------------------------------------------------------- -sal_Bool AlphaMask::Replace( sal_uInt8 cSearchTransparency, sal_uInt8 cReplaceTransparency, sal_uIntPtr +sal_Bool AlphaMask::Replace( sal_uInt8 cSearchTransparency, sal_uInt8 cReplaceTransparency, sal_uLong #ifdef DBG_UTIL nTol #endif @@ -398,13 +398,13 @@ nTol // ----------------------------------------------------------------------------- sal_Bool AlphaMask::Replace( sal_uInt8* pSearchTransparencies, sal_uInt8* pReplaceTransparencies, - sal_uIntPtr nColorCount, sal_uIntPtr* pTols ) + sal_uLong nColorCount, sal_uLong* pTols ) { Color* pSearchColors = new Color[ nColorCount ]; Color* pReplaceColors = new Color[ nColorCount ]; sal_Bool bRet; - for( sal_uIntPtr i = 0; i < nColorCount; i++ ) + for( sal_uLong i = 0; i < nColorCount; i++ ) { const sal_uInt8 cSearchTransparency = pSearchTransparencies[ i ]; const sal_uInt8 cReplaceTransparency = pReplaceTransparencies[ i ]; diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index e19bc47ed02c..9fc45f2f61d6 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -49,13 +49,13 @@ DBG_NAME( Animation ) // - statics - // ----------- -sal_uIntPtr Animation::mnAnimCount = 0UL; +sal_uLong Animation::mnAnimCount = 0UL; // ------------------- // - AnimationBitmap - // ------------------- -sal_uIntPtr AnimationBitmap::GetChecksum() const +sal_uLong AnimationBitmap::GetChecksum() const { sal_uInt32 nCrc = aBmpEx.GetChecksum(); SVBT32 aBT32; @@ -167,7 +167,7 @@ Animation& Animation::operator=( const Animation& rAnimation ) sal_Bool Animation::operator==( const Animation& rAnimation ) const { - const sal_uIntPtr nCount = maList.Count(); + const sal_uLong nCount = maList.Count(); sal_Bool bRet = sal_False; if( rAnimation.maList.Count() == nCount && @@ -177,7 +177,7 @@ sal_Bool Animation::operator==( const Animation& rAnimation ) const { bRet = sal_True; - for( sal_uIntPtr n = 0; n < nCount; n++ ) + for( sal_uLong n = 0; n < nCount; n++ ) { if( ( *(AnimationBitmap*) maList.GetObject( n ) ) != ( *(AnimationBitmap*) rAnimation.maList.GetObject( n ) ) ) @@ -195,7 +195,7 @@ sal_Bool Animation::operator==( const Animation& rAnimation ) const sal_Bool Animation::IsEqual( const Animation& rAnimation ) const { - const sal_uIntPtr nCount = maList.Count(); + const sal_uLong nCount = maList.Count(); sal_Bool bRet = sal_False; if( rAnimation.maList.Count() == nCount && @@ -203,7 +203,7 @@ sal_Bool Animation::IsEqual( const Animation& rAnimation ) const rAnimation.maGlobalSize == maGlobalSize && rAnimation.meCycleMode == meCycleMode ) { - for( sal_uIntPtr n = 0; ( n < nCount ) && !bRet; n++ ) + for( sal_uLong n = 0; ( n < nCount ) && !bRet; n++ ) if( ( (AnimationBitmap*) maList.GetObject( n ) )->IsEqual( *(AnimationBitmap*) rAnimation.maList.GetObject( n ) ) ) bRet = sal_True; } @@ -274,9 +274,9 @@ sal_Bool Animation::IsTransparent() const // ----------------------------------------------------------------------- -sal_uIntPtr Animation::GetSizeBytes() const +sal_uLong Animation::GetSizeBytes() const { - sal_uIntPtr nSizeBytes = GetBitmapEx().GetSizeBytes(); + sal_uLong nSizeBytes = GetBitmapEx().GetSizeBytes(); for( long i = 0, nCount = maList.Count(); i < nCount; i++ ) { @@ -289,7 +289,7 @@ sal_uIntPtr Animation::GetSizeBytes() const // ----------------------------------------------------------------------- -sal_uIntPtr Animation::GetChecksum() const +sal_uLong Animation::GetChecksum() const { SVBT32 aBT32; sal_uInt32 nCrc = GetBitmapEx().GetChecksum(); @@ -418,7 +418,7 @@ void Animation::Draw( OutputDevice* pOut, const Point& rDestPt ) const void Animation::Draw( OutputDevice* pOut, const Point& rDestPt, const Size& rDestSz ) const { - const sal_uIntPtr nCount = maList.Count(); + const sal_uLong nCount = maList.Count(); if( nCount ) { @@ -430,7 +430,7 @@ void Animation::Draw( OutputDevice* pOut, const Point& rDestPt, const Size& rDes pObj->aBmpEx.Draw( pOut, rDestPt, rDestSz ); else { - const sal_uIntPtr nOldPos = mnPos; + const sal_uLong nOldPos = mnPos; ( (Animation*) this )->mnPos = mbLoopTerminated ? ( nCount - 1UL ) : mnPos; delete new ImplAnimView( (Animation*) this, pOut, rDestPt, rDestSz, 0 ); ( (Animation*) this )->mnPos = nOldPos; @@ -440,9 +440,9 @@ void Animation::Draw( OutputDevice* pOut, const Point& rDestPt, const Size& rDes // ----------------------------------------------------------------------- -void Animation::ImplRestartTimer( sal_uIntPtr nTimeout ) +void Animation::ImplRestartTimer( sal_uLong nTimeout ) { - maTimer.SetTimeout( Max( nTimeout, (sal_uIntPtr)(MIN_TIMEOUT + ( mnAnimCount - 1 ) * INC_TIMEOUT) ) * 10L ); + maTimer.SetTimeout( Max( nTimeout, (sal_uLong)(MIN_TIMEOUT + ( mnAnimCount - 1 ) * INC_TIMEOUT) ) * 10L ); maTimer.Start(); } @@ -450,7 +450,7 @@ void Animation::ImplRestartTimer( sal_uIntPtr nTimeout ) IMPL_LINK( Animation, ImplTimeoutHdl, Timer*, EMPTYARG ) { - const sal_uIntPtr nAnimCount = maList.Count(); + const sal_uLong nAnimCount = maList.Count(); if( nAnimCount ) { @@ -623,7 +623,7 @@ void Animation::Replace( const AnimationBitmap& rNewAnimationBitmap, sal_uInt16 // ----------------------------------------------------------------------- -void Animation::SetLoopCount( const sal_uIntPtr nLoopCount ) +void Animation::SetLoopCount( const sal_uLong nLoopCount ) { mnLoopCount = nLoopCount; ResetLoopCount(); @@ -708,7 +708,7 @@ sal_Bool Animation::Invert() // ----------------------------------------------------------------------- -sal_Bool Animation::Mirror( sal_uIntPtr nMirrorFlags ) +sal_Bool Animation::Mirror( sal_uLong nMirrorFlags ) { DBG_ASSERT( !IsInAnimation(), "Animation modified while it is animated" ); @@ -745,7 +745,7 @@ sal_Bool Animation::Mirror( sal_uIntPtr nMirrorFlags ) // ----------------------------------------------------------------------- -sal_Bool Animation::Dither( sal_uIntPtr nDitherFlags ) +sal_Bool Animation::Dither( sal_uLong nDitherFlags ) { DBG_ASSERT( !IsInAnimation(), "Animation modified while it is animated" ); @@ -871,7 +871,7 @@ SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation ) SvStream& operator>>( SvStream& rIStm, Animation& rAnimation ) { Bitmap aBmp; - sal_uIntPtr nStmPos = rIStm.Tell(); + sal_uLong nStmPos = rIStm.Tell(); sal_uInt32 nAnimMagic1, nAnimMagic2; sal_uInt16 nOldFormat = rIStm.GetNumberFormatInt(); sal_Bool bReadAnimations = sal_False; diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx index c1572fd6d462..5f434f9ba48a 100644 --- a/vcl/source/gdi/bitmap.cxx +++ b/vcl/source/gdi/bitmap.cxx @@ -358,9 +358,9 @@ sal_Bool Bitmap::HasGreyPalette() const // ------------------------------------------------------------------ -sal_uIntPtr Bitmap::GetChecksum() const +sal_uLong Bitmap::GetChecksum() const { - sal_uIntPtr nRet = 0UL; + sal_uLong nRet = 0UL; if( mpImpBmp ) { @@ -534,7 +534,7 @@ sal_Bool Bitmap::Erase( const Color& rFillColor ) if( pWriteAcc ) { - const sal_uIntPtr nFormat = pWriteAcc->GetScanlineFormat(); + const sal_uLong nFormat = pWriteAcc->GetScanlineFormat(); sal_uInt8 cIndex = 0; sal_Bool bFast = sal_False; @@ -586,7 +586,7 @@ sal_Bool Bitmap::Erase( const Color& rFillColor ) if( bFast ) { - const sal_uIntPtr nBufSize = pWriteAcc->GetScanlineSize() * pWriteAcc->Height(); + const sal_uLong nBufSize = pWriteAcc->GetScanlineSize() * pWriteAcc->Height(); memset( pWriteAcc->GetBuffer(), cIndex, nBufSize ); } else @@ -642,7 +642,7 @@ sal_Bool Bitmap::Invert() // ------------------------------------------------------------------ -sal_Bool Bitmap::Mirror( sal_uIntPtr nMirrorFlags ) +sal_Bool Bitmap::Mirror( sal_uLong nMirrorFlags ) { sal_Bool bHorz = ( ( nMirrorFlags & BMP_MIRROR_HORZ ) == BMP_MIRROR_HORZ ); sal_Bool bVert = ( ( nMirrorFlags & BMP_MIRROR_VERT ) == BMP_MIRROR_VERT ); @@ -1121,7 +1121,7 @@ sal_Bool Bitmap::CopyPixel( const Rectangle& rRectDst, // ------------------------------------------------------------------ -sal_Bool Bitmap::Expand( sal_uIntPtr nDX, sal_uIntPtr nDY, const Color* pInitColor ) +sal_Bool Bitmap::Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor ) { sal_Bool bRet = sal_False; @@ -1182,7 +1182,7 @@ sal_Bool Bitmap::Expand( sal_uIntPtr nDX, sal_uIntPtr nDY, const Color* pInitCol // ------------------------------------------------------------------ -Bitmap Bitmap::CreateMask( const Color& rTransColor, sal_uIntPtr nTol ) const +Bitmap Bitmap::CreateMask( const Color& rTransColor, sal_uLong nTol ) const { Bitmap aNewBmp( GetSizePixel(), 1 ); BitmapWriteAccess* pWriteAcc = aNewBmp.AcquireWriteAccess(); @@ -1549,7 +1549,7 @@ sal_Bool Bitmap::Replace( const AlphaMask& rAlpha, const Color& rMergeColor ) // ------------------------------------------------------------------ -sal_Bool Bitmap::Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uIntPtr nTol ) +sal_Bool Bitmap::Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) { // Bitmaps with 1 bit color depth can cause problems // if they have other entries than black/white in their palette @@ -1613,7 +1613,7 @@ sal_Bool Bitmap::Replace( const Color& rSearchColor, const Color& rReplaceColor, // ------------------------------------------------------------------ sal_Bool Bitmap::Replace( const Color* pSearchColors, const Color* pReplaceColors, - sal_uIntPtr nColorCount, sal_uIntPtr* _pTols ) + sal_uLong nColorCount, sal_uLong* _pTols ) { // Bitmaps with 1 bit color depth can cause problems // if they have other entries than black/white in their palette @@ -1632,7 +1632,7 @@ sal_Bool Bitmap::Replace( const Color* pSearchColors, const Color* pReplaceColor long* pMinB = new long[ nColorCount ]; long* pMaxB = new long[ nColorCount ]; long* pTols; - sal_uIntPtr i; + sal_uLong i; if( !_pTols ) { @@ -1748,7 +1748,7 @@ Bitmap Bitmap::GetColorTransformedBitmap( BmpColorMode eColorMode ) const { Color* pSrcColors = NULL; Color* pDstColors = NULL; - sal_uIntPtr nColorCount = 0; + sal_uLong nColorCount = 0; aRet = *this; diff --git a/vcl/source/gdi/bitmap2.cxx b/vcl/source/gdi/bitmap2.cxx index bcf159c4242f..8dffa7d59a2c 100644 --- a/vcl/source/gdi/bitmap2.cxx +++ b/vcl/source/gdi/bitmap2.cxx @@ -102,7 +102,7 @@ namespace ( nInputCount <= 8 ) ? 8 : 24; } - inline bool isBitfieldCompression( sal_uIntPtr nScanlineFormat ) + inline bool isBitfieldCompression( sal_uLong nScanlineFormat ) { return nScanlineFormat == BMP_FORMAT_16BIT_TC_LSB_MASK || nScanlineFormat == BMP_FORMAT_32BIT_TC_MASK; @@ -132,8 +132,8 @@ SvStream& operator<<( SvStream& rOStm, const Bitmap& rBitmap ) sal_Bool Bitmap::Read( SvStream& rIStm, sal_Bool bFileHeader ) { const sal_uInt16 nOldFormat = rIStm.GetNumberFormatInt(); - const sal_uIntPtr nOldPos = rIStm.Tell(); - sal_uIntPtr nOffset = 0UL; + const sal_uLong nOldPos = rIStm.Tell(); + sal_uLong nOffset = 0UL; sal_Bool bRet = sal_False; rIStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); @@ -161,10 +161,10 @@ sal_Bool Bitmap::Read( SvStream& rIStm, sal_Bool bFileHeader ) // ------------------------------------------------------------------ -sal_Bool Bitmap::ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, sal_uIntPtr nOffset ) +sal_Bool Bitmap::ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, sal_uLong nOffset ) { DIBInfoHeader aHeader; - const sal_uIntPtr nStmPos = rIStm.Tell(); + const sal_uLong nStmPos = rIStm.Tell(); sal_Bool bRet = sal_False; sal_Bool bTopDown = sal_False; @@ -198,7 +198,7 @@ sal_Bool Bitmap::ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, sal_uIntPtr nOffset { ZCodec aCodec; sal_uInt32 nCodedSize, nUncodedSize; - sal_uIntPtr nCodedPos; + sal_uLong nCodedPos; // read coding information rIStm >> nCodedSize >> nUncodedSize >> aHeader.nCompression; @@ -264,7 +264,7 @@ sal_Bool Bitmap::ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, sal_uIntPtr nOffset // ------------------------------------------------------------------ -sal_Bool Bitmap::ImplReadDIBFileHeader( SvStream& rIStm, sal_uIntPtr& rOffset ) +sal_Bool Bitmap::ImplReadDIBFileHeader( SvStream& rIStm, sal_uLong& rOffset ) { sal_uInt32 nTmp32; sal_uInt16 nTmp16 = 0; @@ -319,7 +319,7 @@ sal_Bool Bitmap::ImplReadDIBInfoHeader( SvStream& rIStm, DIBInfoHeader& rHeader, // unknown Header if( rHeader.nSize < DIBINFOHEADERSIZE ) { - sal_uIntPtr nUnknownSize = sizeof( rHeader.nSize ); + sal_uLong nUnknownSize = sizeof( rHeader.nSize ); rIStm >> rHeader.nWidth; nUnknownSize += sizeof( rHeader.nWidth ); rIStm >> rHeader.nHeight; nUnknownSize += sizeof( rHeader.nHeight ); @@ -403,7 +403,7 @@ sal_Bool Bitmap::ImplReadDIBInfoHeader( SvStream& rIStm, DIBInfoHeader& rHeader, sal_Bool Bitmap::ImplReadDIBPalette( SvStream& rIStm, BitmapWriteAccess& rAcc, sal_Bool bQuad ) { const sal_uInt16 nColors = rAcc.GetPaletteEntryCount(); - const sal_uIntPtr nPalSize = nColors * ( bQuad ? 4UL : 3UL ); + const sal_uLong nPalSize = nColors * ( bQuad ? 4UL : 3UL ); BitmapColor aPalColor; sal_uInt8* pEntries = new sal_uInt8[ nPalSize ]; @@ -431,7 +431,7 @@ sal_Bool Bitmap::ImplReadDIBPalette( SvStream& rIStm, BitmapWriteAccess& rAcc, s sal_Bool Bitmap::ImplReadDIBBits( SvStream& rIStm, DIBInfoHeader& rHeader, BitmapWriteAccess& rAcc, sal_Bool bTopDown ) { - const sal_uIntPtr nAlignedWidth = AlignedWidth4Bytes( rHeader.nWidth * rHeader.nBitCount ); + const sal_uLong nAlignedWidth = AlignedWidth4Bytes( rHeader.nWidth * rHeader.nBitCount ); sal_uInt32 nRMask = 0; sal_uInt32 nGMask = 0; sal_uInt32 nBMask = 0; @@ -487,7 +487,7 @@ sal_Bool Bitmap::ImplReadDIBBits( SvStream& rIStm, DIBInfoHeader& rHeader, Bitma { if ( !rHeader.nSizeImage ) { - const sal_uIntPtr nOldPos = rIStm.Tell(); + const sal_uLong nOldPos = rIStm.Tell(); rIStm.Seek( STREAM_SEEK_TO_END ); rHeader.nSizeImage = rIStm.Tell() - nOldPos; @@ -657,7 +657,7 @@ sal_Bool Bitmap::Write( SvStream& rOStm, sal_Bool bCompressed, sal_Bool bFileHea { BitmapReadAccess* pAcc = ( (Bitmap*) this)->AcquireReadAccess(); const sal_uInt16 nOldFormat = rOStm.GetNumberFormatInt(); - const sal_uIntPtr nOldPos = rOStm.Tell(); + const sal_uLong nOldPos = rOStm.Tell(); rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); @@ -692,8 +692,8 @@ sal_Bool Bitmap::ImplWriteDIB( SvStream& rOStm, BitmapReadAccess& rAcc, sal_Bool { const MapMode aMapPixel( MAP_PIXEL ); DIBInfoHeader aHeader; - sal_uIntPtr nImageSizePos; - sal_uIntPtr nEndPos; + sal_uLong nImageSizePos; + sal_uLong nEndPos; sal_uInt32 nCompression = 0; sal_Bool bRet = sal_False; @@ -790,7 +790,7 @@ sal_Bool Bitmap::ImplWriteDIB( SvStream& rOStm, BitmapReadAccess& rAcc, sal_Bool { ZCodec aCodec; SvMemoryStream aMemStm( aHeader.nSizeImage + 4096, 65535 ); - sal_uIntPtr nCodedPos = rOStm.Tell(), nLastPos; + sal_uLong nCodedPos = rOStm.Tell(), nLastPos; sal_uInt32 nCodedSize, nUncodedSize; // write uncoded data palette @@ -858,7 +858,7 @@ sal_Bool Bitmap::ImplWriteDIBFileHeader( SvStream& rOStm, BitmapReadAccess& rAcc sal_Bool Bitmap::ImplWriteDIBPalette( SvStream& rOStm, BitmapReadAccess& rAcc ) { const sal_uInt16 nColors = rAcc.GetPaletteEntryCount(); - const sal_uIntPtr nPalSize = nColors * 4UL; + const sal_uLong nPalSize = nColors * 4UL; sal_uInt8* pEntries = new sal_uInt8[ nPalSize ]; sal_uInt8* pTmpEntry = pEntries; BitmapColor aPalColor; @@ -882,7 +882,7 @@ sal_Bool Bitmap::ImplWriteDIBPalette( SvStream& rOStm, BitmapReadAccess& rAcc ) // ------------------------------------------------------------------ sal_Bool Bitmap::ImplWriteDIBBits( SvStream& rOStm, BitmapReadAccess& rAcc, - sal_uIntPtr nCompression, sal_uInt32& rImageSize ) + sal_uLong nCompression, sal_uInt32& rImageSize ) { if( BITFIELDS == nCompression ) { @@ -924,7 +924,7 @@ sal_Bool Bitmap::ImplWriteDIBBits( SvStream& rOStm, BitmapReadAccess& rAcc, // #i59239# discretize bitcount for aligned width to 1,4,8,24 // (other cases are not written below) const sal_uInt16 nBitCount( sal::static_int_cast<sal_uInt16>(rAcc.GetBitCount()) ); - const sal_uIntPtr nAlignedWidth = AlignedWidth4Bytes( rAcc.Width() * + const sal_uLong nAlignedWidth = AlignedWidth4Bytes( rAcc.Width() * discretizeBitcount(nBitCount)); sal_Bool bNative = sal_False; @@ -1062,10 +1062,10 @@ void Bitmap::ImplDecodeRLE( sal_uInt8* pBuffer, DIBInfoHeader& rHeader, { Scanline pRLE = pBuffer; long nY = rHeader.nHeight - 1L; - const sal_uIntPtr nWidth = rAcc.Width(); - sal_uIntPtr nCountByte; - sal_uIntPtr nRunByte; - sal_uIntPtr nX = 0UL; + const sal_uLong nWidth = rAcc.Width(); + sal_uLong nCountByte; + sal_uLong nRunByte; + sal_uLong nX = 0UL; sal_uInt8 cTmp; sal_Bool bEndDecoding = sal_False; @@ -1081,7 +1081,7 @@ void Bitmap::ImplDecodeRLE( sal_uInt8* pBuffer, DIBInfoHeader& rHeader, { nCountByte = nRunByte >> 1; - for( sal_uIntPtr i = 0UL; i < nCountByte; i++ ) + for( sal_uLong i = 0UL; i < nCountByte; i++ ) { cTmp = *pRLE++; @@ -1105,7 +1105,7 @@ void Bitmap::ImplDecodeRLE( sal_uInt8* pBuffer, DIBInfoHeader& rHeader, } else { - for( sal_uIntPtr i = 0UL; i < nRunByte; i++ ) + for( sal_uLong i = 0UL; i < nRunByte; i++ ) { if( nX < nWidth ) rAcc.SetPixel( nY, nX++, *pRLE ); @@ -1138,7 +1138,7 @@ void Bitmap::ImplDecodeRLE( sal_uInt8* pBuffer, DIBInfoHeader& rHeader, { nRunByte = nCountByte >> 1; - for( sal_uIntPtr i = 0UL; i < nRunByte; i++ ) + for( sal_uLong i = 0UL; i < nRunByte; i++ ) { if( nX < nWidth ) rAcc.SetPixel( nY, nX++, cTmp >> 4 ); @@ -1152,7 +1152,7 @@ void Bitmap::ImplDecodeRLE( sal_uInt8* pBuffer, DIBInfoHeader& rHeader, } else { - for( sal_uIntPtr i = 0UL; ( i < nCountByte ) && ( nX < nWidth ); i++ ) + for( sal_uLong i = 0UL; ( i < nCountByte ) && ( nX < nWidth ); i++ ) rAcc.SetPixel( nY, nX++, cTmp ); } } @@ -1164,12 +1164,12 @@ void Bitmap::ImplDecodeRLE( sal_uInt8* pBuffer, DIBInfoHeader& rHeader, sal_Bool Bitmap::ImplWriteRLE( SvStream& rOStm, BitmapReadAccess& rAcc, sal_Bool bRLE4 ) { - const sal_uIntPtr nWidth = rAcc.Width(); - const sal_uIntPtr nHeight = rAcc.Height(); - sal_uIntPtr nX; - sal_uIntPtr nSaveIndex; - sal_uIntPtr nCount; - sal_uIntPtr nBufCount; + const sal_uLong nWidth = rAcc.Width(); + const sal_uLong nHeight = rAcc.Height(); + sal_uLong nX; + sal_uLong nSaveIndex; + sal_uLong nCount; + sal_uLong nBufCount; sal_uInt8* pBuf = new sal_uInt8[ ( nWidth << 1 ) + 2 ]; sal_uInt8* pTmp; sal_uInt8 cPix; @@ -1221,7 +1221,7 @@ sal_Bool Bitmap::ImplWriteRLE( SvStream& rOStm, BitmapReadAccess& rAcc, sal_Bool if( bRLE4 ) { - for ( sal_uIntPtr i = 0; i < nCount; i++, pTmp++ ) + for ( sal_uLong i = 0; i < nCount; i++, pTmp++ ) { *pTmp = (sal_uInt8) rAcc.GetPixel( nY, nSaveIndex++ ) << 4; @@ -1233,7 +1233,7 @@ sal_Bool Bitmap::ImplWriteRLE( SvStream& rOStm, BitmapReadAccess& rAcc, sal_Bool } else { - for( sal_uIntPtr i = 0UL; i < nCount; i++ ) + for( sal_uLong i = 0UL; i < nCount; i++ ) *pTmp++ = rAcc.GetPixel( nY, nSaveIndex++ ); } diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index 01ec9ae85126..4905646d3563 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -40,7 +40,7 @@ // - Defines - // ----------- -#define RGB15( _def_cR, _def_cG, _def_cB ) (((sal_uIntPtr)(_def_cR)<<10UL)|((sal_uIntPtr)(_def_cG)<<5UL)|(sal_uIntPtr)(_def_cB)) +#define RGB15( _def_cR, _def_cG, _def_cB ) (((sal_uLong)(_def_cR)<<10UL)|((sal_uLong)(_def_cG)<<5UL)|(sal_uLong)(_def_cB)) #define GAMMA( _def_cVal, _def_InvGamma ) ((sal_uInt8)MinMax(FRound(pow( _def_cVal/255.0,_def_InvGamma)*255.0),0L,255L)) #define CALC_ERRORS \ @@ -76,13 +76,13 @@ // - Statics - // ----------- -sal_uIntPtr nVCLRLut[ 6 ] = { 16, 17, 18, 19, 20, 21 }; -sal_uIntPtr nVCLGLut[ 6 ] = { 0, 6, 12, 18, 24, 30 }; -sal_uIntPtr nVCLBLut[ 6 ] = { 0, 36, 72, 108, 144, 180 }; +sal_uLong nVCLRLut[ 6 ] = { 16, 17, 18, 19, 20, 21 }; +sal_uLong nVCLGLut[ 6 ] = { 0, 6, 12, 18, 24, 30 }; +sal_uLong nVCLBLut[ 6 ] = { 0, 36, 72, 108, 144, 180 }; // ------------------------------------------------------------------------ -sal_uIntPtr nVCLDitherLut[ 256 ] = +sal_uLong nVCLDitherLut[ 256 ] = { 0, 49152, 12288, 61440, 3072, 52224, 15360, 64512, 768, 49920, 13056, 62208, 3840, 52992, 16128, 65280, 32768, 16384, 45056, 28672, 35840, 19456, @@ -112,7 +112,7 @@ sal_uIntPtr nVCLDitherLut[ 256 ] = // ------------------------------------------------------------------------ -sal_uIntPtr nVCLLut[ 256 ] = +sal_uLong nVCLLut[ 256 ] = { 0, 1286, 2572, 3858, 5144, 6430, 7716, 9002, 10288, 11574, 12860, 14146, 15432, 16718, 18004, 19290, @@ -521,7 +521,7 @@ sal_Bool Bitmap::ImplMakeGreyscales( sal_uInt16 nGreys ) if( pReadAcc ) { const BitmapPalette& rPal = GetGreyPalette( nGreys ); - sal_uIntPtr nShift = ( ( nGreys == 16 ) ? 4UL : 0UL ); + sal_uLong nShift = ( ( nGreys == 16 ) ? 4UL : 0UL ); sal_Bool bPalDiffers = !pReadAcc->HasPalette() || ( rPal.GetEntryCount() != pReadAcc->GetPaletteEntryCount() ); if( !bPalDiffers ) @@ -561,9 +561,9 @@ sal_Bool Bitmap::ImplMakeGreyscales( sal_uInt16 nGreys ) for( long nX = 0L; nX < nWidth; nX++ ) { - const sal_uIntPtr nB = *pReadScan++; - const sal_uIntPtr nG = *pReadScan++; - const sal_uIntPtr nR = *pReadScan++; + const sal_uLong nB = *pReadScan++; + const sal_uLong nG = *pReadScan++; + const sal_uLong nR = *pReadScan++; *pWriteScan++ = (sal_uInt8) ( ( nB * 28UL + nG * 151UL + nR * 77UL ) >> nShift ); } @@ -581,9 +581,9 @@ sal_Bool Bitmap::ImplMakeGreyscales( sal_uInt16 nGreys ) for( long nX = 0L; nX < nWidth; nX++ ) { - const sal_uIntPtr nR = *pReadScan++; - const sal_uIntPtr nG = *pReadScan++; - const sal_uIntPtr nB = *pReadScan++; + const sal_uLong nR = *pReadScan++; + const sal_uLong nG = *pReadScan++; + const sal_uLong nB = *pReadScan++; *pWriteScan++ = (sal_uInt8) ( ( nB * 28UL + nG * 151UL + nR * 77UL ) >> nShift ); } @@ -903,7 +903,7 @@ sal_Bool Bitmap::ImplConvertGhosted() // ------------------------------------------------------------------------ -sal_Bool Bitmap::Scale( const double& rScaleX, const double& rScaleY, sal_uIntPtr nScaleFlag ) +sal_Bool Bitmap::Scale( const double& rScaleX, const double& rScaleY, sal_uLong nScaleFlag ) { sal_Bool bRet; @@ -924,7 +924,7 @@ sal_Bool Bitmap::Scale( const double& rScaleX, const double& rScaleY, sal_uIntPt // ------------------------------------------------------------------------ -sal_Bool Bitmap::Scale( const Size& rNewSize, sal_uIntPtr nScaleFlag ) +sal_Bool Bitmap::Scale( const Size& rNewSize, sal_uLong nScaleFlag ) { const Size aSize( GetSizePixel() ); sal_Bool bRet; @@ -1247,7 +1247,7 @@ sal_Bool Bitmap::ImplScaleInterpolate( const double& rScaleX, const double& rSca // ------------------------------------------------------------------------ -sal_Bool Bitmap::Dither( sal_uIntPtr nDitherFlags ) +sal_Bool Bitmap::Dither( sal_uLong nDitherFlags ) { sal_Bool bRet = sal_False; @@ -1276,21 +1276,21 @@ sal_Bool Bitmap::ImplDitherMatrix() if( pReadAcc && pWriteAcc ) { - const sal_uIntPtr nWidth = pReadAcc->Width(); - const sal_uIntPtr nHeight = pReadAcc->Height(); + const sal_uLong nWidth = pReadAcc->Width(); + const sal_uLong nHeight = pReadAcc->Height(); BitmapColor aIndex( (sal_uInt8) 0 ); if( pReadAcc->HasPalette() ) { - for( sal_uIntPtr nY = 0UL; nY < nHeight; nY++ ) + for( sal_uLong nY = 0UL; nY < nHeight; nY++ ) { - for( sal_uIntPtr nX = 0UL, nModY = ( nY & 0x0FUL ) << 4UL; nX < nWidth; nX++ ) + for( sal_uLong nX = 0UL, nModY = ( nY & 0x0FUL ) << 4UL; nX < nWidth; nX++ ) { const BitmapColor aCol( pReadAcc->GetPaletteColor( pReadAcc->GetPixel( nY, nX ) ) ); - const sal_uIntPtr nD = nVCLDitherLut[ nModY + ( nX & 0x0FUL ) ]; - const sal_uIntPtr nR = ( nVCLLut[ aCol.GetRed() ] + nD ) >> 16UL; - const sal_uIntPtr nG = ( nVCLLut[ aCol.GetGreen() ] + nD ) >> 16UL; - const sal_uIntPtr nB = ( nVCLLut[ aCol.GetBlue() ] + nD ) >> 16UL; + const sal_uLong nD = nVCLDitherLut[ nModY + ( nX & 0x0FUL ) ]; + const sal_uLong nR = ( nVCLLut[ aCol.GetRed() ] + nD ) >> 16UL; + const sal_uLong nG = ( nVCLLut[ aCol.GetGreen() ] + nD ) >> 16UL; + const sal_uLong nB = ( nVCLLut[ aCol.GetBlue() ] + nD ) >> 16UL; aIndex.SetIndex( (sal_uInt8) ( nVCLRLut[ nR ] + nVCLGLut[ nG ] + nVCLBLut[ nB ] ) ); pWriteAcc->SetPixel( nY, nX, aIndex ); @@ -1299,15 +1299,15 @@ sal_Bool Bitmap::ImplDitherMatrix() } else { - for( sal_uIntPtr nY = 0UL; nY < nHeight; nY++ ) + for( sal_uLong nY = 0UL; nY < nHeight; nY++ ) { - for( sal_uIntPtr nX = 0UL, nModY = ( nY & 0x0FUL ) << 4UL; nX < nWidth; nX++ ) + for( sal_uLong nX = 0UL, nModY = ( nY & 0x0FUL ) << 4UL; nX < nWidth; nX++ ) { const BitmapColor aCol( pReadAcc->GetPixel( nY, nX ) ); - const sal_uIntPtr nD = nVCLDitherLut[ nModY + ( nX & 0x0FUL ) ]; - const sal_uIntPtr nR = ( nVCLLut[ aCol.GetRed() ] + nD ) >> 16UL; - const sal_uIntPtr nG = ( nVCLLut[ aCol.GetGreen() ] + nD ) >> 16UL; - const sal_uIntPtr nB = ( nVCLLut[ aCol.GetBlue() ] + nD ) >> 16UL; + const sal_uLong nD = nVCLDitherLut[ nModY + ( nX & 0x0FUL ) ]; + const sal_uLong nR = ( nVCLLut[ aCol.GetRed() ] + nD ) >> 16UL; + const sal_uLong nG = ( nVCLLut[ aCol.GetGreen() ] + nD ) >> 16UL; + const sal_uLong nB = ( nVCLLut[ aCol.GetBlue() ] + nD ) >> 16UL; aIndex.SetIndex( (sal_uInt8) ( nVCLRLut[ nR ] + nVCLGLut[ nG ] + nVCLBLut[ nB ] ) ); pWriteAcc->SetPixel( nY, nX, aIndex ); @@ -1573,7 +1573,7 @@ sal_Bool Bitmap::ReduceColors( sal_uInt16 nColorCount, BmpReduce eReduce ) { sal_Bool bRet; - if( GetColorCount() <= (sal_uIntPtr) nColorCount ) + if( GetColorCount() <= (sal_uLong) nColorCount ) bRet = sal_True; else if( nColorCount ) { @@ -1851,8 +1851,8 @@ sal_Bool Bitmap::ImplReduceMedian( sal_uInt16 nColCount ) if( pWAcc ) { - const sal_uIntPtr nSize = 32768UL * sizeof( sal_uIntPtr ); - sal_uIntPtr* pColBuf = (sal_uIntPtr*) rtl_allocateMemory( nSize ); + const sal_uLong nSize = 32768UL * sizeof( sal_uLong ); + sal_uLong* pColBuf = (sal_uLong*) rtl_allocateMemory( nSize ); const long nWidth = pWAcc->Width(); const long nHeight = pWAcc->Height(); long nIndex = 0L; @@ -1918,7 +1918,7 @@ sal_Bool Bitmap::ImplReduceMedian( sal_uInt16 nColCount ) // ------------------------------------------------------------------------ -void Bitmap::ImplMedianCut( sal_uIntPtr* pColBuf, BitmapPalette& rPal, +void Bitmap::ImplMedianCut( sal_uLong* pColBuf, BitmapPalette& rPal, long nR1, long nR2, long nG1, long nG2, long nB1, long nB2, long nColors, long nPixels, long& rIndex ) { @@ -1930,7 +1930,7 @@ void Bitmap::ImplMedianCut( sal_uIntPtr* pColBuf, BitmapPalette& rPal, const long nGLen = nG2 - nG1; const long nBLen = nB2 - nB1; long nR, nG, nB; - sal_uIntPtr* pBuf = pColBuf; + sal_uLong* pBuf = pColBuf; if( !nRLen && !nGLen && !nBLen ) { @@ -2052,14 +2052,14 @@ void Bitmap::ImplMedianCut( sal_uIntPtr* pColBuf, BitmapPalette& rPal, // ------------------------------------------------------------------------ -sal_Bool Bitmap::Vectorize( PolyPolygon& rPolyPoly, sal_uIntPtr nFlags, const Link* pProgress ) +sal_Bool Bitmap::Vectorize( PolyPolygon& rPolyPoly, sal_uLong nFlags, const Link* pProgress ) { return ImplVectorizer().ImplVectorize( *this, rPolyPoly, nFlags, pProgress ); } // ------------------------------------------------------------------------ -sal_Bool Bitmap::Vectorize( GDIMetaFile& rMtf, sal_uInt8 cReduce, sal_uIntPtr nFlags, const Link* pProgress ) +sal_Bool Bitmap::Vectorize( GDIMetaFile& rMtf, sal_uInt8 cReduce, sal_uLong nFlags, const Link* pProgress ) { return ImplVectorizer().ImplVectorize( *this, rMtf, cReduce, nFlags, pProgress ); } diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx index aee54d7540fd..5fe9139ea35e 100644 --- a/vcl/source/gdi/bitmap4.cxx +++ b/vcl/source/gdi/bitmap4.cxx @@ -767,9 +767,9 @@ sal_Bool Bitmap::ImplSepia( const BmpFilterParam* pFilterParam, const Link* /*pP sal_Bool Bitmap::ImplMosaic( const BmpFilterParam* pFilterParam, const Link* /*pProgress*/ ) { - sal_uIntPtr nTileWidth = ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_MOSAIC ) ? + sal_uLong nTileWidth = ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_MOSAIC ) ? pFilterParam->maMosaicTileSize.mnTileWidth : 4; - sal_uIntPtr nTileHeight = ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_MOSAIC ) ? + sal_uLong nTileHeight = ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_MOSAIC ) ? pFilterParam->maMosaicTileSize.mnTileHeight : 4; sal_Bool bRet = sal_False; @@ -962,8 +962,8 @@ sal_Bool Bitmap::ImplPopArt( const BmpFilterParam* /*pFilterParam*/, const Link* { const long nWidth = pWriteAcc->Width(); const long nHeight = pWriteAcc->Height(); - const sal_uIntPtr nEntryCount = 1 << pWriteAcc->GetBitCount(); - sal_uIntPtr n; + const sal_uLong nEntryCount = 1 << pWriteAcc->GetBitCount(); + sal_uLong n; PopArtEntry* pPopArtTable = new PopArtEntry[ nEntryCount ]; for( n = 0; n < nEntryCount; n++ ) @@ -982,8 +982,8 @@ sal_Bool Bitmap::ImplPopArt( const BmpFilterParam* /*pFilterParam*/, const Link* qsort( pPopArtTable, nEntryCount, sizeof( PopArtEntry ), ImplPopArtCmpFnc ); // get last used entry - sal_uIntPtr nFirstEntry; - sal_uIntPtr nLastEntry = 0; + sal_uLong nFirstEntry; + sal_uLong nLastEntry = 0; for( n = 0; n < nEntryCount; n++ ) if( pPopArtTable[ n ].mnCount ) diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index efcfb46c6dc8..abee1ed9bf67 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -356,9 +356,9 @@ AlphaMask BitmapEx::GetAlpha() const // ------------------------------------------------------------------ -sal_uIntPtr BitmapEx::GetSizeBytes() const +sal_uLong BitmapEx::GetSizeBytes() const { - sal_uIntPtr nSizeBytes = aBitmap.GetSizeBytes(); + sal_uLong nSizeBytes = aBitmap.GetSizeBytes(); if( eTransparent == TRANSPARENT_BITMAP ) nSizeBytes += aMask.GetSizeBytes(); @@ -368,7 +368,7 @@ sal_uIntPtr BitmapEx::GetSizeBytes() const // ------------------------------------------------------------------ -sal_uIntPtr BitmapEx::GetChecksum() const +sal_uLong BitmapEx::GetChecksum() const { sal_uInt32 nCrc = aBitmap.GetChecksum(); SVBT32 aBT32; @@ -414,7 +414,7 @@ sal_Bool BitmapEx::Invert() // ------------------------------------------------------------------ -sal_Bool BitmapEx::Mirror( sal_uIntPtr nMirrorFlags ) +sal_Bool BitmapEx::Mirror( sal_uLong nMirrorFlags ) { sal_Bool bRet = sal_False; @@ -431,7 +431,7 @@ sal_Bool BitmapEx::Mirror( sal_uIntPtr nMirrorFlags ) // ------------------------------------------------------------------ -sal_Bool BitmapEx::Scale( const double& rScaleX, const double& rScaleY, sal_uIntPtr nScaleFlag ) +sal_Bool BitmapEx::Scale( const double& rScaleX, const double& rScaleY, sal_uLong nScaleFlag ) { sal_Bool bRet = sal_False; @@ -453,7 +453,7 @@ sal_Bool BitmapEx::Scale( const double& rScaleX, const double& rScaleY, sal_uInt // ------------------------------------------------------------------------ -sal_Bool BitmapEx::Scale( const Size& rNewSize, sal_uIntPtr nScaleFlag ) +sal_Bool BitmapEx::Scale( const Size& rNewSize, sal_uLong nScaleFlag ) { sal_Bool bRet; @@ -553,7 +553,7 @@ sal_Bool BitmapEx::ReduceColors( sal_uInt16 nNewColorCount, BmpReduce eReduce ) // ------------------------------------------------------------------ -sal_Bool BitmapEx::Expand( sal_uIntPtr nDX, sal_uIntPtr nDY, const Color* pInitColor, sal_Bool bExpandTransparent ) +sal_Bool BitmapEx::Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor, sal_Bool bExpandTransparent ) { sal_Bool bRet = sal_False; @@ -696,23 +696,23 @@ sal_Bool BitmapEx::Erase( const Color& rFillColor ) // ------------------------------------------------------------------ -sal_Bool BitmapEx::Dither( sal_uIntPtr nDitherFlags ) +sal_Bool BitmapEx::Dither( sal_uLong nDitherFlags ) { return( !!aBitmap ? aBitmap.Dither( nDitherFlags ) : sal_False ); } // ------------------------------------------------------------------ -sal_Bool BitmapEx::Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uIntPtr nTol ) +sal_Bool BitmapEx::Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) { return( !!aBitmap ? aBitmap.Replace( rSearchColor, rReplaceColor, nTol ) : sal_False ); } // ------------------------------------------------------------------ -sal_Bool BitmapEx::Replace( const Color* pSearchColors, const Color* pReplaceColors, sal_uIntPtr nColorCount, const sal_uIntPtr* pTols ) +sal_Bool BitmapEx::Replace( const Color* pSearchColors, const Color* pReplaceColors, sal_uLong nColorCount, const sal_uLong* pTols ) { - return( !!aBitmap ? aBitmap.Replace( pSearchColors, pReplaceColors, nColorCount, (sal_uIntPtr*) pTols ) : sal_False ); + return( !!aBitmap ? aBitmap.Replace( pSearchColors, pReplaceColors, nColorCount, (sal_uLong*) pTols ) : sal_False ); } // ------------------------------------------------------------------ @@ -857,7 +857,7 @@ SvStream& operator>>( SvStream& rIStm, BitmapEx& rBitmapEx ) if( !rIStm.GetError() ) { - const sal_uIntPtr nStmPos = rIStm.Tell(); + const sal_uLong nStmPos = rIStm.Tell(); sal_uInt32 nMagic1 = 0; sal_uInt32 nMagic2 = 0; diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx index 94613d6264b2..1c7b41b51de6 100644 --- a/vcl/source/gdi/bmpacc.cxx +++ b/vcl/source/gdi/bmpacc.cxx @@ -154,7 +154,7 @@ void BitmapReadAccess::ImplDestroy() // ------------------------------------------------------------------ -sal_Bool BitmapReadAccess::ImplSetAccessPointers( sal_uIntPtr nFormat ) +sal_Bool BitmapReadAccess::ImplSetAccessPointers( sal_uLong nFormat ) { sal_Bool bRet = sal_True; @@ -196,7 +196,7 @@ void BitmapReadAccess::ImplZeroInitUnusedBits() sal_uInt32 nBits; bool bMsb; - const sal_uIntPtr nScanlineFormat = GetScanlineFormat(); + const sal_uLong nScanlineFormat = GetScanlineFormat(); switch( nScanlineFormat ) { case( BMP_FORMAT_1BIT_MSB_PAL ): @@ -366,16 +366,16 @@ void BitmapWriteAccess::CopyScanline( long nY, const BitmapReadAccess& rReadAcc // ------------------------------------------------------------------ void BitmapWriteAccess::CopyScanline( long nY, ConstScanline aSrcScanline, - sal_uIntPtr nSrcScanlineFormat, sal_uIntPtr nSrcScanlineSize ) + sal_uLong nSrcScanlineFormat, sal_uLong nSrcScanlineSize ) { - const sal_uIntPtr nFormat = BMP_SCANLINE_FORMAT( nSrcScanlineFormat ); + const sal_uLong nFormat = BMP_SCANLINE_FORMAT( nSrcScanlineFormat ); DBG_ASSERT( ( nY >= 0 ) && ( nY < mpBuffer->mnHeight ), "y-coordinate in destination out of range!" ); DBG_ASSERT( ( HasPalette() && nFormat <= BMP_FORMAT_8BIT_PAL ) || ( !HasPalette() && nFormat > BMP_FORMAT_8BIT_PAL ), "No copying possible between palette and non palette scanlines!" ); - const sal_uIntPtr nCount = Min( GetScanlineSize(), nSrcScanlineSize ); + const sal_uLong nCount = Min( GetScanlineSize(), nSrcScanlineSize ); if( nCount ) { @@ -437,7 +437,7 @@ void BitmapWriteAccess::CopyBuffer( const BitmapReadAccess& rReadAcc ) ( GetScanlineSize() == rReadAcc.GetScanlineSize() ) ) { const long nHeight = Min( mpBuffer->mnHeight, rReadAcc.Height() ); - const sal_uIntPtr nCount = nHeight * mpBuffer->mnScanlineSize; + const sal_uLong nCount = nHeight * mpBuffer->mnScanlineSize; memcpy( mpBuffer->mpBits, rReadAcc.GetBuffer(), nCount ); } diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx index 83b631c1371a..ac3a80612fe5 100644 --- a/vcl/source/gdi/bmpfast.cxx +++ b/vcl/source/gdi/bmpfast.cxx @@ -55,7 +55,7 @@ protected: PIXBYTE* mpPixel; }; -template <sal_uIntPtr PIXFMT> +template <sal_uLong PIXFMT> class TrueColorPixelPtr : public BasePixelPtr { public: @@ -311,7 +311,7 @@ public: // ======================================================================= // converting truecolor formats -template <sal_uIntPtr SRCFMT, sal_uIntPtr DSTFMT> +template <sal_uLong SRCFMT, sal_uLong DSTFMT> inline void ImplConvertPixel( const TrueColorPixelPtr<DSTFMT>& rDst, const TrueColorPixelPtr<SRCFMT>& rSrc ) { @@ -335,7 +335,7 @@ inline void ImplConvertPixel<BMP_FORMAT_16BIT_TC_LSB_MASK, BMP_FORMAT_16BIT_TC_M // ----------------------------------------------------------------------- -template <sal_uIntPtr SRCFMT, sal_uIntPtr DSTFMT> +template <sal_uLong SRCFMT, sal_uLong DSTFMT> inline void ImplConvertLine( const TrueColorPixelPtr<DSTFMT>& rDst, const TrueColorPixelPtr<SRCFMT>& rSrc, int nPixelCount ) { @@ -352,7 +352,7 @@ inline void ImplConvertLine( const TrueColorPixelPtr<DSTFMT>& rDst, // ======================================================================= // alpha blending truecolor pixels -template <unsigned ALPHABITS, sal_uIntPtr SRCFMT, sal_uIntPtr DSTFMT> +template <unsigned ALPHABITS, sal_uLong SRCFMT, sal_uLong DSTFMT> inline void ImplBlendPixels( const TrueColorPixelPtr<DSTFMT>& rDst, const TrueColorPixelPtr<SRCFMT>& rSrc, unsigned nAlphaVal ) { @@ -384,7 +384,7 @@ inline void ImplBlendPixels( const TrueColorPixelPtr<DSTFMT>& rDst, // ----------------------------------------------------------------------- -template <unsigned ALPHABITS, sal_uIntPtr MASKFMT, sal_uIntPtr SRCFMT, sal_uIntPtr DSTFMT> +template <unsigned ALPHABITS, sal_uLong MASKFMT, sal_uLong SRCFMT, sal_uLong DSTFMT> inline void ImplBlendLines( const TrueColorPixelPtr<DSTFMT>& rDst, const TrueColorPixelPtr<SRCFMT>& rSrc, const TrueColorPixelPtr<MASKFMT>& rMsk, int nPixelCount ) @@ -403,7 +403,7 @@ inline void ImplBlendLines( const TrueColorPixelPtr<DSTFMT>& rDst, // ----------------------------------------------------------------------- -template <unsigned ALPHABITS, sal_uIntPtr SRCFMT, sal_uIntPtr DSTFMT> +template <unsigned ALPHABITS, sal_uLong SRCFMT, sal_uLong DSTFMT> inline void ImplBlendLines( const TrueColorPixelPtr<DSTFMT>& rDst, const TrueColorPixelPtr<SRCFMT>& rSrc, unsigned nAlphaVal, int nPixelCount ) @@ -461,7 +461,7 @@ static bool ImplCopyImage( BitmapBuffer& rDstBuffer, const BitmapBuffer& rSrcBuf // ----------------------------------------------------------------------- -template <sal_uIntPtr DSTFMT,sal_uIntPtr SRCFMT> +template <sal_uLong DSTFMT,sal_uLong SRCFMT> bool ImplConvertToBitmap( TrueColorPixelPtr<SRCFMT>& rSrcLine, BitmapBuffer& rDstBuffer, const BitmapBuffer& rSrcBuffer ) { @@ -494,7 +494,7 @@ bool ImplConvertToBitmap( TrueColorPixelPtr<SRCFMT>& rSrcLine, // ----------------------------------------------------------------------- -template <sal_uIntPtr SRCFMT> +template <sal_uLong SRCFMT> inline bool ImplConvertFromBitmap( BitmapBuffer& rDst, const BitmapBuffer& rSrc ) { TrueColorPixelPtr<SRCFMT> aSrcType; aSrcType.SetRawPtr( rSrc.mpBits ); @@ -595,8 +595,8 @@ bool ImplFastBitmapConversion( BitmapBuffer& rDst, const BitmapBuffer& rSrc, if( rDst.mnHeight < rTR.mnDestY + rTR.mnDestHeight ) return false; - const sal_uIntPtr nSrcFormat = rSrc.mnFormat & ~BMP_FORMAT_TOP_DOWN; - const sal_uIntPtr nDstFormat = rDst.mnFormat & ~BMP_FORMAT_TOP_DOWN; + const sal_uLong nSrcFormat = rSrc.mnFormat & ~BMP_FORMAT_TOP_DOWN; + const sal_uLong nDstFormat = rDst.mnFormat & ~BMP_FORMAT_TOP_DOWN; // TODO: also implement conversions for 16bit colormasks with non-565 format if( nSrcFormat & (BMP_FORMAT_16BIT_TC_LSB_MASK | BMP_FORMAT_16BIT_TC_MSB_MASK) ) @@ -676,7 +676,7 @@ bool ImplFastBitmapConversion( BitmapBuffer& rDst, const BitmapBuffer& rSrc, // ======================================================================= -template <sal_uIntPtr DSTFMT,sal_uIntPtr SRCFMT> //,sal_uIntPtr MSKFMT> +template <sal_uLong DSTFMT,sal_uLong SRCFMT> //,sal_uLong MSKFMT> bool ImplBlendToBitmap( TrueColorPixelPtr<SRCFMT>& rSrcLine, BitmapBuffer& rDstBuffer, const BitmapBuffer& rSrcBuffer, const BitmapBuffer& rMskBuffer ) @@ -753,7 +753,7 @@ inline bool ImplBlendToBitmap<BMP_FORMAT_32BIT_TC_BGRA,BMP_FORMAT_32BIT_TC_BGRA> // ----------------------------------------------------------------------- -template <sal_uIntPtr SRCFMT> +template <sal_uLong SRCFMT> bool ImplBlendFromBitmap( BitmapBuffer& rDst, const BitmapBuffer& rSrc, const BitmapBuffer& rMsk ) { TrueColorPixelPtr<SRCFMT> aSrcType; aSrcType.SetRawPtr( rSrc.mpBits ); @@ -871,8 +871,8 @@ bool ImplFastBitmapBlending( BitmapWriteAccess& rDstWA, const BitmapBuffer& rSrc = *rSrcRA.ImplGetBitmapBuffer(); const BitmapBuffer& rMsk = *rMskRA.ImplGetBitmapBuffer(); - const sal_uIntPtr nSrcFormat = rSrc.mnFormat & ~BMP_FORMAT_TOP_DOWN; - const sal_uIntPtr nDstFormat = rDst.mnFormat & ~BMP_FORMAT_TOP_DOWN; + const sal_uLong nSrcFormat = rSrc.mnFormat & ~BMP_FORMAT_TOP_DOWN; + const sal_uLong nDstFormat = rDst.mnFormat & ~BMP_FORMAT_TOP_DOWN; // accelerated conversions for 16bit colormasks with non-565 format are not yet implemented if( nSrcFormat & (BMP_FORMAT_16BIT_TC_LSB_MASK | BMP_FORMAT_16BIT_TC_MSB_MASK) ) @@ -945,7 +945,7 @@ bool ImplFastEraseBitmap( BitmapBuffer& rDst, const BitmapColor& rColor ) if( bDisableFastBitops ) return false; - const sal_uIntPtr nDstFormat = rDst.mnFormat & ~BMP_FORMAT_TOP_DOWN; + const sal_uLong nDstFormat = rDst.mnFormat & ~BMP_FORMAT_TOP_DOWN; // erasing a bitmap is often just a byte-wise memory fill bool bByteFill = true; diff --git a/vcl/source/gdi/cvtgrf.cxx b/vcl/source/gdi/cvtgrf.cxx index 85e5a8c28f63..3f95f56315f6 100644 --- a/vcl/source/gdi/cvtgrf.cxx +++ b/vcl/source/gdi/cvtgrf.cxx @@ -57,10 +57,10 @@ GraphicConverter::~GraphicConverter() // ------------------------------------------------------------------------ -sal_uIntPtr GraphicConverter::ImplConvert( sal_uIntPtr nInFormat, void* pInBuffer, sal_uIntPtr nInBufSize, - void** ppOutBuffer, sal_uIntPtr nOutFormat ) +sal_uLong GraphicConverter::ImplConvert( sal_uLong nInFormat, void* pInBuffer, sal_uLong nInBufSize, + void** ppOutBuffer, sal_uLong nOutFormat ) { - sal_uIntPtr nRetBufSize = 0UL; + sal_uLong nRetBufSize = 0UL; if( ( nInFormat != nOutFormat ) && pInBuffer ) { @@ -133,10 +133,10 @@ sal_uIntPtr GraphicConverter::ImplConvert( sal_uIntPtr nInFormat, void* pInBuffe // ------------------------------------------------------------------------ -sal_uIntPtr GraphicConverter::Import( SvStream& rIStm, Graphic& rGraphic, sal_uIntPtr nFormat ) +sal_uLong GraphicConverter::Import( SvStream& rIStm, Graphic& rGraphic, sal_uLong nFormat ) { GraphicConverter* pCvt = ImplGetSVData()->maGDIData.mpGrfConverter; - sal_uIntPtr nRet = ERRCODE_IO_GENERAL; + sal_uLong nRet = ERRCODE_IO_GENERAL; if( pCvt && pCvt->GetFilterHdl().IsSet() ) { @@ -156,10 +156,10 @@ sal_uIntPtr GraphicConverter::Import( SvStream& rIStm, Graphic& rGraphic, sal_uI // ------------------------------------------------------------------------ -sal_uIntPtr GraphicConverter::Export( SvStream& rOStm, const Graphic& rGraphic, sal_uIntPtr nFormat ) +sal_uLong GraphicConverter::Export( SvStream& rOStm, const Graphic& rGraphic, sal_uLong nFormat ) { GraphicConverter* pCvt = ImplGetSVData()->maGDIData.mpGrfConverter; - sal_uIntPtr nRet = ERRCODE_IO_GENERAL; + sal_uLong nRet = ERRCODE_IO_GENERAL; if( pCvt && pCvt->GetFilterHdl().IsSet() ) { diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index c678f9a28692..7a6dd74db2c5 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -355,12 +355,12 @@ void ImplReadUnicodeComment( sal_uInt32 nStrmPos, SvStream& rIStm, String& rStri // ------------------------------------------------------------------------ -void ImplSkipActions( SvStream& rIStm, sal_uIntPtr nSkipCount ) +void ImplSkipActions( SvStream& rIStm, sal_uLong nSkipCount ) { sal_Int32 nActionSize; sal_Int16 nType; - for( sal_uIntPtr i = 0UL; i < nSkipCount; i++ ) + for( sal_uLong i = 0UL; i < nSkipCount; i++ ) { rIStm >> nType >> nActionSize; rIStm.SeekRel( nActionSize - 4L ); @@ -493,7 +493,7 @@ void ImplReadExtendedPolyPolygonAction(SvStream& rIStm, PolyPolygon& rPolyPoly) // - SVMConverter - // ---------------- -SVMConverter::SVMConverter( SvStream& rStm, GDIMetaFile& rMtf, sal_uIntPtr nConvertMode ) +SVMConverter::SVMConverter( SvStream& rStm, GDIMetaFile& rMtf, sal_uLong nConvertMode ) { if( !rStm.GetError() ) { @@ -508,7 +508,7 @@ SVMConverter::SVMConverter( SvStream& rStm, GDIMetaFile& rMtf, sal_uIntPtr nConv void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) { - const sal_uIntPtr nPos = rIStm.Tell(); + const sal_uLong nPos = rIStm.Tell(); const sal_uInt16 nOldFormat = rIStm.GetNumberFormatInt(); rIStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); @@ -1379,8 +1379,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) void SVMConverter::ImplConvertToSVM1( SvStream& rOStm, GDIMetaFile& rMtf ) { - sal_uIntPtr nPos; - sal_uIntPtr nCountPos; + sal_uLong nPos; + sal_uLong nCountPos; Font aSaveFont; const sal_uInt16 nOldFormat = rOStm.GetNumberFormatInt(); rtl_TextEncoding eActualCharSet = gsl_getSystemTextEncoding(); @@ -1406,7 +1406,7 @@ void SVMConverter::ImplConvertToSVM1( SvStream& rOStm, GDIMetaFile& rMtf ) rOStm.SeekRel( 4L ); const sal_Int32 nActCount = ImplWriteActions( rOStm, rMtf, aSaveVDev, bRop_0_1, aLineCol, aLineColStack, eActualCharSet ); - const sal_uIntPtr nActPos = rOStm.Tell(); + const sal_uLong nActPos = rOStm.Tell(); rOStm.Seek( nCountPos ); rOStm << nActCount; @@ -1420,13 +1420,13 @@ void SVMConverter::ImplConvertToSVM1( SvStream& rOStm, GDIMetaFile& rMtf ) // ------------------------------------------------------------------------ -sal_uIntPtr SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, +sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, VirtualDevice& rSaveVDev, sal_Bool& rRop_0_1, Color& rLineCol, Stack& rLineColStack, rtl_TextEncoding& rActualCharSet ) { - sal_uIntPtr nCount = 0; - for( sal_uIntPtr i = 0, nActionCount = rMtf.GetActionCount(); i < nActionCount; i++ ) + sal_uLong nCount = 0; + for( sal_uLong i = 0, nActionCount = rMtf.GetActionCount(); i < nActionCount; i++ ) { const MetaAction* pAction = rMtf.GetAction( i ); @@ -1710,7 +1710,7 @@ sal_uIntPtr SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, MetaTextAction* pAct = (MetaTextAction*) pAction; String aUniText( pAct->GetText() ); ByteString aText( aUniText, rActualCharSet ); - const sal_uIntPtr nStrLen = aText.Len(); + const sal_uLong nStrLen = aText.Len(); if ( ImplWriteUnicodeComment( rOStm, aUniText ) ) nCount++; @@ -1731,9 +1731,9 @@ sal_uIntPtr SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, MetaTextArrayAction* pAct = (MetaTextArrayAction*)pAction; ByteString aText( pAct->GetText(), rActualCharSet ); String aUniText( pAct->GetText(), pAct->GetIndex(), pAct->GetLen() ); - sal_uIntPtr nAryLen; - sal_uIntPtr nLen = pAct->GetLen(); - const sal_uIntPtr nTextLen = aText.Len(); + sal_uLong nAryLen; + sal_uLong nLen = pAct->GetLen(); + const sal_uLong nTextLen = aText.Len(); sal_Int32* pDXArray = pAct->GetDXArray(); if ( ImplWriteUnicodeComment( rOStm, aUniText ) ) @@ -1761,7 +1761,7 @@ sal_uIntPtr SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, rOStm << (sal_Int32) nAryLen; rOStm.Write( aText.GetBuffer()+pAct->GetIndex(), nLen + 1 ); - for( sal_uIntPtr n = 0UL ; n < nAryLen; n++ ) + for( sal_uLong n = 0UL ; n < nAryLen; n++ ) rOStm << (sal_Int32) pDXArray[ n ]; nCount++; @@ -1773,7 +1773,7 @@ sal_uIntPtr SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, MetaStretchTextAction* pAct = (MetaStretchTextAction*) pAction; String aUniText( pAct->GetText() ); ByteString aText( aUniText, rActualCharSet ); - const sal_uIntPtr nStrLen = aText.Len(); + const sal_uLong nStrLen = aText.Len(); if ( ImplWriteUnicodeComment( rOStm, aUniText ) ) nCount++; @@ -1897,7 +1897,7 @@ sal_uIntPtr SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, case( META_GRADIENTEX_ACTION ): { const MetaGradientExAction* pA = (MetaGradientExAction*) pAction; - sal_uIntPtr nOldPos, nNewPos; + sal_uLong nOldPos, nNewPos; // write RefPoint comment rOStm << (sal_Int16) GDI_GRADIENTEX_COMMENT; @@ -2145,7 +2145,7 @@ sal_uIntPtr SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, const PolyPolygon& rPolyPoly = ( (MetaTransparentAction*) pAction )->GetPolyPolygon(); const sal_Int16 nTrans = ( (MetaTransparentAction*) pAction )->GetTransparence(); const sal_Int16 nBrushStyle = ( nTrans < 38 ) ? 8 : ( nTrans < 63 ) ? 9 : 10; - sal_uIntPtr nOldPos, nNewPos; + sal_uLong nOldPos, nNewPos; // write transparence comment rOStm << (sal_Int16) GDI_TRANSPARENT_COMMENT; @@ -2208,7 +2208,7 @@ sal_uIntPtr SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, const Point& rPos = pA->GetPoint(); const Size& rSize = pA->GetSize(); const Gradient& rGradient = pA->GetGradient(); - sal_uIntPtr nOldPos, nNewPos; + sal_uLong nOldPos, nNewPos; // write RefPoint comment rOStm << (sal_Int16) GDI_FLOATTRANSPARENT_COMMENT; @@ -2228,7 +2228,7 @@ sal_uIntPtr SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { // write actions for float transparence - sal_uIntPtr nAddCount; + sal_uLong nAddCount; GDIMetaFile aMtf( rTransMtf ); const Size aSrcSize( rTransMtf.GetPrefSize() ); Point aSrcPt( rTransMtf.GetPrefMapMode().GetOrigin() ); @@ -2267,7 +2267,7 @@ sal_uIntPtr SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, const MetaHatchAction* pA = (MetaHatchAction*) pAction; const PolyPolygon& rPolyPoly = pA->GetPolyPolygon(); const Hatch& rHatch = pA->GetHatch(); - sal_uIntPtr nOldPos, nNewPos, nAddCount; + sal_uLong nOldPos, nNewPos, nAddCount; // write hatch comment rOStm << (sal_Int16) GDI_HATCH_COMMENT; @@ -2312,7 +2312,7 @@ sal_uIntPtr SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, const MetaRefPointAction* pA = (MetaRefPointAction*) pAction; const Point& rRefPoint = pA->GetRefPoint(); const sal_Bool bSet = pA->IsSetting(); - sal_uIntPtr nOldPos, nNewPos; + sal_uLong nOldPos, nNewPos; // write RefPoint comment rOStm << (sal_Int16) GDI_REFPOINT_COMMENT; @@ -2340,7 +2340,7 @@ sal_uIntPtr SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, const MetaTextLineColorAction* pA = (MetaTextLineColorAction*) pAction; const Color& rColor = pA->GetColor(); const sal_Bool bSet = pA->IsSetting(); - sal_uIntPtr nOldPos, nNewPos; + sal_uLong nOldPos, nNewPos; // write RefPoint comment rOStm << (sal_Int16) GDI_TEXTLINECOLOR_COMMENT; @@ -2375,7 +2375,7 @@ sal_uIntPtr SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, const long nWidth = pA->GetWidth(); const FontStrikeout eStrikeout = pA->GetStrikeout(); const FontUnderline eUnderline = pA->GetUnderline(); - sal_uIntPtr nOldPos, nNewPos; + sal_uLong nOldPos, nNewPos; // write RefPoint comment rOStm << (sal_Int16) GDI_TEXTLINE_COMMENT; @@ -2407,7 +2407,7 @@ sal_uIntPtr SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { const MetaCommentAction* pA = (MetaCommentAction*) pAction; const sal_uInt32 nDataSize = pA->GetDataSize(); - sal_uIntPtr nOldPos, nNewPos; + sal_uLong nOldPos, nNewPos; // write RefPoint comment rOStm << (sal_Int16) GDI_COMMENT_COMMENT; diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index 7bea58f97f5a..4a3a2f265374 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -170,7 +170,7 @@ void Impl_Font::AskConfig() String aShortName; String aFamilyName; - sal_uIntPtr nType = 0; + sal_uLong nType = 0; FontWeight eWeight = WEIGHT_DONTKNOW; FontWidth eWidthType = WIDTH_DONTKNOW; String aMapName = maFamilyName; diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 9d7e51c44b96..23da138d23a2 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -98,22 +98,22 @@ struct ImplBmpMonoParam struct ImplColReplaceParam { - sal_uIntPtr* pMinR; - sal_uIntPtr* pMaxR; - sal_uIntPtr* pMinG; - sal_uIntPtr* pMaxG; - sal_uIntPtr* pMinB; - sal_uIntPtr* pMaxB; + sal_uLong* pMinR; + sal_uLong* pMaxR; + sal_uLong* pMinG; + sal_uLong* pMaxG; + sal_uLong* pMinB; + sal_uLong* pMaxB; const Color* pDstCols; - sal_uIntPtr nCount; + sal_uLong nCount; }; struct ImplBmpReplaceParam { const Color* pSrcCols; const Color* pDstCols; - sal_uIntPtr nCount; - const sal_uIntPtr* pTols; + sal_uLong nCount; + const sal_uLong* pTols; }; @@ -124,9 +124,9 @@ struct ImplBmpReplaceParam struct ImpLabel { String aLabelName; - sal_uIntPtr nActionPos; + sal_uLong nActionPos; - ImpLabel( const String& rLabelName, sal_uIntPtr _nActionPos ) : + ImpLabel( const String& rLabelName, sal_uLong _nActionPos ) : aLabelName( rLabelName ), nActionPos( _nActionPos ) {} }; @@ -144,13 +144,13 @@ public: ~ImpLabelList(); void ImplInsert( ImpLabel* p ) { Insert( p, LIST_APPEND ); } - ImpLabel* ImplRemove( sal_uIntPtr nPos ) { return (ImpLabel*) Remove( nPos ); } + ImpLabel* ImplRemove( sal_uLong nPos ) { return (ImpLabel*) Remove( nPos ); } void ImplReplace( ImpLabel* p ) { Replace( (void*)p ); } ImpLabel* ImplFirst() { return (ImpLabel*) First(); } ImpLabel* ImplNext() { return (ImpLabel*) Next(); } - ImpLabel* ImplGetLabel( sal_uIntPtr nPos ) const { return (ImpLabel*) GetObject( nPos ); } - sal_uIntPtr ImplGetLabelPos( const String& rLabelName ); - sal_uIntPtr ImplCount() const { return Count(); } + ImpLabel* ImplGetLabel( sal_uLong nPos ) const { return (ImpLabel*) GetObject( nPos ); } + sal_uLong ImplGetLabelPos( const String& rLabelName ); + sal_uLong ImplCount() const { return Count(); } }; // ------------------------------------------------------------------------ @@ -172,9 +172,9 @@ ImpLabelList::~ImpLabelList() // ------------------------------------------------------------------------ -sal_uIntPtr ImpLabelList::ImplGetLabelPos( const String& rLabelName ) +sal_uLong ImpLabelList::ImplGetLabelPos( const String& rLabelName ) { - sal_uIntPtr nLabelPos = METAFILE_LABEL_NOTFOUND; + sal_uLong nLabelPos = METAFILE_LABEL_NOTFOUND; for( ImpLabel* pLabel = ImplFirst(); pLabel; pLabel = ImplNext() ) { @@ -286,7 +286,7 @@ GDIMetaFile& GDIMetaFile::operator=( const GDIMetaFile& rMtf ) sal_Bool GDIMetaFile::operator==( const GDIMetaFile& rMtf ) const { - const sal_uIntPtr nObjCount = Count(); + const sal_uLong nObjCount = Count(); sal_Bool bRet = sal_False; if( this == &rMtf ) @@ -297,7 +297,7 @@ sal_Bool GDIMetaFile::operator==( const GDIMetaFile& rMtf ) const { bRet = sal_True; - for( sal_uIntPtr n = 0UL; n < nObjCount; n++ ) + for( sal_uLong n = 0UL; n < nObjCount; n++ ) { if( GetObject( n ) != rMtf.GetObject( n ) ) { @@ -314,7 +314,7 @@ sal_Bool GDIMetaFile::operator==( const GDIMetaFile& rMtf ) const sal_Bool GDIMetaFile::IsEqual( const GDIMetaFile& rMtf ) const { - const sal_uIntPtr nObjCount = Count(); + const sal_uLong nObjCount = Count(); sal_Bool bRet = sal_False; if( this == &rMtf ) @@ -325,7 +325,7 @@ sal_Bool GDIMetaFile::IsEqual( const GDIMetaFile& rMtf ) const { bRet = sal_True; - for( sal_uIntPtr n = 0UL; n < nObjCount; n++ ) + for( sal_uLong n = 0UL; n < nObjCount; n++ ) { if(!((MetaAction*)GetObject( n ))->IsEqual(*((MetaAction*)rMtf.GetObject( n )))) { @@ -411,17 +411,17 @@ void GDIMetaFile::Record( OutputDevice* pOut ) // ------------------------------------------------------------------------ -void GDIMetaFile::Play( GDIMetaFile& rMtf, sal_uIntPtr nPos ) +void GDIMetaFile::Play( GDIMetaFile& rMtf, sal_uLong nPos ) { if ( !bRecord && !rMtf.bRecord ) { MetaAction* pAction = GetCurAction(); - const sal_uIntPtr nObjCount = Count(); + const sal_uLong nObjCount = Count(); if( nPos > nObjCount ) nPos = nObjCount; - for( sal_uIntPtr nCurPos = GetCurPos(); nCurPos < nPos; nCurPos++ ) + for( sal_uLong nCurPos = GetCurPos(); nCurPos < nPos; nCurPos++ ) { if( !Hook() ) { @@ -436,13 +436,13 @@ void GDIMetaFile::Play( GDIMetaFile& rMtf, sal_uIntPtr nPos ) // ------------------------------------------------------------------------ -void GDIMetaFile::Play( OutputDevice* pOut, sal_uIntPtr nPos ) +void GDIMetaFile::Play( OutputDevice* pOut, sal_uLong nPos ) { if( !bRecord ) { MetaAction* pAction = GetCurAction(); - const sal_uIntPtr nObjCount = Count(); - sal_uIntPtr i = 0, nSyncCount = ( pOut->GetOutDevType() == OUTDEV_WINDOW ) ? 0x000000ff : 0xffffffff; + const sal_uLong nObjCount = Count(); + sal_uLong i = 0, nSyncCount = ( pOut->GetOutDevType() == OUTDEV_WINDOW ) ? 0x000000ff : 0xffffffff; if( nPos > nObjCount ) nPos = nObjCount; @@ -455,7 +455,7 @@ void GDIMetaFile::Play( OutputDevice* pOut, sal_uIntPtr nPos ) pOut->SetLayoutMode( 0 ); pOut->SetDigitLanguage( 0 ); - for( sal_uIntPtr nCurPos = GetCurPos(); nCurPos < nPos; nCurPos++ ) + for( sal_uLong nCurPos = GetCurPos(); nCurPos < nPos; nCurPos++ ) { if( !Hook() ) { @@ -476,7 +476,7 @@ void GDIMetaFile::Play( OutputDevice* pOut, sal_uIntPtr nPos ) // ------------------------------------------------------------------------ void GDIMetaFile::Play( OutputDevice* pOut, const Point& rPos, - const Size& rSize, sal_uIntPtr nPos ) + const Size& rSize, sal_uLong nPos ) { Region aDrawClipRegion; MapMode aDrawMap( GetPrefMapMode() ); @@ -589,7 +589,7 @@ void GDIMetaFile::WindEnd() // ------------------------------------------------------------------------ -void GDIMetaFile::Wind( sal_uIntPtr nActionPos ) +void GDIMetaFile::Wind( sal_uLong nActionPos ) { if( !bRecord ) Seek( nActionPos ); @@ -626,7 +626,7 @@ void GDIMetaFile::AddAction( MetaAction* pAction ) // ------------------------------------------------------------------------ -void GDIMetaFile::AddAction( MetaAction* pAction, sal_uIntPtr nPos ) +void GDIMetaFile::AddAction( MetaAction* pAction, sal_uLong nPos ) { Insert( pAction, nPos ); @@ -640,7 +640,7 @@ void GDIMetaFile::AddAction( MetaAction* pAction, sal_uIntPtr nPos ) // ------------------------------------------------------------------------ // @since #110496# -void GDIMetaFile::RemoveAction( sal_uIntPtr nPos ) +void GDIMetaFile::RemoveAction( sal_uLong nPos ) { Remove( nPos ); @@ -650,14 +650,14 @@ void GDIMetaFile::RemoveAction( sal_uIntPtr nPos ) // ------------------------------------------------------------------------ -MetaAction* GDIMetaFile::CopyAction( sal_uIntPtr nPos ) const +MetaAction* GDIMetaFile::CopyAction( sal_uLong nPos ) const { return ( (MetaAction*) GetObject( nPos ) )->Clone(); } // ------------------------------------------------------------------------ -sal_uIntPtr GDIMetaFile::GetActionPos( const String& rLabel ) +sal_uLong GDIMetaFile::GetActionPos( const String& rLabel ) { ImpLabel* pLabel = NULL; @@ -671,7 +671,7 @@ sal_uIntPtr GDIMetaFile::GetActionPos( const String& rLabel ) // ------------------------------------------------------------------------ -sal_Bool GDIMetaFile::InsertLabel( const String& rLabel, sal_uIntPtr nActionPos ) +sal_Bool GDIMetaFile::InsertLabel( const String& rLabel, sal_uLong nActionPos ) { sal_Bool bRet = sal_False; @@ -693,7 +693,7 @@ void GDIMetaFile::RemoveLabel( const String& rLabel ) { if( pLabelList ) { - const sal_uIntPtr nLabelPos = pLabelList->ImplGetLabelPos( rLabel ); + const sal_uLong nLabelPos = pLabelList->ImplGetLabelPos( rLabel ); if( nLabelPos != METAFILE_LABEL_NOTFOUND ) delete pLabelList->ImplRemove( nLabelPos ); @@ -706,7 +706,7 @@ void GDIMetaFile::RenameLabel( const String& rLabel, const String& rNewLabel ) { if( pLabelList ) { - const sal_uIntPtr nLabelPos = pLabelList->ImplGetLabelPos( rLabel ); + const sal_uLong nLabelPos = pLabelList->ImplGetLabelPos( rLabel ); if ( nLabelPos != METAFILE_LABEL_NOTFOUND ) pLabelList->ImplGetLabel( nLabelPos )->aLabelName = rNewLabel; @@ -715,14 +715,14 @@ void GDIMetaFile::RenameLabel( const String& rLabel, const String& rNewLabel ) // ------------------------------------------------------------------------ -sal_uIntPtr GDIMetaFile::GetLabelCount() const +sal_uLong GDIMetaFile::GetLabelCount() const { return( pLabelList ? pLabelList->ImplCount() : 0UL ); } // ------------------------------------------------------------------------ -String GDIMetaFile::GetLabel( sal_uIntPtr nLabel ) +String GDIMetaFile::GetLabel( sal_uLong nLabel ) { String aString; @@ -775,7 +775,7 @@ sal_Bool GDIMetaFile::SaveStatus() // ------------------------------------------------------------------------ -sal_Bool GDIMetaFile::Mirror( sal_uIntPtr nMirrorFlags ) +sal_Bool GDIMetaFile::Mirror( sal_uLong nMirrorFlags ) { const Size aOldPrefSize( GetPrefSize() ); long nMoveX, nMoveY; @@ -1985,9 +1985,9 @@ BitmapEx GDIMetaFile::ImplBmpMonoFnc( const BitmapEx& rBmpEx, const void* pBmpPa Color GDIMetaFile::ImplColReplaceFnc( const Color& rColor, const void* pColParam ) { - const sal_uIntPtr nR = rColor.GetRed(), nG = rColor.GetGreen(), nB = rColor.GetBlue(); + const sal_uLong nR = rColor.GetRed(), nG = rColor.GetGreen(), nB = rColor.GetBlue(); - for( sal_uIntPtr i = 0; i < ( (const ImplColReplaceParam*) pColParam )->nCount; i++ ) + for( sal_uLong i = 0; i < ( (const ImplColReplaceParam*) pColParam )->nCount; i++ ) { if( ( ( (const ImplColReplaceParam*) pColParam )->pMinR[ i ] <= nR ) && ( ( (const ImplColReplaceParam*) pColParam )->pMaxR[ i ] >= nR ) && @@ -2376,41 +2376,41 @@ void GDIMetaFile::Convert( MtfConversion eConversion ) // ------------------------------------------------------------------------ -void GDIMetaFile::ReplaceColors( const Color& rSearchColor, const Color& rReplaceColor, sal_uIntPtr nTol ) +void GDIMetaFile::ReplaceColors( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) { ReplaceColors( &rSearchColor, &rReplaceColor, 1, &nTol ); } // ------------------------------------------------------------------------ -void GDIMetaFile::ReplaceColors( const Color* pSearchColors, const Color* pReplaceColors, sal_uIntPtr nColorCount, sal_uIntPtr* pTols ) +void GDIMetaFile::ReplaceColors( const Color* pSearchColors, const Color* pReplaceColors, sal_uLong nColorCount, sal_uLong* pTols ) { ImplColReplaceParam aColParam; ImplBmpReplaceParam aBmpParam; - aColParam.pMinR = new sal_uIntPtr[ nColorCount ]; - aColParam.pMaxR = new sal_uIntPtr[ nColorCount ]; - aColParam.pMinG = new sal_uIntPtr[ nColorCount ]; - aColParam.pMaxG = new sal_uIntPtr[ nColorCount ]; - aColParam.pMinB = new sal_uIntPtr[ nColorCount ]; - aColParam.pMaxB = new sal_uIntPtr[ nColorCount ]; + aColParam.pMinR = new sal_uLong[ nColorCount ]; + aColParam.pMaxR = new sal_uLong[ nColorCount ]; + aColParam.pMinG = new sal_uLong[ nColorCount ]; + aColParam.pMaxG = new sal_uLong[ nColorCount ]; + aColParam.pMinB = new sal_uLong[ nColorCount ]; + aColParam.pMaxB = new sal_uLong[ nColorCount ]; - for( sal_uIntPtr i = 0; i < nColorCount; i++ ) + for( sal_uLong i = 0; i < nColorCount; i++ ) { const long nTol = pTols ? ( pTols[ i ] * 255 ) / 100 : 0; long nVal; nVal = pSearchColors[ i ].GetRed(); - aColParam.pMinR[ i ] = (sal_uIntPtr) Max( nVal - nTol, 0L ); - aColParam.pMaxR[ i ] = (sal_uIntPtr) Min( nVal + nTol, 255L ); + aColParam.pMinR[ i ] = (sal_uLong) Max( nVal - nTol, 0L ); + aColParam.pMaxR[ i ] = (sal_uLong) Min( nVal + nTol, 255L ); nVal = pSearchColors[ i ].GetGreen(); - aColParam.pMinG[ i ] = (sal_uIntPtr) Max( nVal - nTol, 0L ); - aColParam.pMaxG[ i ] = (sal_uIntPtr) Min( nVal + nTol, 255L ); + aColParam.pMinG[ i ] = (sal_uLong) Max( nVal - nTol, 0L ); + aColParam.pMaxG[ i ] = (sal_uLong) Min( nVal + nTol, 255L ); nVal = pSearchColors[ i ].GetBlue(); - aColParam.pMinB[ i ] = (sal_uIntPtr) Max( nVal - nTol, 0L ); - aColParam.pMaxB[ i ] = (sal_uIntPtr) Min( nVal + nTol, 255L ); + aColParam.pMinB[ i ] = (sal_uLong) Max( nVal - nTol, 0L ); + aColParam.pMaxB[ i ] = (sal_uLong) Min( nVal + nTol, 255L ); } aColParam.pDstCols = pReplaceColors; @@ -2450,16 +2450,16 @@ GDIMetaFile GDIMetaFile::GetMonochromeMtf( const Color& rColor ) const // ------------------------------------------------------------------------ -sal_uIntPtr GDIMetaFile::GetChecksum() const +sal_uLong GDIMetaFile::GetChecksum() const { GDIMetaFile aMtf; SvMemoryStream aMemStm( 65535, 65535 ); ImplMetaWriteData aWriteData; aWriteData.meActualCharSet = aMemStm.GetStreamCharSet(); SVBT16 aBT16; SVBT32 aBT32; - sal_uIntPtr nCrc = 0; + sal_uLong nCrc = 0; - for( sal_uIntPtr i = 0, nObjCount = GetActionCount(); i < nObjCount; i++ ) + for( sal_uLong i = 0, nObjCount = GetActionCount(); i < nObjCount; i++ ) { MetaAction* pAction = GetAction( i ); @@ -2730,11 +2730,11 @@ sal_uIntPtr GDIMetaFile::GetChecksum() const // ------------------------------------------------------------------------ -sal_uIntPtr GDIMetaFile::GetSizeBytes() const +sal_uLong GDIMetaFile::GetSizeBytes() const { - sal_uIntPtr nSizeBytes = 0; + sal_uLong nSizeBytes = 0; - for( sal_uIntPtr i = 0, nObjCount = GetActionCount(); i < nObjCount; ++i ) + for( sal_uLong i = 0, nObjCount = GetActionCount(); i < nObjCount; ++i ) { MetaAction* pAction = GetAction( i ); @@ -2796,7 +2796,7 @@ SvStream& operator>>( SvStream& rIStm, GDIMetaFile& rGDIMetaFile ) if( !rIStm.GetError() ) { char aId[ 7 ]; - sal_uIntPtr nStmPos = rIStm.Tell(); + sal_uLong nStmPos = rIStm.Tell(); sal_uInt16 nOldFormat = rIStm.GetNumberFormatInt(); rIStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index 1a3c4954834a..1a476f1b5420 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -245,7 +245,7 @@ sal_Bool GfxLink::LoadNative( Graphic& rGraphic ) if( pData ) { SvMemoryStream aMemStm; - sal_uIntPtr nCvtType; + sal_uLong nCvtType; aMemStm.SetBuffer( (char*) pData, mnBufSize, sal_False, mnBufSize ); @@ -391,7 +391,7 @@ SvStream& operator>>( SvStream& rIStream, GfxLink& rGfxLink) // - ImpSwap - // ----------- -ImpSwap::ImpSwap( sal_uInt8* pData, sal_uIntPtr nDataSize ) : +ImpSwap::ImpSwap( sal_uInt8* pData, sal_uLong nDataSize ) : mnDataSize( nDataSize ), mnRefCount( 1UL ) { diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx index 9a643e41afa3..1a8201706212 100644 --- a/vcl/source/gdi/graph.cxx +++ b/vcl/source/gdi/graph.cxx @@ -531,7 +531,7 @@ Size Graphic::GetSizePixel( const OutputDevice* pRefDevice ) const // ------------------------------------------------------------------ -sal_uIntPtr Graphic::GetSizeBytes() const +sal_uLong Graphic::GetSizeBytes() const { return mpImpGraphic->ImplGetSizeBytes(); } @@ -615,7 +615,7 @@ Link Graphic::GetAnimationNotifyHdl() const // ------------------------------------------------------------------------ -sal_uIntPtr Graphic::GetAnimationLoopCount() const +sal_uLong Graphic::GetAnimationLoopCount() const { return mpImpGraphic->ImplGetAnimationLoopCount(); } @@ -652,7 +652,7 @@ void Graphic::SetContext( GraphicReader* pReader ) sal_uInt16 Graphic::GetGraphicsCompressMode( SvStream& rIStm ) { - const sal_uIntPtr nPos = rIStm.Tell(); + const sal_uLong nPos = rIStm.Tell(); const sal_uInt16 nOldFormat = rIStm.GetNumberFormatInt(); sal_uInt32 nTmp32; sal_uInt16 nTmp16; @@ -688,7 +688,7 @@ sal_uInt16 Graphic::GetGraphicsCompressMode( SvStream& rIStm ) // ------------------------------------------------------------------------ -void Graphic::SetDocFileName( const String& rName, sal_uIntPtr nFilePos ) +void Graphic::SetDocFileName( const String& rName, sal_uLong nFilePos ) { mpImpGraphic->ImplSetDocFileName( rName, nFilePos ); } @@ -702,7 +702,7 @@ const String& Graphic::GetDocFileName() const // ------------------------------------------------------------------------ -sal_uIntPtr Graphic::GetDocFilePos() const +sal_uLong Graphic::GetDocFilePos() const { return mpImpGraphic->ImplGetDocFilePos(); } @@ -786,7 +786,7 @@ sal_Bool Graphic::IsLink() const // ------------------------------------------------------------------------ -sal_uIntPtr Graphic::GetChecksum() const +sal_uLong Graphic::GetChecksum() const { return mpImpGraphic->ImplGetChecksum(); } diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx index 38999576a1cc..ee6060b7d8f3 100644 --- a/vcl/source/gdi/image.cxx +++ b/vcl/source/gdi/image.cxx @@ -86,7 +86,7 @@ Image::Image( const ResId& rResId ) : pResMgr->Increment( sizeof( RSHEADER_TYPE ) ); BitmapEx aBmpEx; - sal_uIntPtr nObjMask = pResMgr->ReadLong(); + sal_uLong nObjMask = pResMgr->ReadLong(); if( nObjMask & RSC_IMAGE_IMAGEBITMAP ) { @@ -293,7 +293,7 @@ Image Image::GetColorTransformedImage( ImageColorTransform eColorTransform ) con { Color* pSrcColors = NULL; Color* pDstColors = NULL; - sal_uIntPtr nColorCount = 0; + sal_uLong nColorCount = 0; Image::GetColorTransformArrays( eColorTransform, pSrcColors, pDstColors, nColorCount ); @@ -334,7 +334,7 @@ void Image::Invert() // ----------------------------------------------------------------------- void Image::GetColorTransformArrays( ImageColorTransform eColorTransform, - Color*& rpSrcColor, Color*& rpDstColor, sal_uIntPtr& rColorCount ) + Color*& rpSrcColor, Color*& rpDstColor, sal_uLong& rColorCount ) { if( IMAGECOLORTRANSFORM_HIGHCONTRAST == eColorTransform ) { @@ -446,7 +446,7 @@ ImageList::ImageList( const ResId& rResId ) : { pResMgr->Increment( sizeof( RSHEADER_TYPE ) ); - sal_uIntPtr nObjMask = pResMgr->ReadLong(); + sal_uLong nObjMask = pResMgr->ReadLong(); const String aPrefix( pResMgr->ReadString() ); ::boost::scoped_ptr< Color > spMaskColor; @@ -646,7 +646,7 @@ void ImageList::InsertFromHorizontalBitmap( const ResId& rResId, const Color *pMaskColor, const Color *pSearchColors, const Color *pReplaceColors, - sal_uIntPtr nColorCount) + sal_uLong nColorCount) { BitmapEx aBmpEx( rResId ); if (!aBmpEx.IsTransparent()) @@ -742,8 +742,8 @@ void ImageList::ReplaceImage( sal_uInt16 nId, sal_uInt16 nReplaceId ) DBG_ASSERT( GetImagePos( nId ) != IMAGELIST_IMAGE_NOTFOUND, "ImageList::ReplaceImage(): Unknown nId" ); DBG_ASSERT( GetImagePos( nReplaceId ) != IMAGELIST_IMAGE_NOTFOUND, "ImageList::ReplaceImage(): Unknown nReplaceId" ); - sal_uIntPtr nPosDest = GetImagePos( nId ); - sal_uIntPtr nPosSrc = GetImagePos( nReplaceId ); + sal_uLong nPosDest = GetImagePos( nId ); + sal_uLong nPosSrc = GetImagePos( nReplaceId ); if( nPosDest != IMAGELIST_IMAGE_NOTFOUND && nPosSrc != IMAGELIST_IMAGE_NOTFOUND ) { diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx index f2bb1b190bc0..aaaca451ebe3 100644 --- a/vcl/source/gdi/impanmvw.cxx +++ b/vcl/source/gdi/impanmvw.cxx @@ -39,7 +39,7 @@ ImplAnimView::ImplAnimView( Animation* pParent, OutputDevice* pOut, const Point& rPt, const Size& rSz, - sal_uIntPtr nExtraData, + sal_uLong nExtraData, OutputDevice* pFirstFrameOutDev ) : mpParent ( pParent ), mpOut ( pFirstFrameOutDev ? pFirstFrameOutDev : pOut ), @@ -174,15 +174,15 @@ void ImplAnimView::ImplGetPosSize( const AnimationBitmap& rAnm, Point& rPosPix, // ------------------------------------------------------------------------ -void ImplAnimView::ImplDrawToPos( sal_uIntPtr nPos ) +void ImplAnimView::ImplDrawToPos( sal_uLong nPos ) { VirtualDevice aVDev; Region* pOldClip = !maClip.IsNull() ? new Region( mpOut->GetClipRegion() ) : NULL; aVDev.SetOutputSizePixel( maSzPix, sal_False ); - nPos = Min( nPos, (sal_uIntPtr) mpParent->Count() - 1UL ); + nPos = Min( nPos, (sal_uLong) mpParent->Count() - 1UL ); - for( sal_uIntPtr i = 0UL; i <= nPos; i++ ) + for( sal_uLong i = 0UL; i <= nPos; i++ ) ImplDraw( i, &aVDev ); if( pOldClip ) @@ -199,14 +199,14 @@ void ImplAnimView::ImplDrawToPos( sal_uIntPtr nPos ) // ------------------------------------------------------------------------ -void ImplAnimView::ImplDraw( sal_uIntPtr nPos ) +void ImplAnimView::ImplDraw( sal_uLong nPos ) { ImplDraw( nPos, NULL ); } // ------------------------------------------------------------------------ -void ImplAnimView::ImplDraw( sal_uIntPtr nPos, VirtualDevice* pVDev ) +void ImplAnimView::ImplDraw( sal_uLong nPos, VirtualDevice* pVDev ) { Rectangle aOutRect( mpOut->PixelToLogic( Point() ), mpOut->GetOutputSize() ); @@ -220,7 +220,7 @@ void ImplAnimView::ImplDraw( sal_uIntPtr nPos, VirtualDevice* pVDev ) Point aBmpPosPix; Size aSizePix; Size aBmpSizePix; - const sal_uIntPtr nLastPos = mpParent->Count() - 1; + const sal_uLong nLastPos = mpParent->Count() - 1; const AnimationBitmap& rAnm = mpParent->Get( (sal_uInt16) ( mnActPos = Min( nPos, nLastPos ) ) ); ImplGetPosSize( rAnm, aPosPix, aSizePix ); diff --git a/vcl/source/gdi/impanmvw.hxx b/vcl/source/gdi/impanmvw.hxx index a9d41a051bc4..69ae35fe1c6e 100644 --- a/vcl/source/gdi/impanmvw.hxx +++ b/vcl/source/gdi/impanmvw.hxx @@ -57,7 +57,7 @@ private: Region maClip; VirtualDevice* mpBackground; VirtualDevice* mpRestore; - sal_uIntPtr mnActPos; + sal_uLong mnActPos; Disposal meLastDisposal; sal_Bool mbPause; sal_Bool mbFirst; @@ -66,18 +66,18 @@ private: sal_Bool mbVMirr; void ImplGetPosSize( const AnimationBitmap& rAnm, Point& rPosPix, Size& rSizePix ); - void ImplDraw( sal_uIntPtr nPos, VirtualDevice* pVDev ); + void ImplDraw( sal_uLong nPos, VirtualDevice* pVDev ); public: ImplAnimView( Animation* pParent, OutputDevice* pOut, - const Point& rPt, const Size& rSz, sal_uIntPtr nExtraData, + const Point& rPt, const Size& rSz, sal_uLong nExtraData, OutputDevice* pFirstFrameOutDev = NULL ); ~ImplAnimView(); sal_Bool ImplMatches( OutputDevice* pOut, long nExtraData ) const; - void ImplDrawToPos( sal_uIntPtr nPos ); - void ImplDraw( sal_uIntPtr nPos ); + void ImplDrawToPos( sal_uLong nPos ); + void ImplDraw( sal_uLong nPos ); void ImplRepaint(); AInfo* ImplCreateAInfo() const; diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 01952913c2eb..500ba9549b9e 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -70,7 +70,7 @@ struct ImpSwapFile { INetURLObject aSwapURL; - sal_uIntPtr nRefCount; + sal_uLong nRefCount; }; // ----------------- @@ -252,7 +252,7 @@ ImpGraphic::~ImpGraphic() { ImplClear(); - if( (sal_uIntPtr) mpContext > 1UL ) + if( (sal_uLong) mpContext > 1UL ) delete mpContext; } @@ -729,7 +729,7 @@ void ImpGraphic::ImplSetPrefMapMode( const MapMode& rPrefMapMode ) // ------------------------------------------------------------------------ -sal_uIntPtr ImpGraphic::ImplGetSizeBytes() const +sal_uLong ImpGraphic::ImplGetSizeBytes() const { if( 0 == mnSizeBytes ) { @@ -856,7 +856,7 @@ Link ImpGraphic::ImplGetAnimationNotifyHdl() const // ------------------------------------------------------------------------ -sal_uIntPtr ImpGraphic::ImplGetAnimationLoopCount() const +sal_uLong ImpGraphic::ImplGetAnimationLoopCount() const { return( mpAnimation ? mpAnimation->GetLoopCount() : 0UL ); } @@ -892,7 +892,7 @@ void ImpGraphic::ImplSetContext( GraphicReader* pReader ) // ------------------------------------------------------------------------ -void ImpGraphic::ImplSetDocFileName( const String& rName, sal_uIntPtr nFilePos ) +void ImpGraphic::ImplSetDocFileName( const String& rName, sal_uLong nFilePos ) { const INetURLObject aURL( rName ); @@ -911,7 +911,7 @@ const String& ImpGraphic::ImplGetDocFileName() const // ------------------------------------------------------------------------ -sal_uIntPtr ImpGraphic::ImplGetDocFilePos() const +sal_uLong ImpGraphic::ImplGetDocFilePos() const { return mnDocFilePos; } @@ -922,9 +922,9 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap ) { MapMode aMapMode; Size aSize; - const sal_uIntPtr nStartPos = rIStm.Tell(); + const sal_uLong nStartPos = rIStm.Tell(); sal_uInt32 nId; - sal_uIntPtr nHeaderLen; + sal_uLong nHeaderLen; long nType; long nLen; const sal_uInt16 nOldFormat = rIStm.GetNumberFormatInt(); @@ -933,7 +933,7 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap ) if( !mbSwapUnderway ) { const String aTempURLStr( maDocFileURLStr ); - const sal_uIntPtr nTempPos = mnDocFilePos; + const sal_uLong nTempPos = mnDocFilePos; ImplClear(); @@ -1031,8 +1031,8 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap ) if( pOStm ) { - sal_uIntPtr nFullLen = nHeaderLen + nLen; - sal_uIntPtr nPartLen = Min( nFullLen, (sal_uIntPtr) GRAPHIC_MAXPARTLEN ); + sal_uLong nFullLen = nHeaderLen + nLen; + sal_uLong nPartLen = Min( nFullLen, (sal_uLong) GRAPHIC_MAXPARTLEN ); sal_uInt8* pBuffer = (sal_uInt8*) rtl_allocateMemory( nPartLen ); pOStm->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); @@ -1053,7 +1053,7 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap ) } rtl_freeMemory( pBuffer ); - sal_uIntPtr nReadErr = rIStm.GetError(), nWriteErr = pOStm->GetError(); + sal_uLong nReadErr = rIStm.GetError(), nWriteErr = pOStm->GetError(); delete pOStm, pOStm = NULL; if( !nReadErr && !nWriteErr ) @@ -1101,9 +1101,9 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap ) else if( meType >= SYS_WINMETAFILE && meType <= SYS_MACMETAFILE ) { Graphic aSysGraphic; - sal_uIntPtr nCvtType; + sal_uLong nCvtType; - switch( sal::static_int_cast<sal_uIntPtr>(meType) ) + switch( sal::static_int_cast<sal_uLong>(meType) ) { case( SYS_WINMETAFILE ): case( SYS_WNTMETAFILE ): nCvtType = CVT_WMF; break; @@ -1149,7 +1149,7 @@ sal_Bool ImpGraphic::ImplWriteEmbedded( SvStream& rOStm ) const MapMode aMapMode( ImplGetPrefMapMode() ); const Size aSize( ImplGetPrefSize() ); const sal_uInt16 nOldFormat = rOStm.GetNumberFormatInt(); - sal_uIntPtr nDataFieldPos; + sal_uLong nDataFieldPos; rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); @@ -1196,14 +1196,14 @@ sal_Bool ImpGraphic::ImplWriteEmbedded( SvStream& rOStm ) // write data block if( !rOStm.GetError() ) { - const sal_uIntPtr nDataStart = rOStm.Tell(); + const sal_uLong nDataStart = rOStm.Tell(); if( ImplIsSupportedGraphic() ) rOStm << *this; if( !rOStm.GetError() ) { - const sal_uIntPtr nStmPos2 = rOStm.Tell(); + const sal_uLong nStmPos2 = rOStm.Tell(); rOStm.Seek( nDataFieldPos ); rOStm << (long) ( nStmPos2 - nDataStart ); rOStm.Seek( nStmPos2 ); @@ -1444,9 +1444,9 @@ sal_Bool ImpGraphic::ImplIsLink() const // ------------------------------------------------------------------------ -sal_uIntPtr ImpGraphic::ImplGetChecksum() const +sal_uLong ImpGraphic::ImplGetChecksum() const { - sal_uIntPtr nRet = 0; + sal_uLong nRet = 0; if( ImplIsSupportedGraphic() && !ImplIsSwapOut() ) { @@ -1504,7 +1504,7 @@ SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic ) { if( !rIStm.GetError() ) { - const sal_uIntPtr nStmPos1 = rIStm.Tell(); + const sal_uLong nStmPos1 = rIStm.Tell(); sal_uInt32 nTmp; if ( !rImpGraphic.mbSwapUnderway ) @@ -1570,7 +1570,7 @@ SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic ) if( !rIStm.GetError() ) { sal_uInt32 nMagic1(0), nMagic2(0); - sal_uIntPtr nActPos = rIStm.Tell(); + sal_uLong nActPos = rIStm.Tell(); rIStm >> nMagic1 >> nMagic2; rIStm.Seek( nActPos ); diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx index 2632d0f55460..0d0af3365c00 100644 --- a/vcl/source/gdi/impimage.cxx +++ b/vcl/source/gdi/impimage.cxx @@ -253,7 +253,7 @@ void ImplImageBmp::Create( const BitmapEx& rBmpEx, long nItemWidth, long nItemHe void ImplImageBmp::Expand( sal_uInt16 nGrowSize ) { - const sal_uIntPtr nDX = nGrowSize * maSize.Width(); + const sal_uLong nDX = nGrowSize * maSize.Width(); const sal_uInt16 nOldSize = mnSize; sal_uInt8* pNewAry = new sal_uInt8[ mnSize = sal::static_int_cast<sal_uInt16>(mnSize+nGrowSize) ]; @@ -337,7 +337,7 @@ void ImplImageBmp::Replace( sal_uInt16 nPos, const BitmapEx& rBmpEx ) // ----------------------------------------------------------------------- -void ImplImageBmp::ReplaceColors( const Color* pSrcColors, const Color* pDstColors, sal_uIntPtr nColorCount ) +void ImplImageBmp::ReplaceColors( const Color* pSrcColors, const Color* pDstColors, sal_uLong nColorCount ) { maBmpEx.Replace( pSrcColors, pDstColors, nColorCount ); delete mpDisplayBmp; diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx index e5c6c6b7e743..f405c3e4b602 100644 --- a/vcl/source/gdi/impvect.cxx +++ b/vcl/source/gdi/impvect.cxx @@ -163,21 +163,21 @@ extern "C" int __LOADONCALLAPI ImplColorSetCmpFnc( const void* p1, const void* p class ImplPointArray { Point* mpArray; - sal_uIntPtr mnSize; - sal_uIntPtr mnRealSize; + sal_uLong mnSize; + sal_uLong mnRealSize; public: ImplPointArray(); ~ImplPointArray(); - void ImplSetSize( sal_uIntPtr nSize ); + void ImplSetSize( sal_uLong nSize ); - sal_uIntPtr ImplGetRealSize() const { return mnRealSize; } - void ImplSetRealSize( sal_uIntPtr nRealSize ) { mnRealSize = nRealSize; } + sal_uLong ImplGetRealSize() const { return mnRealSize; } + void ImplSetRealSize( sal_uLong nRealSize ) { mnRealSize = nRealSize; } - inline Point& operator[]( sal_uIntPtr nPos ); - inline const Point& operator[]( sal_uIntPtr nPos ) const; + inline Point& operator[]( sal_uLong nPos ); + inline const Point& operator[]( sal_uLong nPos ) const; void ImplCreatePoly( Polygon& rPoly ) const; }; @@ -202,9 +202,9 @@ ImplPointArray::~ImplPointArray() // ----------------------------------------------------------------------------- -void ImplPointArray::ImplSetSize( sal_uIntPtr nSize ) +void ImplPointArray::ImplSetSize( sal_uLong nSize ) { - const sal_uIntPtr nTotal = nSize * sizeof( Point ); + const sal_uLong nTotal = nSize * sizeof( Point ); mnSize = nSize; mnRealSize = 0UL; @@ -218,7 +218,7 @@ void ImplPointArray::ImplSetSize( sal_uIntPtr nSize ) // ----------------------------------------------------------------------------- -inline Point& ImplPointArray::operator[]( sal_uIntPtr nPos ) +inline Point& ImplPointArray::operator[]( sal_uLong nPos ) { DBG_ASSERT( nPos < mnSize, "ImplPointArray::operator[]: nPos out of range!" ); return mpArray[ nPos ]; @@ -226,7 +226,7 @@ inline Point& ImplPointArray::operator[]( sal_uIntPtr nPos ) // ----------------------------------------------------------------------------- -inline const Point& ImplPointArray::operator[]( sal_uIntPtr nPos ) const +inline const Point& ImplPointArray::operator[]( sal_uLong nPos ) const { DBG_ASSERT( nPos < mnSize, "ImplPointArray::operator[]: nPos out of range!" ); return mpArray[ nPos ]; @@ -343,8 +343,8 @@ private: Polygon maPoly; Point maStartPt; - sal_uIntPtr mnArraySize; - sal_uIntPtr mnCount; + sal_uLong mnArraySize; + sal_uLong mnCount; long mnResize; sal_uInt8* mpCodes; @@ -357,19 +357,19 @@ private: public: - ImplChain( sal_uIntPtr nInitCount = 1024UL, long nResize = -1L ); + ImplChain( sal_uLong nInitCount = 1024UL, long nResize = -1L ); ~ImplChain(); void ImplBeginAdd( const Point& rStartPt ); inline void ImplAdd( sal_uInt8 nCode ); - void ImplEndAdd( sal_uIntPtr nTypeFlag ); + void ImplEndAdd( sal_uLong nTypeFlag ); const Polygon& ImplGetPoly() { return maPoly; } }; // ----------------------------------------------------------------------------- -ImplChain::ImplChain( sal_uIntPtr nInitCount, long nResize ) : +ImplChain::ImplChain( sal_uLong nInitCount, long nResize ) : mnArraySize ( nInitCount ), mnCount ( 0UL ), mnResize ( nResize ) @@ -389,10 +389,10 @@ ImplChain::~ImplChain() void ImplChain::ImplGetSpace() { - const sal_uIntPtr nOldArraySize = mnArraySize; + const sal_uLong nOldArraySize = mnArraySize; sal_uInt8* pNewCodes; - mnArraySize = ( mnResize < 0L ) ? ( mnArraySize << 1UL ) : ( mnArraySize + (sal_uIntPtr) mnResize ); + mnArraySize = ( mnResize < 0L ) ? ( mnArraySize << 1UL ) : ( mnArraySize + (sal_uLong) mnResize ); pNewCodes = new sal_uInt8[ mnArraySize ]; memcpy( pNewCodes, mpCodes, nOldArraySize ); delete[] mpCodes; @@ -420,7 +420,7 @@ inline void ImplChain::ImplAdd( sal_uInt8 nCode ) // ----------------------------------------------------------------------------- -void ImplChain::ImplEndAdd( sal_uIntPtr nFlag ) +void ImplChain::ImplEndAdd( sal_uLong nFlag ) { if( mnCount ) { @@ -647,7 +647,7 @@ void ImplChain::ImplEndAdd( sal_uIntPtr nFlag ) aArr.ImplSetSize( mnCount + 1 ); aArr[ 0 ] = Point( nLastX, nLastY ); - for( sal_uIntPtr i = 0; i < mnCount; ) + for( sal_uLong i = 0; i < mnCount; ) { const ChainMove& rMove = aImplMove[ mpCodes[ i ] ]; aArr[ ++i ] = Point( nLastX += rMove.nDX, nLastY += rMove.nDY ); @@ -670,9 +670,9 @@ void ImplChain::ImplPostProcess( const ImplPointArray& rArr ) ImplPointArray aNewArr2; Point* pLast; Point* pLeast; - sal_uIntPtr nNewPos; - sal_uIntPtr nCount = rArr.ImplGetRealSize(); - sal_uIntPtr n; + sal_uLong nNewPos; + sal_uLong nCount = rArr.ImplGetRealSize(); + sal_uLong n; // pass 1 aNewArr1.ImplSetSize( nCount ); @@ -740,7 +740,7 @@ ImplVectorizer::~ImplVectorizer() // ----------------------------------------------------------------------------- sal_Bool ImplVectorizer::ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf, - sal_uInt8 cReduce, sal_uIntPtr nFlags, const Link* pProgress ) + sal_uInt8 cReduce, sal_uLong nFlags, const Link* pProgress ) { sal_Bool bRet = sal_False; @@ -846,7 +846,7 @@ sal_Bool ImplVectorizer::ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rM sal_Bool ImplVectorizer::ImplVectorize( const Bitmap& rMonoBmp, PolyPolygon& rPolyPoly, - sal_uIntPtr nFlags, const Link* pProgress ) + sal_uLong nFlags, const Link* pProgress ) { Bitmap* pBmp = new Bitmap( rMonoBmp ); BitmapReadAccess* pRAcc; @@ -1068,7 +1068,7 @@ ImplVectMap* ImplVectorizer::ImplExpand( BitmapReadAccess* pRAcc, const Color& r // ----------------------------------------------------------------------------- -void ImplVectorizer::ImplCalculate( ImplVectMap* pMap, PolyPolygon& rPolyPoly, sal_uInt8 cReduce, sal_uIntPtr nFlags ) +void ImplVectorizer::ImplCalculate( ImplVectMap* pMap, PolyPolygon& rPolyPoly, sal_uInt8 cReduce, sal_uLong nFlags ) { const long nWidth = pMap->Width(), nHeight= pMap->Height(); @@ -1143,9 +1143,9 @@ sal_Bool ImplVectorizer::ImplGetChain( ImplVectMap* pMap, const Point& rStartPt long nActY = rStartPt.Y(); long nTryX; long nTryY; - sal_uIntPtr nFound; - sal_uIntPtr nLastDir = 0UL; - sal_uIntPtr nDir; + sal_uLong nFound; + sal_uLong nLastDir = 0UL; + sal_uLong nDir; do { diff --git a/vcl/source/gdi/impvect.hxx b/vcl/source/gdi/impvect.hxx index 21d73d2daafe..86fef6a04083 100644 --- a/vcl/source/gdi/impvect.hxx +++ b/vcl/source/gdi/impvect.hxx @@ -44,7 +44,7 @@ class ImplVectorizer private: ImplVectMap* ImplExpand( BitmapReadAccess* pRAcc, const Color& rColor ); - void ImplCalculate( ImplVectMap* pMap, PolyPolygon& rPolyPoly, sal_uInt8 cReduce, sal_uIntPtr nFlags ); + void ImplCalculate( ImplVectMap* pMap, PolyPolygon& rPolyPoly, sal_uInt8 cReduce, sal_uLong nFlags ); sal_Bool ImplGetChain( ImplVectMap* pMap, const Point& rStartPt, ImplChain& rChain ); sal_Bool ImplIsUp( ImplVectMap* pMap, long nY, long nX ) const; void ImplLimitPolyPoly( PolyPolygon& rPolyPoly ); @@ -55,9 +55,9 @@ public: ~ImplVectorizer(); sal_Bool ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf, - sal_uInt8 cReduce, sal_uIntPtr nFlags, const Link* pProgress ); + sal_uInt8 cReduce, sal_uLong nFlags, const Link* pProgress ); sal_Bool ImplVectorize( const Bitmap& rMonoBmp, PolyPolygon& rPolyPoly, - sal_uIntPtr nFlags, const Link* pProgress ); + sal_uLong nFlags, const Link* pProgress ); }; #endif diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index f7293781c91b..ff3c9a20ef06 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -412,8 +412,8 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup ) ShortToSVBT16( (sal_uInt16)(pJobData->meOrientation), aOldJobData.nOrientation ); ShortToSVBT16( pJobData->mnPaperBin, aOldJobData.nPaperBin ); ShortToSVBT16( (sal_uInt16)(pJobData->mePaperFormat), aOldJobData.nPaperFormat ); - UInt32ToSVBT32( (sal_uIntPtr)(pJobData->mnPaperWidth), aOldJobData.nPaperWidth ); - UInt32ToSVBT32( (sal_uIntPtr)(pJobData->mnPaperHeight), aOldJobData.nPaperHeight ); + UInt32ToSVBT32( (sal_uLong)(pJobData->mnPaperWidth), aOldJobData.nPaperWidth ); + UInt32ToSVBT32( (sal_uLong)(pJobData->mnPaperHeight), aOldJobData.nPaperHeight ); ImplOldJobSetupData aOldData; memset( &aOldData, 0, sizeof( aOldData ) ); diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 2946f538dbac..eab6af8444e5 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -1314,7 +1314,7 @@ MetaTextArrayAction::MetaTextArrayAction( const MetaTextArrayAction& rAction ) : { if( rAction.mpDXAry ) { - const sal_uIntPtr nAryLen = mnLen; + const sal_uLong nAryLen = mnLen; mpDXAry = new sal_Int32[ nAryLen ]; memcpy( mpDXAry, rAction.mpDXAry, nAryLen * sizeof( sal_Int32 ) ); @@ -1336,7 +1336,7 @@ MetaTextArrayAction::MetaTextArrayAction( const Point& rStartPt, mnIndex ( nIndex ), mnLen ( ( nLen == STRING_LEN ) ? rStr.Len() : nLen ) { - const sal_uIntPtr nAryLen = pDXAry ? mnLen : 0; + const sal_uLong nAryLen = pDXAry ? mnLen : 0; if( nAryLen ) { @@ -1414,7 +1414,7 @@ void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm << mnLen; rOStm << nAryLen; - for( sal_uIntPtr i = 0UL; i < nAryLen; i++ ) + for( sal_uLong i = 0UL; i < nAryLen; i++ ) rOStm << mpDXAry[ i ]; sal_uInt16 j, nLen = maStr.Len(); // version 2 @@ -1456,7 +1456,7 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) mpDXAry = new (std::nothrow)sal_Int32[ mnLen ]; if ( mpDXAry ) { - sal_uIntPtr i; + sal_uLong i; for( i = 0UL; i < nAryLen; i++ ) rIStm >> mpDXAry[ i ]; @@ -1536,7 +1536,7 @@ void MetaStretchTextAction::Move( long nHorzMove, long nVertMove ) void MetaStretchTextAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); - mnWidth = (sal_uIntPtr)FRound( mnWidth * fabs(fScaleX) ); + mnWidth = (sal_uLong)FRound( mnWidth * fabs(fScaleX) ); } // ------------------------------------------------------------------------ diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/gdi/octree.cxx index f576e3993e05..658856dbe100 100644 --- a/vcl/source/gdi/octree.cxx +++ b/vcl/source/gdi/octree.cxx @@ -42,12 +42,12 @@ static sal_uInt8 pImplMask[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 // - NodeCache - // ------------- -ImpNodeCache::ImpNodeCache( const sal_uIntPtr nInitSize ) : +ImpNodeCache::ImpNodeCache( const sal_uLong nInitSize ) : pActNode( NULL ) { - const sal_uIntPtr nSize = nInitSize + 4; + const sal_uLong nSize = nInitSize + 4; - for( sal_uIntPtr i = 0; i < nSize; i++ ) + for( sal_uLong i = 0; i < nSize; i++ ) { OctreeNode* pNewNode = new NODE; @@ -73,7 +73,7 @@ ImpNodeCache::~ImpNodeCache() // - Octree - // ---------- -Octree::Octree( sal_uIntPtr nColors ) : +Octree::Octree( sal_uLong nColors ) : nMax ( nColors ), nLeafCount ( 0L ), pTree ( NULL ), @@ -85,7 +85,7 @@ Octree::Octree( sal_uIntPtr nColors ) : // ------------------------------------------------------------------------ -Octree::Octree( const BitmapReadAccess& rReadAcc, sal_uIntPtr nColors ) : +Octree::Octree( const BitmapReadAccess& rReadAcc, sal_uLong nColors ) : nMax ( nColors ), nLeafCount ( 0L ), pTree ( NULL ), @@ -166,7 +166,7 @@ void Octree::ImplCreateOctree() void Octree::ImplDeleteOctree( PPNODE ppNode ) { - for ( sal_uIntPtr i = 0UL; i < 8UL; i++ ) + for ( sal_uLong i = 0UL; i < 8UL; i++ ) { if ( (*ppNode)->pChild[ i ] ) ImplDeleteOctree( &(*ppNode)->pChild[ i ] ); @@ -204,9 +204,9 @@ void Octree::ImplAdd( PPNODE ppNode ) } else { - const sal_uIntPtr nShift = 7 - nLevel; + const sal_uLong nShift = 7 - nLevel; const sal_uInt8 cMask = pImplMask[ nLevel ]; - const sal_uIntPtr nIndex = ( ( ( pColor->GetRed() & cMask ) >> nShift ) << 2 ) | + const sal_uLong nIndex = ( ( ( pColor->GetRed() & cMask ) >> nShift ) << 2 ) | ( ( ( pColor->GetGreen() & cMask ) >> nShift ) << 1 ) | ( ( pColor->GetBlue() & cMask ) >> nShift ); @@ -219,12 +219,12 @@ void Octree::ImplAdd( PPNODE ppNode ) void Octree::ImplReduce() { - sal_uIntPtr i; + sal_uLong i; PNODE pNode; - sal_uIntPtr nRedSum = 0L; - sal_uIntPtr nGreenSum = 0L; - sal_uIntPtr nBlueSum = 0L; - sal_uIntPtr nChilds = 0L; + sal_uLong nRedSum = 0L; + sal_uLong nGreenSum = 0L; + sal_uLong nBlueSum = 0L; + sal_uLong nChilds = 0L; for ( i = OCTREE_BITS - 1; i && !pReduce[i]; i-- ) {} @@ -266,7 +266,7 @@ void Octree::CreatePalette( PNODE pNode ) (sal_uInt8) ( (double) pNode->nGreen / pNode->nCount ), (sal_uInt8) ( (double) pNode->nBlue / pNode->nCount ) ); } - else for( sal_uIntPtr i = 0UL; i < 8UL; i++ ) + else for( sal_uLong i = 0UL; i < 8UL; i++ ) if( pNode->pChild[ i ] ) CreatePalette( pNode->pChild[ i ] ); @@ -280,9 +280,9 @@ void Octree::GetPalIndex( PNODE pNode ) nPalIndex = pNode->nPalIndex; else { - const sal_uIntPtr nShift = 7 - nLevel; + const sal_uLong nShift = 7 - nLevel; const sal_uInt8 cMask = pImplMask[ nLevel++ ]; - const sal_uIntPtr nIndex = ( ( ( pColor->GetRed() & cMask ) >> nShift ) << 2 ) | + const sal_uLong nIndex = ( ( ( pColor->GetRed() & cMask ) >> nShift ) << 2 ) | ( ( ( pColor->GetGreen() & cMask ) >> nShift ) << 1 ) | ( ( pColor->GetBlue() & cMask ) >> nShift ); @@ -297,22 +297,22 @@ void Octree::GetPalIndex( PNODE pNode ) InverseColorMap::InverseColorMap( const BitmapPalette& rPal ) : nBits( 8 - OCTREE_BITS ) { - sal_uIntPtr* cdp; + sal_uLong* cdp; sal_uInt8* crgbp; - const sal_uIntPtr nColorMax = 1 << OCTREE_BITS; - const sal_uIntPtr xsqr = 1 << ( nBits << 1 ); - const sal_uIntPtr xsqr2 = xsqr << 1; - const sal_uIntPtr nColors = rPal.GetEntryCount(); + const sal_uLong nColorMax = 1 << OCTREE_BITS; + const sal_uLong xsqr = 1 << ( nBits << 1 ); + const sal_uLong xsqr2 = xsqr << 1; + const sal_uLong nColors = rPal.GetEntryCount(); const long x = 1L << nBits; const long x2 = x >> 1L; - sal_uIntPtr r, g, b; + sal_uLong r, g, b; long rxx, gxx, bxx; long rdist, gdist, bdist; long crinc, cginc, cbinc; ImplCreateBuffers( nColorMax ); - for( sal_uIntPtr nIndex = 0; nIndex < nColors; nIndex++ ) + for( sal_uLong nIndex = 0; nIndex < nColors; nIndex++ ) { const BitmapColor& rColor = rPal[ (sal_uInt16) nIndex ]; const sal_uInt8 cRed = rColor.GetRed(); @@ -328,7 +328,7 @@ InverseColorMap::InverseColorMap( const BitmapPalette& rPal ) : cginc = ( xsqr - ( cGreen << nBits ) ) << 1L; cbinc = ( xsqr - ( cBlue << nBits ) ) << 1L; - cdp = (sal_uIntPtr*) pBuffer; + cdp = (sal_uLong*) pBuffer; crgbp = pMap; for( r = 0, rxx = crinc; r < nColorMax; rdist += rxx, r++, rxx += xsqr2 ) @@ -356,10 +356,10 @@ InverseColorMap::~InverseColorMap() // ------------------------------------------------------------------------ -void InverseColorMap::ImplCreateBuffers( const sal_uIntPtr nMax ) +void InverseColorMap::ImplCreateBuffers( const sal_uLong nMax ) { - const sal_uIntPtr nCount = nMax * nMax * nMax; - const sal_uIntPtr nSize = nCount * sizeof( sal_uIntPtr ); + const sal_uLong nCount = nMax * nMax * nMax; + const sal_uLong nSize = nCount * sizeof( sal_uLong ); pMap = (sal_uInt8*) rtl_allocateMemory( nCount ); memset( pMap, 0x00, nCount ); diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx index f115e5a2e633..ad89fda760b9 100644 --- a/vcl/source/gdi/outdev.cxx +++ b/vcl/source/gdi/outdev.cxx @@ -122,7 +122,7 @@ struct ImplObjStack Point* mpRefPoint; TextAlign meTextAlign; RasterOp meRasterOp; - sal_uIntPtr mnTextLayoutMode; + sal_uLong mnTextLayoutMode; LanguageType meTextLanguage; sal_uInt16 mnFlags; }; @@ -228,7 +228,7 @@ bool OutputDevice::ImplSelectClipRegion( const Region& rRegion, SalGraphics* pGr long nY; long nWidth; long nHeight; - sal_uIntPtr nRectCount; + sal_uLong nRectCount; ImplRegionInfo aInfo; sal_Bool bRegionRect; sal_Bool bClipRegion = sal_True; @@ -1981,7 +1981,7 @@ void OutputDevice::IntersectClipRegion( const Region& rRegion ) // ----------------------------------------------------------------------- -void OutputDevice::SetDrawMode( sal_uIntPtr nDrawMode ) +void OutputDevice::SetDrawMode( sal_uLong nDrawMode ) { DBG_TRACE1( "OutputDevice::SetDrawMode( %lx )", nDrawMode ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -3403,12 +3403,12 @@ sal_uInt16 OutputDevice::GetAlphaBitCount() const // ----------------------------------------------------------------------- -sal_uIntPtr OutputDevice::GetColorCount() const +sal_uLong OutputDevice::GetColorCount() const { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); const sal_uInt16 nBitCount = GetBitCount(); - return( ( nBitCount > 31 ) ? ULONG_MAX : ( ( (sal_uIntPtr) 1 ) << nBitCount) ); + return( ( nBitCount > 31 ) ? ULONG_MAX : ( ( (sal_uLong) 1 ) << nBitCount) ); } // ----------------------------------------------------------------------- diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx index 4f964e119c69..6d98f79dcaaa 100755 --- a/vcl/source/gdi/outdev2.cxx +++ b/vcl/source/gdi/outdev2.cxx @@ -87,17 +87,17 @@ DBG_NAMEEX( OutputDevice ) // - externals - // ------------- -extern sal_uIntPtr nVCLRLut[ 6 ]; -extern sal_uIntPtr nVCLGLut[ 6 ]; -extern sal_uIntPtr nVCLBLut[ 6 ]; -extern sal_uIntPtr nVCLDitherLut[ 256 ]; -extern sal_uIntPtr nVCLLut[ 256 ]; +extern sal_uLong nVCLRLut[ 6 ]; +extern sal_uLong nVCLGLut[ 6 ]; +extern sal_uLong nVCLBLut[ 6 ]; +extern sal_uLong nVCLDitherLut[ 256 ]; +extern sal_uLong nVCLLut[ 256 ]; // ======================================================================= -sal_uIntPtr ImplAdjustTwoRect( TwoRect& rTwoRect, const Size& rSizePix ) +sal_uLong ImplAdjustTwoRect( TwoRect& rTwoRect, const Size& rSizePix ) { - sal_uIntPtr nMirrFlags = 0; + sal_uLong nMirrFlags = 0; if ( rTwoRect.mnDestWidth < 0 ) { @@ -578,7 +578,7 @@ void OutputDevice::DrawBitmap( const Point& rDestPt, const Size& rDestSize, void OutputDevice::ImplDrawBitmap( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, - const Bitmap& rBitmap, const sal_uIntPtr nAction ) + const Bitmap& rBitmap, const sal_uLong nAction ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -655,7 +655,7 @@ void OutputDevice::ImplDrawBitmap( const Point& rDestPt, const Size& rDestSize, aPosAry.mnDestWidth = ImplLogicWidthToDevicePixel( rDestSize.Width() ); aPosAry.mnDestHeight = ImplLogicHeightToDevicePixel( rDestSize.Height() ); - const sal_uIntPtr nMirrFlags = ImplAdjustTwoRect( aPosAry, aBmp.GetSizePixel() ); + const sal_uLong nMirrFlags = ImplAdjustTwoRect( aPosAry, aBmp.GetSizePixel() ); if ( aPosAry.mnSrcWidth && aPosAry.mnSrcHeight && aPosAry.mnDestWidth && aPosAry.mnDestHeight ) { @@ -789,7 +789,7 @@ void OutputDevice::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize, void OutputDevice::ImplDrawBitmapEx( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, - const BitmapEx& rBitmapEx, const sal_uIntPtr nAction ) + const BitmapEx& rBitmapEx, const sal_uLong nAction ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -902,7 +902,7 @@ void OutputDevice::ImplDrawBitmapEx( const Point& rDestPt, const Size& rDestSize aPosAry.mnDestWidth = ImplLogicWidthToDevicePixel( rDestSize.Width() ); aPosAry.mnDestHeight = ImplLogicHeightToDevicePixel( rDestSize.Height() ); - const sal_uIntPtr nMirrFlags = ImplAdjustTwoRect( aPosAry, aBmpEx.GetSizePixel() ); + const sal_uLong nMirrFlags = ImplAdjustTwoRect( aPosAry, aBmpEx.GetSizePixel() ); if( aPosAry.mnSrcWidth && aPosAry.mnSrcHeight && aPosAry.mnDestWidth && aPosAry.mnDestHeight ) { @@ -1096,7 +1096,7 @@ void OutputDevice::DrawMask( const Point& rDestPt, const Size& rDestSize, void OutputDevice::ImplDrawMask( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, const Bitmap& rBitmap, const Color& rMaskColor, - const sal_uIntPtr nAction ) + const sal_uLong nAction ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -1150,7 +1150,7 @@ void OutputDevice::ImplDrawMask( const Point& rDestPt, const Size& rDestSize, aPosAry.mnDestHeight = ImplLogicHeightToDevicePixel( rDestSize.Height() ); // spiegeln via Koordinaten wollen wir nicht - const sal_uIntPtr nMirrFlags = ImplAdjustTwoRect( aPosAry, pImpBmp->ImplGetSize() ); + const sal_uLong nMirrFlags = ImplAdjustTwoRect( aPosAry, pImpBmp->ImplGetSize() ); // check if output is necessary if( aPosAry.mnSrcWidth && aPosAry.mnSrcHeight && aPosAry.mnDestWidth && aPosAry.mnDestHeight ) @@ -1667,7 +1667,7 @@ Bitmap OutputDevice::ImplBlendWithAlpha( Bitmap aBmp, for( nX = 0, nOutX = nOffX; nX < nDstWidth; nX++, nOutX++ ) { const long nMapX = pMapX[ nX ]; - const sal_uIntPtr nD = nVCLDitherLut[ nModY | ( nOutX & 0x0FL ) ]; + const sal_uLong nD = nVCLDitherLut[ nModY | ( nOutX & 0x0FL ) ]; aSrcCol = pP->GetColor( nMapY, nMapX ); aDstCol = pB->GetColor( nY, nX ); @@ -1784,7 +1784,7 @@ Bitmap OutputDevice::ImplBlend( Bitmap aBmp, for( nX = 0, nOutX = nOffX; nX < nDstWidth; nX++, nOutX++ ) { const long nMapX = pMapX[ nX ]; - const sal_uIntPtr nD = nVCLDitherLut[ nModY | ( nOutX & 0x0FL ) ]; + const sal_uLong nD = nVCLDitherLut[ nModY | ( nOutX & 0x0FL ) ]; aDstCol = pB->GetColor( nY, nX ); aDstCol.Merge( pP->GetColor( nMapY, nMapX ), (sal_uInt8) pA->GetPixel( nMapY, nMapX ) ); @@ -2097,7 +2097,7 @@ void OutputDevice::ImplPrintTransparent( const Bitmap& rBmp, const Bitmap& rMask if( !rBmp.IsEmpty() && aSrcRect.GetWidth() && aSrcRect.GetHeight() && aDestSz.Width() && aDestSz.Height() ) { Bitmap aPaint( rBmp ), aMask( rMask ); - sal_uIntPtr nMirrFlags = 0UL; + sal_uLong nMirrFlags = 0UL; if( aMask.GetBitCount() > 1 ) aMask.Convert( BMP_CONVERSION_1BIT_THRESHOLD ); @@ -2195,7 +2195,7 @@ void OutputDevice::ImplPrintMask( const Bitmap& rMask, const Color& rMaskColor, if( !rMask.IsEmpty() && aSrcRect.GetWidth() && aSrcRect.GetHeight() && aDestSz.Width() && aDestSz.Height() ) { Bitmap aMask( rMask ); - sal_uIntPtr nMirrFlags = 0UL; + sal_uLong nMirrFlags = 0UL; if( aMask.GetBitCount() > 1 ) aMask.Convert( BMP_CONVERSION_1BIT_THRESHOLD ); diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index d093047872a0..a846f9902634 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -497,7 +497,7 @@ static void ImplFontSubstitute( String& rFontName, // ----------------------------------------------------------------------- Font OutputDevice::GetDefaultFont( sal_uInt16 nType, LanguageType eLang, - sal_uIntPtr nFlags, const OutputDevice* pOutDev ) + sal_uLong nFlags, const OutputDevice* pOutDev ) { DBG_TRACE( "OutputDevice::GetDefaultFont()" ); @@ -730,7 +730,7 @@ static unsigned ImplIsCJKFont( const String& rFontName ) // ----------------------------------------------------------------------- -static void ImplCalcType( sal_uIntPtr& rType, FontWeight& rWeight, FontWidth& rWidth, +static void ImplCalcType( sal_uLong& rType, FontWeight& rWeight, FontWidth& rWidth, FontFamily eFamily, const FontNameAttr* pFontAttr ) { if ( eFamily != FAMILY_DONTKNOW ) @@ -1646,7 +1646,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindBySubstFontAttr( const utl::FontNa } // use known attributes from the configuration to find a matching substitute - const sal_uIntPtr nSearchType = rFontAttr.Type; + const sal_uLong nSearchType = rFontAttr.Type; if( nSearchType != 0 ) { const FontWeight eSearchWeight = rFontAttr.Weight; @@ -1699,7 +1699,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByLocale(com::sun::star::lang::Loc // ----------------------------------------------------------------------- -ImplDevFontListData* ImplDevFontList::ImplFindByAttributes( sal_uIntPtr nSearchType, +ImplDevFontListData* ImplDevFontList::ImplFindByAttributes( sal_uLong nSearchType, FontWeight eSearchWeight, FontWidth eSearchWidth, FontFamily /*eSearchFamily*/, FontItalic eSearchItalic, const String& rSearchFamilyName ) const { @@ -1717,7 +1717,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByAttributes( sal_uIntPtr nSearchT long nTestMatch; long nBestMatch = 40000; - sal_uIntPtr nBestType = 0; + sal_uLong nBestType = 0; DevFontList::const_iterator it = maDevFontList.begin(); for(; it != maDevFontList.end(); ++it ) @@ -1725,7 +1725,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByAttributes( sal_uIntPtr nSearchT ImplDevFontListData* pData = (*it).second; // Get all information about the matching font - sal_uIntPtr nMatchType = pData->mnMatchType; + sal_uLong nMatchType = pData->mnMatchType; FontWeight eMatchWeight= pData->meMatchWeight; FontWidth eMatchWidth = pData->meMatchWidth; @@ -2565,7 +2565,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( ImplFontSelectData& rFSD, String aSearchFamilyName; FontWeight eSearchWeight = rFSD.meWeight; FontWidth eSearchWidth = rFSD.meWidthType; - sal_uIntPtr nSearchType = 0; + sal_uLong nSearchType = 0; FontSubstConfiguration::getMapName( aSearchName, aSearchShortName, aSearchFamilyName, eSearchWeight, eSearchWidth, nSearchType ); @@ -2637,7 +2637,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( ImplFontSelectData& rFSD, String aTempShortName; String aTempFamilyName; - sal_uIntPtr nTempType = 0; + sal_uLong nTempType = 0; FontWeight eTempWeight = rFSD.meWeight; FontWidth eTempWidth = WIDTH_DONTKNOW; FontSubstConfiguration::getMapName( aSearchName, aTempShortName, aTempFamilyName, @@ -4057,7 +4057,7 @@ void OutputDevice::ImplDrawStrikeoutChar( long nBaseX, long nBaseY, nBaseY += nDistY; // strikeout text has to be left aligned - sal_uIntPtr nOrigTLM = mnTextLayoutMode; + sal_uLong nOrigTLM = mnTextLayoutMode; mnTextLayoutMode = TEXT_LAYOUT_BIDI_STRONG | TEXT_LAYOUT_COMPLEX_DISABLED; pLayout = ImplLayout( aStrikeoutText, 0, STRING_LEN ); mnTextLayoutMode = nOrigTLM; @@ -5133,7 +5133,7 @@ void OutputDevice::SetFont( const Font& rNewFont ) // ----------------------------------------------------------------------- -void OutputDevice::SetLayoutMode( sal_uIntPtr nTextLayoutMode ) +void OutputDevice::SetLayoutMode( sal_uLong nTextLayoutMode ) { DBG_TRACE( "OutputDevice::SetTextLayoutMode()" ); @@ -5714,7 +5714,7 @@ long OutputDevice::GetTextArray( const String& rStr, sal_Int32* pDXAry, if( nIndex >= rStr.Len() ) return 0; - if( (sal_uIntPtr)nIndex+nLen >= rStr.Len() ) + if( (sal_uLong)nIndex+nLen >= rStr.Len() ) nLen = rStr.Len() - nIndex; // do layout @@ -5763,7 +5763,7 @@ bool OutputDevice::GetCaretPositions( const XubString& rStr, sal_Int32* pCaretXA if( nIndex >= rStr.Len() ) return false; - if( (sal_uIntPtr)nIndex+nLen >= rStr.Len() ) + if( (sal_uLong)nIndex+nLen >= rStr.Len() ) nLen = rStr.Len() - nIndex; // layout complex text @@ -5822,7 +5822,7 @@ bool OutputDevice::GetCaretPositions( const XubString& rStr, sal_Int32* pCaretXA // ----------------------------------------------------------------------- -void OutputDevice::DrawStretchText( const Point& rStartPt, sal_uIntPtr nWidth, +void OutputDevice::DrawStretchText( const Point& rStartPt, sal_uLong nWidth, const String& rStr, xub_StrLen nIndex, xub_StrLen nLen ) { @@ -5854,7 +5854,7 @@ ImplLayoutArgs OutputDevice::ImplPrepareLayoutArgs( String& rStr, { // get string length for calculating extents xub_StrLen nEndIndex = rStr.Len(); - if( (sal_uIntPtr)nMinIndex + nLen < nEndIndex ) + if( (sal_uLong)nMinIndex + nLen < nEndIndex ) nEndIndex = nMinIndex + nLen; // don't bother if there is nothing to do @@ -6983,7 +6983,7 @@ void OutputDevice::DrawCtrlText( const Point& rPos, const XubString& rStr, if( nIndex >= rStr.Len() ) return; - if( (sal_uIntPtr)nIndex+nLen >= rStr.Len() ) + if( (sal_uLong)nIndex+nLen >= rStr.Len() ) nLen = rStr.Len() - nIndex; XubString aStr = rStr; @@ -7111,7 +7111,7 @@ long OutputDevice::GetCtrlTextWidth( const String& rStr, if ( nMnemonicPos < nIndex ) nIndex--; else if ( (nLen < STRING_LEN) && - (nMnemonicPos >= nIndex) && (nMnemonicPos < (sal_uIntPtr)(nIndex+nLen)) ) + (nMnemonicPos >= nIndex) && (nMnemonicPos < (sal_uLong)(nIndex+nLen)) ) nLen--; } return GetTextWidth( aStr, nIndex, nLen ); @@ -7496,7 +7496,7 @@ xub_StrLen OutputDevice::ValidateKashidas ( const String& rTxt, // TODO: best is to get rid of this method completely -sal_uIntPtr OutputDevice::GetKerningPairCount() const +sal_uLong OutputDevice::GetKerningPairCount() const { DBG_TRACE( "OutputDevice::GetKerningPairCount()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -7522,7 +7522,7 @@ inline bool CmpKernData( const KerningPair& a, const KerningPair& b ) } // TODO: best is to get rid of this method completely -void OutputDevice::GetKerningPairs( sal_uIntPtr nRequestedPairs, KerningPair* pKernPairs ) const +void OutputDevice::GetKerningPairs( sal_uLong nRequestedPairs, KerningPair* pKernPairs ) const { DBG_TRACE( "OutputDevice::GetKerningPairs()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -7571,7 +7571,7 @@ sal_Bool OutputDevice::GetGlyphBoundRects( const Point& rOrigin, const String& r sal_Bool OutputDevice::GetTextBoundRect( Rectangle& rRect, const String& rStr, xub_StrLen nBase, xub_StrLen nIndex, xub_StrLen nLen, - sal_uIntPtr nLayoutWidth, const sal_Int32* pDXAry ) const + sal_uLong nLayoutWidth, const sal_Int32* pDXAry ) const { DBG_TRACE( "OutputDevice::GetTextBoundRect()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -7749,7 +7749,7 @@ sal_Bool OutputDevice::GetTextBoundRect( Rectangle& rRect, sal_Bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector, const String& rStr, xub_StrLen nBase, xub_StrLen nIndex, xub_StrLen nLen, - sal_Bool bOptimize, sal_uIntPtr nTWidth, const sal_Int32* pDXArray ) const + sal_Bool bOptimize, sal_uLong nTWidth, const sal_Int32* pDXArray ) const { // the fonts need to be initialized if( mbNewFont ) @@ -7978,7 +7978,7 @@ sal_Bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector sal_Bool OutputDevice::GetTextOutlines( PolyPolyVector& rResultVector, const String& rStr, xub_StrLen nBase, xub_StrLen nIndex, - xub_StrLen nLen, sal_Bool bOptimize, sal_uIntPtr nTWidth, const sal_Int32* pDXArray ) const + xub_StrLen nLen, sal_Bool bOptimize, sal_uLong nTWidth, const sal_Int32* pDXArray ) const { rResultVector.clear(); @@ -8001,7 +8001,7 @@ sal_Bool OutputDevice::GetTextOutlines( PolyPolyVector& rResultVector, sal_Bool OutputDevice::GetTextOutline( PolyPolygon& rPolyPoly, const String& rStr, xub_StrLen nBase, xub_StrLen nIndex, xub_StrLen nLen, - sal_Bool bOptimize, sal_uIntPtr nTWidth, const sal_Int32* pDXArray ) const + sal_Bool bOptimize, sal_uLong nTWidth, const sal_Int32* pDXArray ) const { rPolyPoly.Clear(); @@ -8087,7 +8087,7 @@ xub_StrLen OutputDevice::HasGlyphs( const Font& rTempFont, const String& rStr, if( nIndex >= rStr.Len() ) return nIndex; xub_StrLen nEnd = nIndex + nLen; - if( (sal_uIntPtr)nIndex+nLen > rStr.Len() ) + if( (sal_uLong)nIndex+nLen > rStr.Len() ) nEnd = rStr.Len(); DBG_ASSERT( nIndex < nEnd, "StartPos >= EndPos?" ); diff --git a/vcl/source/gdi/outdev5.cxx b/vcl/source/gdi/outdev5.cxx index aaac45697eaa..627f75e88282 100644 --- a/vcl/source/gdi/outdev5.cxx +++ b/vcl/source/gdi/outdev5.cxx @@ -50,7 +50,7 @@ DBG_NAMEEX( OutputDevice ) // ======================================================================= void OutputDevice::DrawRect( const Rectangle& rRect, - sal_uIntPtr nHorzRound, sal_uIntPtr nVertRound ) + sal_uLong nHorzRound, sal_uLong nVertRound ) { DBG_TRACE( "OutputDevice::DrawRoundRect()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx index f479da39c546..eb4b76fb4b41 100644 --- a/vcl/source/gdi/outdev6.cxx +++ b/vcl/source/gdi/outdev6.cxx @@ -59,7 +59,7 @@ DBG_NAMEEX( OutputDevice ) // ------------------------------------------------------------------------ -void OutputDevice::DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uIntPtr nFlags ) +void OutputDevice::DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uLong nFlags ) { DBG_TRACE( "OutputDevice::DrawGrid()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx index 3b546cd22c1d..1bdd86e13ecb 100644 --- a/vcl/source/gdi/outmap.cxx +++ b/vcl/source/gdi/outmap.cxx @@ -134,7 +134,7 @@ static void ImplCalcBigIntThreshold( long nDPIX, long nDPIY, { // Schwellenwerte fuer BigInt Arithmetik berechnen long nDenomHalfX = rMapRes.mnMapScDenomX / 2; - sal_uIntPtr nDenomX = rMapRes.mnMapScDenomX; + sal_uLong nDenomX = rMapRes.mnMapScDenomX; long nProductX = nDPIX * rMapRes.mnMapScNumX; if ( !nProductX ) @@ -145,9 +145,9 @@ static void ImplCalcBigIntThreshold( long nDPIX, long nDPIY, if ( !nDenomX ) rThresRes.mnThresPixToLogX = LONG_MAX; else if ( nProductX >= 0 ) - rThresRes.mnThresPixToLogX = (long)(((sal_uIntPtr)LONG_MAX - (sal_uIntPtr)( nProductX/2)) / nDenomX); + rThresRes.mnThresPixToLogX = (long)(((sal_uLong)LONG_MAX - (sal_uLong)( nProductX/2)) / nDenomX); else - rThresRes.mnThresPixToLogX = (long)(((sal_uIntPtr)LONG_MAX + (sal_uIntPtr)(-nProductX/2)) / nDenomX); + rThresRes.mnThresPixToLogX = (long)(((sal_uLong)LONG_MAX + (sal_uLong)(-nProductX/2)) / nDenomX); } if ( nDPIY && (LONG_MAX / nDPIY < Abs( rMapRes.mnMapScNumY ) ) ) // #111139# avoid div by zero @@ -159,7 +159,7 @@ static void ImplCalcBigIntThreshold( long nDPIX, long nDPIY, { // Schwellenwerte fuer BigInt Arithmetik berechnen long nDenomHalfY = rMapRes.mnMapScDenomY / 2; - sal_uIntPtr nDenomY = rMapRes.mnMapScDenomY; + sal_uLong nDenomY = rMapRes.mnMapScDenomY; long nProductY = nDPIY * rMapRes.mnMapScNumY; if ( !nProductY ) @@ -170,9 +170,9 @@ static void ImplCalcBigIntThreshold( long nDPIX, long nDPIY, if ( !nDenomY ) rThresRes.mnThresPixToLogY = LONG_MAX; else if ( nProductY >= 0 ) - rThresRes.mnThresPixToLogY = (long)(((sal_uIntPtr)LONG_MAX - (sal_uIntPtr)( nProductY/2)) / nDenomY); + rThresRes.mnThresPixToLogY = (long)(((sal_uLong)LONG_MAX - (sal_uLong)( nProductY/2)) / nDenomY); else - rThresRes.mnThresPixToLogY = (long)(((sal_uIntPtr)LONG_MAX + (sal_uIntPtr)(-nProductY/2)) / nDenomY); + rThresRes.mnThresPixToLogY = (long)(((sal_uLong)LONG_MAX + (sal_uLong)(-nProductY/2)) / nDenomY); } #ifdef USE_64BIT_INTS diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx index 8e0f75ba1fe0..445365e83dd4 100644 --- a/vcl/source/gdi/pdfwriter.cxx +++ b/vcl/source/gdi/pdfwriter.cxx @@ -107,7 +107,7 @@ void PDFWriter::DrawTextArray( void PDFWriter::DrawStretchText( const Point& rStartPt, - sal_uIntPtr nWidth, + sal_uLong nWidth, const XubString& rStr, xub_StrLen nIndex, xub_StrLen nLen ) @@ -148,7 +148,7 @@ void PDFWriter::DrawRect( const Rectangle& rRect ) ((PDFWriterImpl*)pImplementation)->drawRectangle( rRect ); } -void PDFWriter::DrawRect( const Rectangle& rRect, sal_uIntPtr nHorzRound, sal_uIntPtr nVertRound ) +void PDFWriter::DrawRect( const Rectangle& rRect, sal_uLong nHorzRound, sal_uLong nVertRound ) { ((PDFWriterImpl*)pImplementation)->drawRectangle( rRect, nHorzRound, nVertRound ); } @@ -361,7 +361,7 @@ void PDFWriter::SetAntialiasing( sal_uInt16 nMode ) ((PDFWriterImpl*)pImplementation)->setAntiAlias( (sal_Int32)nMode ); } -void PDFWriter::SetLayoutMode( sal_uIntPtr nMode ) +void PDFWriter::SetLayoutMode( sal_uLong nMode ) { ((PDFWriterImpl*)pImplementation)->setLayoutMode( (sal_Int32)nMode ); } diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 9aa203b513c6..32f534129e07 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -2058,7 +2058,7 @@ bool PDFWriterImpl::compressStream( SvMemoryStream* pStream ) { #ifndef DEBUG_DISABLE_PDFCOMPRESSION pStream->Seek( STREAM_SEEK_TO_END ); - sal_uIntPtr nEndPos = pStream->Tell(); + sal_uLong nEndPos = pStream->Tell(); pStream->Seek( STREAM_SEEK_TO_BEGIN ); ZCodec* pCodec = new ZCodec( 0x4000, 0x4000 ); SvMemoryStream aStream; @@ -2122,7 +2122,7 @@ bool PDFWriterImpl::writeBuffer( const void* pBuffer, sal_uInt64 nBytes ) sal_uInt64 nWritten; if( m_pCodec ) { - m_pCodec->Write( *m_pMemStream, static_cast<const sal_uInt8*>(pBuffer), (sal_uIntPtr)nBytes ); + m_pCodec->Write( *m_pMemStream, static_cast<const sal_uInt8*>(pBuffer), (sal_uLong)nBytes ); nWritten = nBytes; } else @@ -7723,7 +7723,7 @@ void PDFWriterImpl::drawTextArray( const Point& rPos, const String& rText, const } } -void PDFWriterImpl::drawStretchText( const Point& rPos, sal_uIntPtr nWidth, const String& rText, xub_StrLen nIndex, xub_StrLen nLen, bool bTextLines ) +void PDFWriterImpl::drawStretchText( const Point& rPos, sal_uLong nWidth, const String& rText, xub_StrLen nIndex, xub_StrLen nLen, bool bTextLines ) { MARK( "drawStretchText" ); @@ -8293,7 +8293,7 @@ void PDFWriterImpl::drawStrikeoutChar( const Point& rPos, long nWidth, FontStrik } // strikeout string is left aligned non-CTL text - sal_uIntPtr nOrigTLM = m_pReferenceDevice->GetLayoutMode(); + sal_uLong nOrigTLM = m_pReferenceDevice->GetLayoutMode(); m_pReferenceDevice->SetLayoutMode( TEXT_LAYOUT_BIDI_STRONG|TEXT_LAYOUT_COMPLEX_DISABLED ); drawText( rPos, aStrikeout, 0, aStrikeout.Len(), false ); m_pReferenceDevice->SetLayoutMode( nOrigTLM ); @@ -9249,7 +9249,7 @@ bool PDFWriterImpl::writeTransparentObject( TransparencyEmit& rObject ) bool bFlateFilter = compressStream( rObject.m_pContentStream ); rObject.m_pContentStream->Seek( STREAM_SEEK_TO_END ); - sal_uIntPtr nSize = rObject.m_pContentStream->Tell(); + sal_uLong nSize = rObject.m_pContentStream->Tell(); rObject.m_pContentStream->Seek( STREAM_SEEK_TO_BEGIN ); #if OSL_DEBUG_LEVEL > 1 { diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index d39902bea7fb..b6612d835ca2 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -1211,7 +1211,7 @@ public: /* actual drawing functions */ void drawText( const Point& rPos, const String& rText, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN, bool bTextLines = true ); void drawTextArray( const Point& rPos, const String& rText, const sal_Int32* pDXArray = NULL, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN, bool bTextLines = true ); - void drawStretchText( const Point& rPos, sal_uIntPtr nWidth, const String& rText, + void drawStretchText( const Point& rPos, sal_uLong nWidth, const String& rText, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN, bool bTextLines = true ); void drawText( const Rectangle& rRect, const String& rOrigStr, sal_uInt16 nStyle, bool bTextLines = true ); diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 52d597d91c17..8546df1be705 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -82,7 +82,7 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSiz // #i19065# Negative sizes have mirror semantics on // OutputDevice. BitmapEx and co. have no idea about that, so // perform that _before_ doing anything with aBitmapEx. - sal_uIntPtr nMirrorFlags(BMP_MIRROR_NONE); + sal_uLong nMirrorFlags(BMP_MIRROR_NONE); if( aSize.Width() < 0 ) { aSize.Width() *= -1; diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx index 1d3dc5d15842..3d814bea000e 100644 --- a/vcl/source/gdi/pngwrite.cxx +++ b/vcl/source/gdi/pngwrite.cxx @@ -97,25 +97,25 @@ private: sal_uInt8* mpDeflateInBuf; // as big as the size of a scanline + alphachannel + 1 sal_uInt8* mpPreviousScan; // as big as mpDeflateInBuf sal_uInt8* mpCurrentScan; - sal_uIntPtr mnDeflateInSize; + sal_uLong mnDeflateInSize; - sal_uIntPtr mnWidth, mnHeight; + sal_uLong mnWidth, mnHeight; sal_uInt8 mnBitsPerPixel; sal_uInt8 mnFilterType; // 0 oder 4; - sal_uIntPtr mnBBP; // bytes per pixel ( needed for filtering ) + sal_uLong mnBBP; // bytes per pixel ( needed for filtering ) sal_Bool mbTrueAlpha; - sal_uIntPtr mnCRC; + sal_uLong mnCRC; long mnChunkDatSize; - sal_uIntPtr mnLastPercent; + sal_uLong mnLastPercent; void ImplWritepHYs( const BitmapEx& rBitmapEx ); void ImplWriteIDAT(); - sal_uIntPtr ImplGetFilter( sal_uIntPtr nY, sal_uIntPtr nXStart=0, sal_uIntPtr nXAdd=1 ); + sal_uLong ImplGetFilter( sal_uLong nY, sal_uLong nXStart=0, sal_uLong nXAdd=1 ); void ImplClearFirstScanline(); void ImplWriteTransparent(); sal_Bool ImplWriteHeader(); void ImplWritePalette(); - void ImplOpenChunk( sal_uIntPtr nChunkType ); + void ImplOpenChunk( sal_uLong nChunkType ); void ImplWriteChunk( sal_uInt8 nNumb ); void ImplWriteChunk( sal_uInt32 nNumb ); void ImplWriteChunk( unsigned char* pSource, sal_uInt32 nDatSize ); @@ -348,7 +348,7 @@ sal_Bool PNGWriterImpl::ImplWriteHeader() void PNGWriterImpl::ImplWritePalette() { - const sal_uIntPtr nCount = mpAccess->GetPaletteEntryCount(); + const sal_uLong nCount = mpAccess->GetPaletteEntryCount(); sal_uInt8* pTempBuf = new sal_uInt8[ nCount*3 ]; sal_uInt8* pTmp = pTempBuf; @@ -370,11 +370,11 @@ void PNGWriterImpl::ImplWritePalette() void PNGWriterImpl::ImplWriteTransparent () { - const sal_uIntPtr nTransIndex = mpAccess->GetBestMatchingColor( BMP_COL_TRANS ); + const sal_uLong nTransIndex = mpAccess->GetBestMatchingColor( BMP_COL_TRANS ); ImplOpenChunk( PNGCHUNK_tRNS ); - for ( sal_uIntPtr n = 0UL; n <= nTransIndex; n++ ) + for ( sal_uLong n = 0UL; n <= nTransIndex; n++ ) ImplWriteChunk( ( nTransIndex == n ) ? (sal_uInt8) 0x0 : (sal_uInt8) 0xff ); ImplCloseChunk(); @@ -427,13 +427,13 @@ void PNGWriterImpl::ImplWriteIDAT () SvMemoryStream aOStm; if ( mnInterlaced == 0 ) { - for ( sal_uIntPtr nY = 0; nY < mnHeight; nY++ ) + for ( sal_uLong nY = 0; nY < mnHeight; nY++ ) mpZCodec->Write( aOStm, mpDeflateInBuf, ImplGetFilter( nY ) ); } else { // interlace mode - sal_uIntPtr nY; + sal_uLong nY; for ( nY = 0; nY < mnHeight; nY+=8 ) // pass 1 mpZCodec->Write( aOStm, mpDeflateInBuf, ImplGetFilter ( nY, 0, 8 ) ); ImplClearFirstScanline(); @@ -497,7 +497,7 @@ void PNGWriterImpl::ImplWriteIDAT () // appends to the currently used pass // the complete size of scanline will be returned - in interlace mode zero is possible! -sal_uIntPtr PNGWriterImpl::ImplGetFilter ( sal_uIntPtr nY, sal_uIntPtr nXStart, sal_uIntPtr nXAdd ) +sal_uLong PNGWriterImpl::ImplGetFilter ( sal_uLong nY, sal_uLong nXStart, sal_uLong nXAdd ) { sal_uInt8* pDest; @@ -516,10 +516,10 @@ sal_uIntPtr PNGWriterImpl::ImplGetFilter ( sal_uIntPtr nY, sal_uIntPtr nXStart, { case( 1 ): { - sal_uIntPtr nX, nXIndex; + sal_uLong nX, nXIndex; for ( nX = nXStart, nXIndex = 0; nX < mnWidth; nX+=nXAdd, nXIndex++ ) { - sal_uIntPtr nShift = ( nXIndex & 7 ) ^ 7; + sal_uLong nShift = ( nXIndex & 7 ) ^ 7; if ( nShift == 7) *pDest = (sal_uInt8)(mpAccess->GetPixel( nY, nX ) << nShift); else if ( nShift == 0 ) @@ -533,7 +533,7 @@ sal_uIntPtr PNGWriterImpl::ImplGetFilter ( sal_uIntPtr nY, sal_uIntPtr nXStart, case( 4 ): { - sal_uIntPtr nX, nXIndex; + sal_uLong nX, nXIndex; for ( nX = nXStart, nXIndex = 0; nX < mnWidth; nX+= nXAdd, nXIndex++ ) { if( nXIndex & 1 ) @@ -547,7 +547,7 @@ sal_uIntPtr PNGWriterImpl::ImplGetFilter ( sal_uIntPtr nY, sal_uIntPtr nXStart, case( 8 ): { - for ( sal_uIntPtr nX = nXStart; nX < mnWidth; nX+=nXAdd ) + for ( sal_uLong nX = nXStart; nX < mnWidth; nX+=nXAdd ) *pDest++ = mpAccess->GetPixel( nY, nX ); } break; @@ -563,7 +563,7 @@ sal_uIntPtr PNGWriterImpl::ImplGetFilter ( sal_uIntPtr nY, sal_uIntPtr nXStart, { if ( mbTrueAlpha ) { - for ( sal_uIntPtr nX = nXStart; nX < mnWidth; nX += nXAdd ) + for ( sal_uLong nX = nXStart; nX < mnWidth; nX += nXAdd ) { const BitmapColor& rColor = mpAccess->GetPixel( nY, nX ); *pDest++ = rColor.GetRed(); @@ -576,7 +576,7 @@ sal_uIntPtr PNGWriterImpl::ImplGetFilter ( sal_uIntPtr nY, sal_uIntPtr nXStart, { const BitmapColor aTrans( mpMaskAccess->GetBestMatchingColor( Color( COL_WHITE ) ) ); - for ( sal_uIntPtr nX = nXStart; nX < mnWidth; nX+=nXAdd ) + for ( sal_uLong nX = nXStart; nX < mnWidth; nX+=nXAdd ) { const BitmapColor& rColor = mpAccess->GetPixel( nY, nX ); *pDest++ = rColor.GetRed(); @@ -592,7 +592,7 @@ sal_uIntPtr PNGWriterImpl::ImplGetFilter ( sal_uIntPtr nY, sal_uIntPtr nXStart, } else { - for ( sal_uIntPtr nX = nXStart; nX < mnWidth; nX+=nXAdd ) + for ( sal_uLong nX = nXStart; nX < mnWidth; nX+=nXAdd ) { const BitmapColor& rColor = mpAccess->GetPixel( nY, nX ); *pDest++ = rColor.GetRed(); @@ -609,7 +609,7 @@ sal_uIntPtr PNGWriterImpl::ImplGetFilter ( sal_uIntPtr nY, sal_uIntPtr nXStart, pDest = mpDeflateInBuf; *pDest++ = 4; // filter type - sal_uIntPtr na, nb, nc; + sal_uLong na, nb, nc; long np, npa, npb, npc; sal_uInt8* p1 = mpCurrentScan + 1; // Current Pixel @@ -663,7 +663,7 @@ void PNGWriterImpl::ImplClearFirstScanline() // ------------------------------------------------------------------------ -void PNGWriterImpl::ImplOpenChunk ( sal_uIntPtr nChunkType ) +void PNGWriterImpl::ImplOpenChunk ( sal_uLong nChunkType ) { maChunkSeq.resize( maChunkSeq.size() + 1 ); maChunkSeq.back().nType = nChunkType; diff --git a/vcl/source/gdi/polyscan.cxx b/vcl/source/gdi/polyscan.cxx index 399adf6edfb8..7c69f79d50e6 100644 --- a/vcl/source/gdi/polyscan.cxx +++ b/vcl/source/gdi/polyscan.cxx @@ -152,7 +152,7 @@ PolyScanner::PolyScanner( const Rectangle& rRect ) if( !rRect.IsEmpty() ) { Rectangle aRect( rRect ); - sal_uIntPtr nHeight; + sal_uLong nHeight; aRect.Justify(); mnLeft = aRect.Left(); @@ -161,7 +161,7 @@ PolyScanner::PolyScanner( const Rectangle& rRect ) mnBottom = aRect.Bottom(); mpArray = new PolyScanline[ nHeight = Height() ]; - for( sal_uIntPtr i = 0UL; i < nHeight; i++ ) + for( sal_uLong i = 0UL; i < nHeight; i++ ) mpArray[ i ].Set( mnLeft, mnRight ); } else @@ -197,7 +197,7 @@ PolyScanner::PolyScanner( const Polygon& rPoly ) else { const Rectangle aRect( rPoly.GetBoundRect() ); - sal_uIntPtr nHeight; + sal_uLong nHeight; mnLeft = aRect.Left(); mnTop = aRect.Top(); @@ -240,7 +240,7 @@ PolyScanner::~PolyScanner() // ------------------------------------------------------------------------ -PolyScanline* PolyScanner::operator[]( sal_uIntPtr nPos ) const +PolyScanline* PolyScanner::operator[]( sal_uLong nPos ) const { DBG_ASSERT( nPos < Count(), "nPos out of range!" ); return( mpArray ? ( mpArray + nPos ) : NULL ); diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 19bd3d3c7ad8..04aa30794281 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -676,7 +676,7 @@ void Printer::Compat_OldPrinterMetrics( bool bSet ) // ----------------------------------------------------------------------- -sal_uIntPtr Printer::GetCapabilities( sal_uInt16 nType ) const +sal_uLong Printer::GetCapabilities( sal_uInt16 nType ) const { if ( IsDisplayPrinter() ) return sal_False; @@ -1286,9 +1286,9 @@ void Printer::Error() // ----------------------------------------------------------------------- -sal_uIntPtr Printer::ImplSalPrinterErrorCodeToVCL( sal_uIntPtr nError ) +sal_uLong Printer::ImplSalPrinterErrorCodeToVCL( sal_uLong nError ) { - sal_uIntPtr nVCLError; + sal_uLong nVCLError; switch ( nError ) { case 0: diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index 84c308eef65f..e090a71e4579 100755 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -495,13 +495,13 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl:: if ( IsJobActive() || IsPrinting() ) return sal_False; - sal_uIntPtr nCopies = mnCopyCount; + sal_uLong nCopies = mnCopyCount; bool bCollateCopy = mbCollateCopy; bool bUserCopy = sal_False; if ( nCopies > 1 ) { - sal_uIntPtr nDevCopy; + sal_uLong nDevCopy; if ( bCollateCopy ) nDevCopy = GetCapabilities( PRINTER_CAPABILITIES_COLLATECOPIES ); @@ -1081,9 +1081,9 @@ int PrinterController::getFilteredPageCount() return (getPageCountProtected() * mpImplData->maMultiPage.nRepeat + (nDiv-1)) / nDiv; } -sal_uIntPtr PrinterController::removeTransparencies( GDIMetaFile& i_rIn, GDIMetaFile& o_rOut ) +sal_uLong PrinterController::removeTransparencies( GDIMetaFile& i_rIn, GDIMetaFile& o_rOut ) { - sal_uIntPtr nRestoreDrawMode = mpImplData->mpPrinter->GetDrawMode(); + sal_uLong nRestoreDrawMode = mpImplData->mpPrinter->GetDrawMode(); sal_Int32 nMaxBmpDPIX = mpImplData->mpPrinter->ImplGetDPIX(); sal_Int32 nMaxBmpDPIY = mpImplData->mpPrinter->ImplGetDPIY(); @@ -1181,7 +1181,7 @@ void PrinterController::printFilteredPage( int i_nPage ) } GDIMetaFile aCleanedFile; - sal_uIntPtr nRestoreDrawMode = removeTransparencies( aPageFile, aCleanedFile ); + sal_uLong nRestoreDrawMode = removeTransparencies( aPageFile, aCleanedFile ); mpImplData->mpPrinter->EnableOutput( sal_True ); diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index e6970b9c5d02..9bd2f870860f 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -343,7 +343,7 @@ const char* ImplDbgTestRegion( const void* pObj ) if ( (pImplRegion != &aImplEmptyRegion) && (pImplRegion != &aImplNullRegion) ) { - sal_uIntPtr nCount = 0; + sal_uLong nCount = 0; const ImplRegionBand* pBand = pImplRegion->ImplGetFirstRegionBand(); while ( pBand ) { @@ -2733,14 +2733,14 @@ void Region::ImplEndAddRect() // ----------------------------------------------------------------------- -sal_uIntPtr Region::GetRectCount() const +sal_uLong Region::GetRectCount() const { DBG_CHKTHIS( Region, ImplDbgTestRegion ); ((Region*)this)->ImplPolyPolyRegionToBandRegion(); #ifdef DBG_UTIL - sal_uIntPtr nCount = 0; + sal_uLong nCount = 0; // all bands if not null or empty if ( (mpImplRegion != &aImplEmptyRegion) && (mpImplRegion != &aImplNullRegion) ) diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx index b0635f9c5af5..f3c381147054 100755 --- a/vcl/source/gdi/salgdilayout.cxx +++ b/vcl/source/gdi/salgdilayout.cxx @@ -412,7 +412,7 @@ bool SalGraphics::drawPolyLine( return false; } -void SalGraphics::DrawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev ) +void SalGraphics::DrawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev ) { if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) ) { @@ -425,7 +425,7 @@ void SalGraphics::DrawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry, con drawPolyLine( nPoints, pPtAry ); } -void SalGraphics::DrawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev ) +void SalGraphics::DrawPolygon( sal_uLong nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev ) { if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) ) { @@ -444,10 +444,10 @@ void SalGraphics::DrawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, { // TODO: optimize, reduce new/delete calls SalPoint **pPtAry2 = new SalPoint*[nPoly]; - sal_uIntPtr i; + sal_uLong i; for(i=0; i<nPoly; i++) { - sal_uIntPtr nPoints = pPoints[i]; + sal_uLong nPoints = pPoints[i]; pPtAry2[i] = new SalPoint[ nPoints ]; mirror( nPoints, pPtAry[i], pPtAry2[i], pOutDev ); } @@ -480,7 +480,7 @@ bool SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double /*fT return false; } -sal_Bool SalGraphics::DrawPolyLineBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry, const OutputDevice* pOutDev ) +sal_Bool SalGraphics::DrawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry, const OutputDevice* pOutDev ) { sal_Bool bResult = sal_False; if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) ) @@ -495,7 +495,7 @@ sal_Bool SalGraphics::DrawPolyLineBezier( sal_uIntPtr nPoints, const SalPoint* p return bResult; } -sal_Bool SalGraphics::DrawPolygonBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry, const OutputDevice* pOutDev ) +sal_Bool SalGraphics::DrawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry, const OutputDevice* pOutDev ) { sal_Bool bResult = sal_False; if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) ) @@ -518,10 +518,10 @@ sal_Bool SalGraphics::DrawPolyPolygonBezier( sal_uInt32 i_nPoly, const sal_uInt3 { // TODO: optimize, reduce new/delete calls SalPoint **pPtAry2 = new SalPoint*[i_nPoly]; - sal_uIntPtr i; + sal_uLong i; for(i=0; i<i_nPoly; i++) { - sal_uIntPtr nPoints = i_pPoints[i]; + sal_uLong nPoints = i_pPoints[i]; pPtAry2[i] = new SalPoint[ nPoints ]; mirror( nPoints, i_pPtAry[i], pPtAry2[i], i_pOutDev ); } @@ -649,7 +649,7 @@ void SalGraphics::Invert( long nX, long nY, long nWidth, long nHeight, SalInv mirror( nX, nWidth, pOutDev ); invert( nX, nY, nWidth, nHeight, nFlags ); } -void SalGraphics::Invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert nFlags, const OutputDevice *pOutDev ) +void SalGraphics::Invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags, const OutputDevice *pOutDev ) { if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) ) { @@ -662,7 +662,7 @@ void SalGraphics::Invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInv invert( nPoints, pPtAry, nFlags ); } -sal_Bool SalGraphics::DrawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize, const OutputDevice *pOutDev ) +sal_Bool SalGraphics::DrawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize, const OutputDevice *pOutDev ) { if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) ) mirror( nX, nWidth, pOutDev ); diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx index cda28e3ff370..f77ce914fd4d 100644 --- a/vcl/source/gdi/salmisc.cxx +++ b/vcl/source/gdi/salmisc.cxx @@ -293,7 +293,7 @@ static void ImplTCToPAL( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffe // --------------------- BitmapBuffer* StretchAndConvert( const BitmapBuffer& rSrcBuffer, const SalTwoRect& rTwoRect, - sal_uIntPtr nDstBitmapFormat, BitmapPalette* pDstPal, ColorMask* pDstMask ) + sal_uLong nDstBitmapFormat, BitmapPalette* pDstPal, ColorMask* pDstMask ) { FncGetPixel pFncGetPixel; FncSetPixel pFncSetPixel; @@ -330,7 +330,7 @@ BitmapBuffer* StretchAndConvert( const BitmapBuffer& rSrcBuffer, const SalTwoRec } // set function for setting pixels - const sal_uIntPtr nDstScanlineFormat = BMP_SCANLINE_FORMAT( nDstBitmapFormat ); + const sal_uLong nDstScanlineFormat = BMP_SCANLINE_FORMAT( nDstBitmapFormat ); switch( nDstScanlineFormat ) { IMPL_CASE_SET_FORMAT( _1BIT_MSB_PAL, 1 ); diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx index 04fbd9525e4a..6d69bc67b982 100755 --- a/vcl/source/gdi/textlayout.cxx +++ b/vcl/source/gdi/textlayout.cxx @@ -315,7 +315,7 @@ namespace vcl return Rectangle(); // determine text layout mode from the RTL-ness of the control whose text we render - sal_uIntPtr nTextLayoutMode = m_bRTLEnabled ? TEXT_LAYOUT_BIDI_RTL : TEXT_LAYOUT_BIDI_LTR; + sal_uLong nTextLayoutMode = m_bRTLEnabled ? TEXT_LAYOUT_BIDI_RTL : TEXT_LAYOUT_BIDI_LTR; m_rReferenceDevice.SetLayoutMode( nTextLayoutMode ); m_rTargetDevice.SetLayoutMode( nTextLayoutMode | TEXT_LAYOUT_TEXTORIGIN_LEFT ); // TEXT_LAYOUT_TEXTORIGIN_LEFT is because when we do actually draw the text (in DrawText( Point, ... )), then diff --git a/vcl/source/glyphs/gcach_ftyp.cxx b/vcl/source/glyphs/gcach_ftyp.cxx index ba8dad14733c..4e94df4810da 100644 --- a/vcl/source/glyphs/gcach_ftyp.cxx +++ b/vcl/source/glyphs/gcach_ftyp.cxx @@ -407,7 +407,7 @@ static unsigned GetUShort( const unsigned char* p ){ return((p[0]<<8)+p[1]);} // ----------------------------------------------------------------------- -const unsigned char* FtFontInfo::GetTable( const char* pTag, sal_uIntPtr* pLength ) const +const unsigned char* FtFontInfo::GetTable( const char* pTag, sal_uLong* pLength ) const { const unsigned char* pBuffer = mpFontFile->GetBuffer(); int nFileSize = mpFontFile->GetFileSize(); @@ -430,7 +430,7 @@ const unsigned char* FtFontInfo::GetTable( const char* pTag, sal_uIntPtr* pLengt { if( p[0]==pTag[0] && p[1]==pTag[1] && p[2]==pTag[2] && p[3]==pTag[3] ) { - sal_uIntPtr nLength = GetUInt( p + 12 ); + sal_uLong nLength = GetUInt( p + 12 ); if( pLength != NULL ) *pLength = nLength; const unsigned char* pTable = pBuffer + GetUInt( p + 8 ); @@ -1514,7 +1514,7 @@ bool FreetypeServerFont::GetGlyphBitmap1( int nGlyphIndex, RawBitmap& rRawBitmap rRawBitmap.mnScanlineSize = rBitmapFT.pitch; } - const sal_uIntPtr nNeededSize = rRawBitmap.mnScanlineSize * rRawBitmap.mnHeight; + const sal_uLong nNeededSize = rRawBitmap.mnScanlineSize * rRawBitmap.mnHeight; if( rRawBitmap.mnAllocated < nNeededSize ) { @@ -1540,10 +1540,10 @@ bool FreetypeServerFont::GetGlyphBitmap1( int nGlyphIndex, RawBitmap& rRawBitmap } unsigned char* p = rRawBitmap.mpBits; - for( sal_uIntPtr y=0; y < rRawBitmap.mnHeight; y++ ) + for( sal_uLong y=0; y < rRawBitmap.mnHeight; y++ ) { unsigned char nLastByte = 0; - for( sal_uIntPtr x=0; x < rRawBitmap.mnScanlineSize; x++ ) + for( sal_uLong x=0; x < rRawBitmap.mnScanlineSize; x++ ) { unsigned char nTmp = p[x] << 7; p[x] |= (p[x] >> 1) | nLastByte; @@ -1665,7 +1665,7 @@ bool FreetypeServerFont::GetGlyphBitmap8( int nGlyphIndex, RawBitmap& rRawBitmap } rRawBitmap.mnScanlineSize = (rRawBitmap.mnScanlineSize + 3) & -4; - const sal_uIntPtr nNeededSize = rRawBitmap.mnScanlineSize * rRawBitmap.mnHeight; + const sal_uLong nNeededSize = rRawBitmap.mnScanlineSize * rRawBitmap.mnHeight; if( rRawBitmap.mnAllocated < nNeededSize ) { delete[] rRawBitmap.mpBits; @@ -1705,10 +1705,10 @@ bool FreetypeServerFont::GetGlyphBitmap8( int nGlyphIndex, RawBitmap& rRawBitmap { // overlay with glyph image shifted by one left pixel unsigned char* p = rRawBitmap.mpBits; - for( sal_uIntPtr y=0; y < rRawBitmap.mnHeight; y++ ) + for( sal_uLong y=0; y < rRawBitmap.mnHeight; y++ ) { unsigned char nLastByte = 0; - for( sal_uIntPtr x=0; x < rRawBitmap.mnWidth; x++ ) + for( sal_uLong x=0; x < rRawBitmap.mnWidth; x++ ) { unsigned char nTmp = p[x]; p[x] |= p[x] | nLastByte; @@ -1721,9 +1721,9 @@ bool FreetypeServerFont::GetGlyphBitmap8( int nGlyphIndex, RawBitmap& rRawBitmap if( !bEmbedded && mbUseGamma ) { unsigned char* p = rRawBitmap.mpBits; - for( sal_uIntPtr y=0; y < rRawBitmap.mnHeight; y++ ) + for( sal_uLong y=0; y < rRawBitmap.mnHeight; y++ ) { - for( sal_uIntPtr x=0; x < rRawBitmap.mnWidth; x++ ) + for( sal_uLong x=0; x < rRawBitmap.mnWidth; x++ ) { p[x] = aGammaTable[ p[x] ]; } @@ -1782,7 +1782,7 @@ bool FtFontInfo::GetFontCodeRanges( CmapResult& rResult ) const // TODO: is the full CmapResult needed on platforms calling this? if( FT_IS_SFNT( maFaceFT ) ) { - sal_uIntPtr nLength = 0; + sal_uLong nLength = 0; const unsigned char* pCmap = GetTable( "cmap", &nLength ); if( pCmap && (nLength > 0) ) if( ParseCMAP( pCmap, nLength, rResult ) ) @@ -1858,7 +1858,7 @@ int FreetypeServerFont::GetGlyphKernValue( int nGlyphLeft, int nGlyphRight ) con // ----------------------------------------------------------------------- -sal_uIntPtr FreetypeServerFont::GetKernPairs( ImplKernPairData** ppKernPairs ) const +sal_uLong FreetypeServerFont::GetKernPairs( ImplKernPairData** ppKernPairs ) const { // if no kerning info is available in the font file *ppKernPairs = NULL; @@ -1884,7 +1884,7 @@ sal_uIntPtr FreetypeServerFont::GetKernPairs( ImplKernPairData** ppKernPairs ) c pFTActivateSize( maSizeFT ); // first figure out which glyph pairs are involved in kerning - sal_uIntPtr nKernLength = 0; + sal_uLong nKernLength = 0; const FT_Byte* const pKern = mpFontInfo->GetTable( "kern", &nKernLength ); if( !pKern ) return 0; @@ -1902,7 +1902,7 @@ sal_uIntPtr FreetypeServerFont::GetKernPairs( ImplKernPairData** ppKernPairs ) c aKernPair.mnKern = 0; // To prevent "is used uninitialized" warning... const FT_Byte* pBuffer = pKern; - sal_uIntPtr nVersion = GetUShort( pBuffer+0 ); + sal_uLong nVersion = GetUShort( pBuffer+0 ); sal_uInt16 nTableCnt = GetUShort( pBuffer+2 ); // Microsoft/Old TrueType style kern table @@ -1953,7 +1953,7 @@ sal_uIntPtr FreetypeServerFont::GetKernPairs( ImplKernPairData** ppKernPairs ) c sal_uInt16 nFirstRight = GetUShort( pTmp+0 ); sal_uInt16 nLastRight = GetUShort( pTmp+2 ) + nFirstRight - 1; - sal_uIntPtr nPairs = (sal_uIntPtr)(nLastLeft - nFirstLeft + 1) * (nLastRight - nFirstRight + 1); + sal_uLong nPairs = (sal_uLong)(nLastLeft - nFirstLeft + 1) * (nLastRight - nFirstRight + 1); aKernGlyphVector.reserve( aKernGlyphVector.size() + nPairs ); pTmp = pSubTable + nOfsArray; @@ -1984,7 +1984,7 @@ sal_uIntPtr FreetypeServerFont::GetKernPairs( ImplKernPairData** ppKernPairs ) c { for( sal_uInt16 nTableIdx = 0; nTableIdx < nTableCnt; ++nTableIdx ) { - /*sal_uIntPtr nLength =*/ NEXT_U32( pBuffer ); + /*sal_uLong nLength =*/ NEXT_U32( pBuffer ); sal_uInt16 nCoverage = NEXT_U16( pBuffer ); /*sal_uInt16 nTupleIndex =*/ NEXT_U16( pBuffer ); @@ -2024,7 +2024,7 @@ sal_uIntPtr FreetypeServerFont::GetKernPairs( ImplKernPairData** ppKernPairs ) c sal_uInt16 nFirstRight = NEXT_U16( pTmp ); sal_uInt16 nLastRight = NEXT_U16( pTmp ) + nFirstRight - 1; - sal_uIntPtr nPairs = (sal_uIntPtr)(nLastLeft - nFirstLeft + 1) * (nLastRight - nFirstRight + 1); + sal_uLong nPairs = (sal_uLong)(nLastLeft - nFirstLeft + 1) * (nLastRight - nFirstRight + 1); aKernGlyphVector.reserve( aKernGlyphVector.size() + nPairs ); pTmp = pSubTable + nOfsArray; @@ -2051,7 +2051,7 @@ sal_uIntPtr FreetypeServerFont::GetKernPairs( ImplKernPairData** ppKernPairs ) c } // now create VCL's ImplKernPairData[] format for all glyph pairs - sal_uIntPtr nKernCount = aKernGlyphVector.size(); + sal_uLong nKernCount = aKernGlyphVector.size(); if( nKernCount ) { // prepare glyphindex to character mapping @@ -2357,19 +2357,19 @@ bool FreetypeServerFont::ApplyGSUB( const ImplFontSelectData& rFSD ) { #define MKTAG(s) ((((((s[0]<<8)+s[1])<<8)+s[2])<<8)+s[3]) - typedef std::vector<sal_uIntPtr> ReqFeatureTagList; + typedef std::vector<sal_uLong> ReqFeatureTagList; ReqFeatureTagList aReqFeatureTagList; if( rFSD.mbVertical ) aReqFeatureTagList.push_back( MKTAG("vert") ); - sal_uIntPtr nRequestedScript = 0; //MKTAG("hani");//### TODO: where to get script? - sal_uIntPtr nRequestedLangsys = 0; //MKTAG("ZHT"); //### TODO: where to get langsys? + sal_uLong nRequestedScript = 0; //MKTAG("hani");//### TODO: where to get script? + sal_uLong nRequestedLangsys = 0; //MKTAG("ZHT"); //### TODO: where to get langsys? // TODO: request more features depending on script and language system if( aReqFeatureTagList.size() == 0) // nothing to do return true; // load GSUB table into memory - sal_uIntPtr nLength = 0; + sal_uLong nLength = 0; const FT_Byte* const pGsubBase = mpFontInfo->GetTable( "GSUB", &nLength ); if( !pGsubBase ) return false; @@ -2391,7 +2391,7 @@ bool FreetypeServerFont::ApplyGSUB( const ImplFontSelectData& rFSD ) pScriptHeader += 2; for( sal_uInt16 nScriptIndex = 0; nScriptIndex < nCntScript; ++nScriptIndex ) { - const sal_uIntPtr nScriptTag = GetUInt( pScriptHeader+0 ); // e.g. hani/arab/kana/hang + const sal_uLong nScriptTag = GetUInt( pScriptHeader+0 ); // e.g. hani/arab/kana/hang const sal_uInt16 nOfsScriptTable= GetUShort( pScriptHeader+4 ); pScriptHeader += 6; //### if( (nScriptTag != nRequestedScript) && (nRequestedScript != 0) ) @@ -2405,7 +2405,7 @@ bool FreetypeServerFont::ApplyGSUB( const ImplFontSelectData& rFSD ) for( sal_uInt16 nLangsysIndex = 0; nLangsysIndex < nCntLangSystem; ++nLangsysIndex ) { - const sal_uIntPtr nTag = GetUInt( pScriptTable+0 ); // e.g. KOR/ZHS/ZHT/JAN + const sal_uLong nTag = GetUInt( pScriptTable+0 ); // e.g. KOR/ZHS/ZHT/JAN const sal_uInt16 nOffset= GetUShort( pScriptTable+4 ); pScriptTable += 6; if( (nTag != nRequestedLangsys) && (nRequestedLangsys != 0) ) @@ -2457,7 +2457,7 @@ bool FreetypeServerFont::ApplyGSUB( const ImplFontSelectData& rFSD ) pFeatureHeader += 2; for( sal_uInt16 nFeatureIndex = 0; nFeatureIndex < nCntFeature; ++nFeatureIndex ) { - const sal_uIntPtr nTag = GetUInt( pFeatureHeader+0 ); // e.g. locl/vert/trad/smpl/liga/fina/... + const sal_uLong nTag = GetUInt( pFeatureHeader+0 ); // e.g. locl/vert/trad/smpl/liga/fina/... const sal_uInt16 nOffset= GetUShort( pFeatureHeader+4 ); pFeatureHeader += 6; diff --git a/vcl/source/glyphs/gcach_ftyp.hxx b/vcl/source/glyphs/gcach_ftyp.hxx index a520958e9d73..e607af2a90a8 100644 --- a/vcl/source/glyphs/gcach_ftyp.hxx +++ b/vcl/source/glyphs/gcach_ftyp.hxx @@ -77,7 +77,7 @@ public: const ExtraKernInfo* ); ~FtFontInfo(); - const unsigned char* GetTable( const char*, sal_uIntPtr* pLength=0 ) const; + const unsigned char* GetTable( const char*, sal_uLong* pLength=0 ) const; FT_FaceRec_* GetFaceFT(); void ReleaseFaceFT( FT_FaceRec_* ); @@ -197,9 +197,9 @@ public: virtual bool GetGlyphBitmap8( int nGlyphIndex, RawBitmap& ) const; virtual bool GetGlyphOutline( int nGlyphIndex, ::basegfx::B2DPolyPolygon& ) const; virtual int GetGlyphKernValue( int nLeftGlyph, int nRightGlyph ) const; - virtual sal_uIntPtr GetKernPairs( ImplKernPairData** ) const; + virtual sal_uLong GetKernPairs( ImplKernPairData** ) const; - const unsigned char* GetTable( const char* pName, sal_uIntPtr* pLength ) + const unsigned char* GetTable( const char* pName, sal_uLong* pLength ) { return mpFontInfo->GetTable( pName, pLength ); } int GetEmUnits() const; const FT_Size_Metrics& GetMetricsFT() const { return maSizeFT->metrics; } diff --git a/vcl/source/glyphs/gcach_layout.cxx b/vcl/source/glyphs/gcach_layout.cxx index 7d61235e0bc7..84f1eef2e477 100755 --- a/vcl/source/glyphs/gcach_layout.cxx +++ b/vcl/source/glyphs/gcach_layout.cxx @@ -228,7 +228,7 @@ const void* IcuFontFromServerFont::getFontTable( LETag nICUTableTag ) const pTagName[3] = (char)(nICUTableTag); pTagName[4] = 0; - sal_uIntPtr nLength; + sal_uLong nLength; const unsigned char* pBuffer = mrServerFont.GetTable( pTagName, &nLength ); #ifdef VERBOSE_DEBUG fprintf(stderr,"IcuGetTable(\"%s\") => %p\n", pTagName, pBuffer); diff --git a/vcl/source/glyphs/gcach_rbmp.cxx b/vcl/source/glyphs/gcach_rbmp.cxx index c5ce53de4db6..f5e259d8852c 100755 --- a/vcl/source/glyphs/gcach_rbmp.cxx +++ b/vcl/source/glyphs/gcach_rbmp.cxx @@ -171,9 +171,9 @@ static void ImplRotate1_180( unsigned char* p1, const unsigned char* p2, bool RawBitmap::Rotate( int nAngle ) { - sal_uIntPtr nNewScanlineSize = 0; - sal_uIntPtr nNewHeight = 0; - sal_uIntPtr nNewWidth = 0; + sal_uLong nNewScanlineSize = 0; + sal_uLong nNewHeight = 0; + sal_uLong nNewWidth = 0; // do inplace rotation or prepare double buffered rotation switch( nAngle ) diff --git a/vcl/source/glyphs/gcach_vdev.cxx b/vcl/source/glyphs/gcach_vdev.cxx index 6d8172d014a2..b2ed9e891516 100644 --- a/vcl/source/glyphs/gcach_vdev.cxx +++ b/vcl/source/glyphs/gcach_vdev.cxx @@ -222,7 +222,7 @@ int VirtDevServerFont::GetGlyphKernValue( int, int ) const // ----------------------------------------------------------------------- -sal_uIntPtr VirtDevServerFont::GetKernPairs( ImplKernPairData** ppImplKernPairs ) const +sal_uLong VirtDevServerFont::GetKernPairs( ImplKernPairData** ppImplKernPairs ) const { Font aFont; aFont.SetName ( GetFontSelData().maName ); @@ -235,7 +235,7 @@ sal_uIntPtr VirtDevServerFont::GetKernPairs( ImplKernPairData** ppImplKernPairs VirtualDevice vdev( 1 ); vdev.SetFont( aFont ); - sal_uIntPtr nPairs = vdev.GetKerningPairCount(); + sal_uLong nPairs = vdev.GetKerningPairCount(); if( nPairs > 0 ) { KerningPair* const pKernPairs = new KerningPair[ nPairs ]; @@ -244,7 +244,7 @@ sal_uIntPtr VirtDevServerFont::GetKernPairs( ImplKernPairData** ppImplKernPairs *ppImplKernPairs = new ImplKernPairData[ nPairs ]; ImplKernPairData* pTo = *ppImplKernPairs; KerningPair* pFrom = pKernPairs; - for ( sal_uIntPtr n = 0; n < nPairs; n++ ) + for ( sal_uLong n = 0; n < nPairs; n++ ) { pTo->mnChar1 = pFrom->nChar1; pTo->mnChar2 = pFrom->nChar2; diff --git a/vcl/source/glyphs/gcach_vdev.hxx b/vcl/source/glyphs/gcach_vdev.hxx index dc03c0354047..4e7d36a69f80 100644 --- a/vcl/source/glyphs/gcach_vdev.hxx +++ b/vcl/source/glyphs/gcach_vdev.hxx @@ -44,7 +44,7 @@ protected: static VirtDevServerFont* CreateFont( const ImplFontSelectData& ); virtual void FetchFontMetric( ImplFontMetricData&, long& rFactor ) const; - virtual sal_uIntPtr GetKernPairs( ImplKernPairData** ) const; + virtual sal_uLong GetKernPairs( ImplKernPairData** ) const; virtual int GetGlyphKernValue( int, int ) const; virtual int GetGlyphIndex( sal_Unicode ) const; diff --git a/vcl/source/glyphs/glyphcache.cxx b/vcl/source/glyphs/glyphcache.cxx index 16a30d57b8fb..3b4b77cb5358 100644 --- a/vcl/source/glyphs/glyphcache.cxx +++ b/vcl/source/glyphs/glyphcache.cxx @@ -294,9 +294,9 @@ void GlyphCache::UncacheFont( ServerFont& rServerFont ) // ----------------------------------------------------------------------- -sal_uIntPtr GlyphCache::CalcByteCount() const +sal_uLong GlyphCache::CalcByteCount() const { - sal_uIntPtr nCacheSize = sizeof(*this); + sal_uLong nCacheSize = sizeof(*this); for( FontList::const_iterator it = maFontList.begin(); it != maFontList.end(); ++it ) { const ServerFont* pSF = it->second; diff --git a/vcl/source/glyphs/graphite_adaptors.cxx b/vcl/source/glyphs/graphite_adaptors.cxx index 9473c8832845..8507e55065f2 100644 --- a/vcl/source/glyphs/graphite_adaptors.cxx +++ b/vcl/source/glyphs/graphite_adaptors.cxx @@ -252,7 +252,7 @@ void GraphiteFontAdaptor::getFontMetrics(float * ascent_out, float * descent_out const void * GraphiteFontAdaptor::getTable(gr::fontTableId32 table_id, size_t * buffer_sz) { char tag_name[5] = {char(table_id >> 24), char(table_id >> 16), char(table_id >> 8), char(table_id), 0}; - sal_uIntPtr temp = *buffer_sz; + sal_uLong temp = *buffer_sz; const void * const tbl_buf = static_cast<FreetypeServerFont &>(mrFont).GetTable(tag_name, &temp); *buffer_sz = temp; diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx index 29ef6c9a35c3..711a985b6fe5 100644 --- a/vcl/source/helper/canvasbitmap.cxx +++ b/vcl/source/helper/canvasbitmap.cxx @@ -65,7 +65,7 @@ namespace } } -void VclCanvasBitmap::setComponentInfo( sal_uIntPtr redShift, sal_uIntPtr greenShift, sal_uIntPtr blueShift ) +void VclCanvasBitmap::setComponentInfo( sal_uLong redShift, sal_uLong greenShift, sal_uLong blueShift ) { // sort channels in increasing order of appearance in the pixel // (starting with the least significant bits) diff --git a/vcl/source/helper/threadex.cxx b/vcl/source/helper/threadex.cxx index f73dc9dd374d..cff1ec4a7d82 100644 --- a/vcl/source/helper/threadex.cxx +++ b/vcl/source/helper/threadex.cxx @@ -111,8 +111,8 @@ long SolarThreadExecutor::impl_execute( const TimeValue* _pTimeout ) { osl_resetCondition( m_aStart ); osl_resetCondition( m_aFinish ); - sal_uIntPtr nSolarMutexCount = Application::ReleaseSolarMutex(); - sal_uIntPtr nEvent = Application::PostUserEvent( LINK( this, SolarThreadExecutor, worker ) ); + sal_uLong nSolarMutexCount = Application::ReleaseSolarMutex(); + sal_uLong nEvent = Application::PostUserEvent( LINK( this, SolarThreadExecutor, worker ) ); if ( osl_cond_result_timeout == osl_waitCondition( m_aStart, _pTimeout ) ) { m_bTimeout = true; diff --git a/vcl/source/helper/xconnection.cxx b/vcl/source/helper/xconnection.cxx index b8c2aace4c1d..d35e4b30caac 100644 --- a/vcl/source/helper/xconnection.cxx +++ b/vcl/source/helper/xconnection.cxx @@ -38,7 +38,7 @@ namespace vcl { class SolarMutexReleaser { - sal_uIntPtr mnReleased; + sal_uLong mnReleased; public: SolarMutexReleaser() { diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx index 31f2fe4dce67..be71aa3e02e6 100644 --- a/vcl/source/window/accel.cxx +++ b/vcl/source/window/accel.cxx @@ -66,10 +66,10 @@ DBG_NAME( Accelerator ) sal_uInt16 ImplAccelEntryGetIndex( ImplAccelList* pList, sal_uInt16 nId, sal_uInt16* pIndex = NULL ) { - sal_uIntPtr nLow; - sal_uIntPtr nHigh; - sal_uIntPtr nMid; - sal_uIntPtr nCount = pList->Count(); + sal_uLong nLow; + sal_uLong nHigh; + sal_uLong nMid; + sal_uLong nCount = pList->Count(); sal_uInt16 nCompareId; // Abpruefen, ob der erste Key groesser als der Vergleichskey ist @@ -128,10 +128,10 @@ static void ImplAccelEntryInsert( ImplAccelList* pList, ImplAccelEntry* pEntry ) } while ( nIndex < pList->Count() ); - pList->Insert( pEntry, (sal_uIntPtr)nIndex ); + pList->Insert( pEntry, (sal_uLong)nIndex ); } else - pList->Insert( pEntry, (sal_uIntPtr)nInsIndex ); + pList->Insert( pEntry, (sal_uLong)nInsIndex ); } // ----------------------------------------------------------------------- @@ -191,7 +191,7 @@ void Accelerator::ImplCopyData( ImplAccelData& rAccelData ) else pEntry->mpAutoAccel = NULL; - mpData->maKeyTable.Insert( (sal_uIntPtr)pEntry->maKeyCode.GetFullKeyCode(), pEntry ); + mpData->maKeyTable.Insert( (sal_uLong)pEntry->maKeyCode.GetFullKeyCode(), pEntry ); mpData->maIdList.Insert( pEntry, LIST_APPEND ); pEntry = rAccelData.maIdList.Next(); @@ -256,7 +256,7 @@ void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, const KeyCode& rKeyCode, pEntry->mbEnabled = bEnable; // Ab in die Tabellen - sal_uIntPtr nCode = rKeyCode.GetFullKeyCode(); + sal_uLong nCode = rKeyCode.GetFullKeyCode(); if ( !nCode ) { DBG_ERROR( "Accelerator::InsertItem(): KeyCode with KeyCode 0 not allowed" ); @@ -315,9 +315,9 @@ void Accelerator::ImplLoadRes( const ResId& rResId ) GetRes( rResId ); maHelpStr = ReadStringRes(); - sal_uIntPtr nObjFollows = ReadLongRes(); + sal_uLong nObjFollows = ReadLongRes(); - for( sal_uIntPtr i = 0; i < nObjFollows; i++ ) + for( sal_uLong i = 0; i < nObjFollows; i++ ) { InsertItem( ResId( (RSHEADER_TYPE *)GetClassRes(), *rResId.GetResMgr() ) ); IncrementRes( GetObjSizeRes( (RSHEADER_TYPE *)GetClassRes() ) ); @@ -372,7 +372,7 @@ void Accelerator::InsertItem( const ResId& rResId ) { DBG_CHKTHIS( Accelerator, NULL ); - sal_uIntPtr nObjMask; + sal_uLong nObjMask; sal_uInt16 nAccelKeyId; sal_uInt16 bDisable; KeyCode aKeyCode; @@ -414,11 +414,11 @@ void Accelerator::RemoveItem( sal_uInt16 nItemId ) sal_uInt16 nItemCount = GetItemCount(); do { - ImplAccelEntry* pEntry = mpData->maIdList.GetObject( (sal_uIntPtr)nIndex ); + ImplAccelEntry* pEntry = mpData->maIdList.GetObject( (sal_uLong)nIndex ); if ( pEntry && pEntry->mnId == nItemId ) { mpData->maKeyTable.Remove( pEntry->maKeyCode.GetFullKeyCode() ); - mpData->maIdList.Remove( (sal_uIntPtr)nIndex ); + mpData->maIdList.Remove( (sal_uLong)nIndex ); // AutoResAccel zerstoeren if ( pEntry->mpAutoAccel ) @@ -447,14 +447,14 @@ void Accelerator::RemoveItem( const KeyCode rKeyCode ) sal_uInt16 nItemCount = GetItemCount(); do { - if ( mpData->maIdList.GetObject( (sal_uIntPtr)nIndex ) == pEntry ) + if ( mpData->maIdList.GetObject( (sal_uLong)nIndex ) == pEntry ) break; nIndex++; } while ( nIndex < nItemCount ); mpData->maKeyTable.Remove( rKeyCode.GetFullKeyCode() ); - mpData->maIdList.Remove( (sal_uIntPtr)nIndex ); + mpData->maIdList.Remove( (sal_uLong)nIndex ); // AutoResAccel zerstoeren if ( pEntry->mpAutoAccel ) @@ -490,7 +490,7 @@ sal_uInt16 Accelerator::GetItemId( sal_uInt16 nPos ) const { DBG_CHKTHIS( Accelerator, NULL ); - ImplAccelEntry* pEntry = mpData->maIdList.GetObject( (sal_uIntPtr)nPos ); + ImplAccelEntry* pEntry = mpData->maIdList.GetObject( (sal_uLong)nPos ); if ( pEntry ) return pEntry->mnId; else @@ -503,7 +503,7 @@ KeyCode Accelerator::GetItemKeyCode( sal_uInt16 nPos ) const { DBG_CHKTHIS( Accelerator, NULL ); - ImplAccelEntry* pEntry = mpData->maIdList.GetObject( (sal_uIntPtr)nPos ); + ImplAccelEntry* pEntry = mpData->maIdList.GetObject( (sal_uLong)nPos ); if ( pEntry ) return pEntry->maKeyCode; else @@ -531,7 +531,7 @@ KeyCode Accelerator::GetKeyCode( sal_uInt16 nItemId ) const sal_uInt16 nIndex = ImplAccelEntryGetFirstPos( &(mpData->maIdList), nItemId ); if ( nIndex != ACCELENTRY_NOTFOUND ) - return mpData->maIdList.GetObject( (sal_uIntPtr)nIndex )->maKeyCode; + return mpData->maIdList.GetObject( (sal_uLong)nIndex )->maKeyCode; else return KeyCode(); } @@ -599,7 +599,7 @@ void Accelerator::SetAccel( sal_uInt16 nItemId, Accelerator* pAccel ) sal_uInt16 nItemCount = GetItemCount(); do { - ImplAccelEntry* pEntry = mpData->maIdList.GetObject( (sal_uIntPtr)nIndex ); + ImplAccelEntry* pEntry = mpData->maIdList.GetObject( (sal_uLong)nIndex ); if ( pEntry->mnId != nItemId ) break; @@ -618,7 +618,7 @@ Accelerator* Accelerator::GetAccel( sal_uInt16 nItemId ) const sal_uInt16 nIndex = ImplAccelEntryGetIndex( &(mpData->maIdList), nItemId ); if ( nIndex != ACCELENTRY_NOTFOUND ) - return mpData->maIdList.GetObject( (sal_uIntPtr)nIndex )->mpAccel; + return mpData->maIdList.GetObject( (sal_uLong)nIndex )->mpAccel; else return NULL; } @@ -659,7 +659,7 @@ void Accelerator::EnableItem( sal_uInt16 nItemId, sal_Bool bEnable ) sal_uInt16 nItemCount = GetItemCount(); do { - ImplAccelEntry* pEntry = mpData->maIdList.GetObject( (sal_uIntPtr)nIndex ); + ImplAccelEntry* pEntry = mpData->maIdList.GetObject( (sal_uLong)nIndex ); if ( pEntry->mnId != nItemId ) break; @@ -678,7 +678,7 @@ sal_Bool Accelerator::IsItemEnabled( sal_uInt16 nItemId ) const sal_uInt16 nIndex = ImplAccelEntryGetIndex( &(mpData->maIdList), nItemId ); if ( nIndex != ACCELENTRY_NOTFOUND ) - return mpData->maIdList.GetObject( (sal_uIntPtr)nIndex )->mbEnabled; + return mpData->maIdList.GetObject( (sal_uLong)nIndex )->mbEnabled; else return sal_False; } diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx index ea9407eaa136..6b30dd3a3c23 100644 --- a/vcl/source/window/accmgr.cxx +++ b/vcl/source/window/accmgr.cxx @@ -67,7 +67,7 @@ sal_Bool ImplAccelManager::InsertAccel( Accelerator* pAccel ) } // Am Anfang der Liste einfuegen - mpAccelList->Insert( pAccel, (sal_uIntPtr)0 ); + mpAccelList->Insert( pAccel, (sal_uLong)0 ); return sal_True; } @@ -168,7 +168,7 @@ sal_Bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepe { DBG_CHKOBJ( pNextAccel, Accelerator, NULL ); - mpSequenceList->Insert( pNextAccel, (sal_uIntPtr)0 ); + mpSequenceList->Insert( pNextAccel, (sal_uLong)0 ); // Activate-Handler vom Neuen rufen pNextAccel->Activate(); @@ -239,8 +239,8 @@ sal_Bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepe // Sequenz-Liste erzeugen mpSequenceList = new ImplAccelList; - mpSequenceList->Insert( pAccel, (sal_uIntPtr)0 ); - mpSequenceList->Insert( pNextAccel, (sal_uIntPtr)0 ); + mpSequenceList->Insert( pAccel, (sal_uLong)0 ); + mpSequenceList->Insert( pNextAccel, (sal_uLong)0 ); // Activate-Handler vom Neuen rufen pNextAccel->Activate(); diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 5ce32a14d725..73a3bc7eb981 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -216,7 +216,7 @@ static PushButton* ImplGetCancelButton( Dialog* pDialog ) static void ImplMouseAutoPos( Dialog* pDialog ) { - sal_uIntPtr nMouseOptions = pDialog->GetSettings().GetMouseSettings().GetOptions(); + sal_uLong nMouseOptions = pDialog->GetSettings().GetMouseSettings().GetOptions(); if ( nMouseOptions & MOUSE_OPTION_AUTOCENTERPOS ) { Size aSize = pDialog->GetOutputSizePixel(); @@ -951,7 +951,7 @@ void Dialog::GetDrawWindowBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, } -void Dialog::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr ) +void Dialog::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong ) { Point aPos = pDev->LogicToPixel( rPos ); Size aSize = pDev->LogicToPixel( rSize ); diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index ec208cc0c4a0..c59cb4da5dc8 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -62,13 +62,13 @@ class ImplDockFloatWin2 : public FloatingWindow { private: ImplDockingWindowWrapper* mpDockWin; - sal_uIntPtr mnLastTicks; + sal_uLong mnLastTicks; Timer maDockTimer; Timer maEndDockTimer; Point maDockPos; Rectangle maDockRect; sal_Bool mbInMove; - sal_uIntPtr mnLastUserEvent; + sal_uLong mnLastUserEvent; DECL_LINK( DockingHdl, ImplDockFloatWin2* ); DECL_LINK( DockTimerHdl, ImplDockFloatWin2* ); @@ -91,7 +91,7 @@ public: long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); - sal_uIntPtr GetLastTicks() const { return mnLastTicks; } + sal_uLong GetLastTicks() const { return mnLastTicks; } }; // ======================================================================= @@ -426,7 +426,7 @@ void DockingManager::SetFloatingMode( const Window *pWindow, sal_Bool bFloating pWrapper->SetFloatingMode( bFloating ); } -void DockingManager::StartPopupMode( ToolBox *pParentToolBox, const Window *pWindow, sal_uIntPtr nFlags ) +void DockingManager::StartPopupMode( ToolBox *pParentToolBox, const Window *pWindow, sal_uLong nFlags ) { ImplDockingWindowWrapper* pWrapper = GetDockingWindowWrapper( pWindow ); if( pWrapper ) @@ -1241,7 +1241,7 @@ sal_Bool ImplDockingWindowWrapper::IsTitleButtonVisible( sal_uInt16 nButton ) co // ----------------------------------------------------------------------- -void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, sal_uIntPtr nFlags ) +void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, sal_uLong nFlags ) { // do nothing if window is floating if( IsFloatingMode() ) diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 8b0f1030285f..eb16832e5c00 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -82,12 +82,12 @@ class ImplDockFloatWin : public FloatingWindow { private: DockingWindow* mpDockWin; - sal_uIntPtr mnLastTicks; + sal_uLong mnLastTicks; Timer maDockTimer; Point maDockPos; Rectangle maDockRect; sal_Bool mbInMove; - sal_uIntPtr mnLastUserEvent; + sal_uLong mnLastUserEvent; DECL_LINK( DockingHdl, ImplDockFloatWin* ); DECL_LINK( DockTimerHdl, ImplDockFloatWin* ); @@ -105,7 +105,7 @@ public: virtual void Resizing( Size& rSize ); virtual sal_Bool Close(); - sal_uIntPtr GetLastTicks() const { return mnLastTicks; } + sal_uLong GetLastTicks() const { return mnLastTicks; } }; @@ -408,7 +408,7 @@ void DockingWindow::ImplLoadRes( const ResId& rResId ) { Window::ImplLoadRes( rResId ); - sal_uIntPtr nMask = ReadLongRes(); + sal_uLong nMask = ReadLongRes(); if ( (RSC_DOCKINGWINDOW_XYMAPMODE | RSC_DOCKINGWINDOW_X | RSC_DOCKINGWINDOW_Y) & nMask ) diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index cb441bf23945..170fcbd65cee 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -194,7 +194,7 @@ void FloatingWindow::ImplLoadRes( const ResId& rResId ) { SystemWindow::ImplLoadRes( rResId ); - sal_uIntPtr nObjMask = ReadLongRes(); + sal_uLong nObjMask = ReadLongRes(); if ( (RSC_FLOATINGWINDOW_WHMAPMODE | RSC_FLOATINGWINDOW_WIDTH | RSC_FLOATINGWINDOW_HEIGHT) & nObjMask ) @@ -240,7 +240,7 @@ FloatingWindow::~FloatingWindow() // ----------------------------------------------------------------------- -Point FloatingWindow::CalcFloatingPosition( Window* pWindow, const Rectangle& rRect, sal_uIntPtr nFlags, sal_uInt16& rArrangeIndex ) +Point FloatingWindow::CalcFloatingPosition( Window* pWindow, const Rectangle& rRect, sal_uLong nFlags, sal_uInt16& rArrangeIndex ) { return ImplCalcPos( pWindow, rRect, nFlags, rArrangeIndex ); } @@ -248,7 +248,7 @@ Point FloatingWindow::CalcFloatingPosition( Window* pWindow, const Rectangle& rR // ----------------------------------------------------------------------- Point FloatingWindow::ImplCalcPos( Window* pWindow, - const Rectangle& rRect, sal_uIntPtr nFlags, + const Rectangle& rRect, sal_uLong nFlags, sal_uInt16& rArrangeIndex ) { // Fenster-Position ermitteln @@ -661,7 +661,7 @@ void FloatingWindow::SetTitleType( sal_uInt16 nTitle ) // ----------------------------------------------------------------------- -void FloatingWindow::StartPopupMode( const Rectangle& rRect, sal_uIntPtr nFlags ) +void FloatingWindow::StartPopupMode( const Rectangle& rRect, sal_uLong nFlags ) { // avoid flickering if ( IsVisible() ) @@ -731,7 +731,7 @@ void FloatingWindow::StartPopupMode( const Rectangle& rRect, sal_uIntPtr nFlags // ----------------------------------------------------------------------- -void FloatingWindow::StartPopupMode( ToolBox* pBox, sal_uIntPtr nFlags ) +void FloatingWindow::StartPopupMode( ToolBox* pBox, sal_uLong nFlags ) { // get selected button sal_uInt16 nItemId = pBox->GetDownItemId(); @@ -778,7 +778,7 @@ void FloatingWindow::StartPopupMode( ToolBox* pBox, sal_uIntPtr nFlags ) // ----------------------------------------------------------------------- -void FloatingWindow::ImplEndPopupMode( sal_uInt16 nFlags, sal_uIntPtr nFocusId ) +void FloatingWindow::ImplEndPopupMode( sal_uInt16 nFlags, sal_uLong nFocusId ) { if ( !mbInPopupMode ) return; @@ -796,7 +796,7 @@ void FloatingWindow::ImplEndPopupMode( sal_uInt16 nFlags, sal_uIntPtr nFocusId ) pSVData->maWinData.mpFirstFloat = mpNextFloat; mpNextFloat = NULL; - sal_uIntPtr nPopupModeFlags = mnPopupModeFlags; + sal_uLong nPopupModeFlags = mnPopupModeFlags; // Wenn nicht abgerissen wurde, dann Fenster wieder Hiden if ( !(nFlags & FLOATWIN_POPUPMODEEND_TEAROFF) || diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx index af52cbe563d5..968c72abd383 100644 --- a/vcl/source/window/keycod.cxx +++ b/vcl/source/window/keycod.cxx @@ -101,9 +101,9 @@ KeyCode::KeyCode( const ResId& rResId ) { pResMgr->Increment( sizeof( RSHEADER_TYPE ) ); - sal_uIntPtr nKeyCode = pResMgr->ReadLong(); - sal_uIntPtr nModifier = pResMgr->ReadLong(); - sal_uIntPtr nKeyFunc = pResMgr->ReadLong(); + sal_uLong nKeyCode = pResMgr->ReadLong(); + sal_uLong nModifier = pResMgr->ReadLong(); + sal_uLong nKeyFunc = pResMgr->ReadLong(); eFunc = (KeyFuncType)nKeyFunc; if ( eFunc != KEYFUNC_DONTKNOW ) diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index f79d83c6dc5d..8e557129cce2 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -114,7 +114,7 @@ static sal_Bool ImplHilite( const MouseEvent& rMEvt ) // read XWP settings at program startup if (init == sal_False) { sal_Bool rc; - sal_uIntPtr cb = sizeof(HOOKCONFIG); + sal_uLong cb = sizeof(HOOKCONFIG); memset(&hc, 0, sizeof(HOOKCONFIG)); rc = PrfQueryProfileData( HINI_USER, INIAPP_XWPHOOK, INIKEY_HOOK_CONFIG, &hc, &cb); @@ -158,7 +158,7 @@ struct MenuItemData XubString aCommandStr; // CommandString XubString aHelpCommandStr; // Help command string (to reference external help) rtl::OString aHelpId; // Help-Id - sal_uIntPtr nUserValue; // User value + sal_uLong nUserValue; // User value Image aImage; // Image KeyCode aAccelKey; // Accelerator-Key sal_Bool bChecked; // Checked @@ -220,7 +220,7 @@ public: MenuItemData* GetData( sal_uInt16 nSVId, sal_uInt16& rPos ) const; MenuItemData* GetData( sal_uInt16 nSVId ) const { sal_uInt16 nTemp; return GetData( nSVId, nTemp ); } - MenuItemData* GetDataFromPos( sal_uIntPtr nPos ) const + MenuItemData* GetDataFromPos( sal_uLong nPos ) const { return (MenuItemData*)List::GetObject( nPos ); } MenuItemData* SearchItem( xub_Unicode cSelectChar, KeyCode aKeyCode, sal_uInt16& rPos, sal_uInt16& nDuplicates, sal_uInt16 nCurrentPos ) const; @@ -234,7 +234,7 @@ public: MenuItemList::~MenuItemList() { - for ( sal_uIntPtr n = Count(); n; ) + for ( sal_uLong n = Count(); n; ) { MenuItemData* pData = GetDataFromPos( --n ); delete pData; @@ -307,7 +307,7 @@ void MenuItemList::InsertSeparator( sal_uInt16 nPos ) void MenuItemList::Remove( sal_uInt16 nPos ) { - MenuItemData* pData = (MenuItemData*)List::Remove( (sal_uIntPtr)nPos ); + MenuItemData* pData = (MenuItemData*)List::Remove( (sal_uLong)nPos ); if ( pData ) delete pData; } @@ -462,7 +462,7 @@ private: Timer aHighlightChangedTimer; Timer aSubmenuCloseTimer; Timer aScrollTimer; - sal_uIntPtr nSaveFocusId; + sal_uLong nSaveFocusId; // long nStartY; sal_uInt16 nHighlightedItem; // gehighlightetes/selektiertes Item sal_uInt16 nMBDownPos; @@ -513,15 +513,15 @@ public: virtual void RequestHelp( const HelpEvent& rHEvt ); virtual void Resize(); - void SetFocusId( sal_uIntPtr nId ) { nSaveFocusId = nId; } - sal_uIntPtr GetFocusId() const { return nSaveFocusId; } + void SetFocusId( sal_uLong nId ) { nSaveFocusId = nId; } + sal_uLong GetFocusId() const { return nSaveFocusId; } void EnableScrollMenu( sal_Bool b ); sal_Bool IsScrollMenu() const { return bScrollMenu; } sal_uInt16 GetScrollerHeight() const { return nScrollerHeight; } void Execute(); - void StopExecute( sal_uIntPtr nFocusId = 0 ); + void StopExecute( sal_uLong nFocusId = 0 ); void EndExecute(); void EndExecute( sal_uInt16 nSelectId ); @@ -680,7 +680,7 @@ private: Menu* pMenu; PopupMenu* pActivePopup; sal_uInt16 nHighlightedItem; - sal_uIntPtr nSaveFocusId; + sal_uLong nSaveFocusId; sal_Bool mbAutoPopup; sal_Bool bIgnoreFirstMove; sal_Bool bStayActive; @@ -726,8 +726,8 @@ public: virtual void Resize(); virtual void RequestHelp( const HelpEvent& rHEvt ); - void SetFocusId( sal_uIntPtr nId ) { nSaveFocusId = nId; } - sal_uIntPtr GetFocusId() const { return nSaveFocusId; } + void SetFocusId( sal_uLong nId ) { nSaveFocusId = nId; } + sal_uLong GetFocusId() const { return nSaveFocusId; } void SetMenu( MenuBar* pMenu ); void KillActivePopup(); @@ -775,11 +775,11 @@ static void ImplSetMenuItemData( MenuItemData* pData ) pData->eType = MENUITEM_STRINGIMAGE; } -static sal_uIntPtr ImplChangeTipTimeout( sal_uIntPtr nTimeout, Window *pWindow ) +static sal_uLong ImplChangeTipTimeout( sal_uLong nTimeout, Window *pWindow ) { AllSettings aAllSettings( pWindow->GetSettings() ); HelpSettings aHelpSettings( aAllSettings.GetHelpSettings() ); - sal_uIntPtr nRet = aHelpSettings.GetTipTimeout(); + sal_uLong nRet = aHelpSettings.GetTipTimeout(); aHelpSettings.SetTipTimeout( nTimeout ); aAllSettings.SetHelpSettings( aHelpSettings ); pWindow->SetSettings( aAllSettings ); @@ -815,7 +815,7 @@ static sal_Bool ImplHandleHelpEvent( Window* pMenuWindow, Menu* pMenu, sal_uInt1 else { // give user a chance to read the full filename - sal_uIntPtr oldTimeout=ImplChangeTipTimeout( 60000, pMenuWindow ); + sal_uLong oldTimeout=ImplChangeTipTimeout( 60000, pMenuWindow ); // call always, even when strlen==0 to correctly remove tip Help::ShowQuickHelp( pMenuWindow, aRect, pMenu->GetTipHelpText( nId ) ); ImplChangeTipTimeout( oldTimeout, pMenuWindow ); @@ -827,7 +827,7 @@ static sal_Bool ImplHandleHelpEvent( Window* pMenuWindow, Menu* pMenu, sal_uInt1 Point aPos = rHEvt.GetMousePosPixel(); Rectangle aRect( aPos, Size() ); // give user a chance to read the full filename - sal_uIntPtr oldTimeout=ImplChangeTipTimeout( 60000, pMenuWindow ); + sal_uLong oldTimeout=ImplChangeTipTimeout( 60000, pMenuWindow ); // call always, even when strlen==0 to correctly remove tip Help::ShowQuickHelp( pMenuWindow, aRect, pMenu->GetTipHelpText( nId ) ); ImplChangeTipTimeout( oldTimeout, pMenuWindow ); @@ -995,13 +995,13 @@ void Menu::ImplLoadRes( const ResId& rResId ) rResId.SetRT( RSC_MENU ); GetRes( rResId ); - sal_uIntPtr nObjMask = ReadLongRes(); + sal_uLong nObjMask = ReadLongRes(); if( nObjMask & RSC_MENU_ITEMS ) { - sal_uIntPtr nObjFollows = ReadLongRes(); + sal_uLong nObjFollows = ReadLongRes(); // MenuItems einfuegen - for( sal_uIntPtr i = 0; i < nObjFollows; i++ ) + for( sal_uLong i = 0; i < nObjFollows; i++ ) { InsertItem( ResId( (RSHEADER_TYPE*)GetClassRes(), *pMgr ) ); IncrementRes( GetObjSizeRes( (RSHEADER_TYPE*)GetClassRes() ) ); @@ -1022,7 +1022,7 @@ void Menu::ImplLoadRes( const ResId& rResId ) void Menu::CreateAutoMnemonics() { MnemonicGenerator aMnemonicGenerator; - sal_uIntPtr n; + sal_uLong n; for ( n = 0; n < pItemList->Count(); n++ ) { MenuItemData* pData = pItemList->GetDataFromPos(n); @@ -1176,7 +1176,7 @@ void Menu::RequestHelp( const HelpEvent& ) { } -void Menu::ImplCallEventListeners( sal_uIntPtr nEvent, sal_uInt16 nPos ) +void Menu::ImplCallEventListeners( sal_uLong nEvent, sal_uInt16 nPos ) { ImplMenuDelData aDelData( this ); @@ -1281,7 +1281,7 @@ void Menu::InsertItem( const ResId& rResId, sal_uInt16 nPos ) if( ! pMgr ) return; - sal_uIntPtr nObjMask; + sal_uLong nObjMask; GetRes( rResId.SetRT( RSC_MENUITEM ) ); nObjMask = ReadLongRes(); @@ -1591,14 +1591,14 @@ MenuItemBits Menu::GetItemBits( sal_uInt16 nItemId ) const return nBits; } -void Menu::SetUserValue( sal_uInt16 nItemId, sal_uIntPtr nValue ) +void Menu::SetUserValue( sal_uInt16 nItemId, sal_uLong nValue ) { MenuItemData* pData = pItemList->GetData( nItemId ); if ( pData ) pData->nUserValue = nValue; } -sal_uIntPtr Menu::GetUserValue( sal_uInt16 nItemId ) const +sal_uLong Menu::GetUserValue( sal_uInt16 nItemId ) const { MenuItemData* pData = pItemList->GetData( nItemId ); return pData ? pData->nUserValue : 0; @@ -1789,8 +1789,8 @@ void Menu::EnableItem( sal_uInt16 nItemId, sal_Bool bEnable ) { DBG_ASSERT( bIsMenuBar, "Menu::EnableItem - Popup visible!" ); long nX = 0; - sal_uIntPtr nCount = pItemList->Count(); - for ( sal_uIntPtr n = 0; n < nCount; n++ ) + sal_uLong nCount = pItemList->Count(); + for ( sal_uLong n = 0; n < nCount; n++ ) { MenuItemData* pData = pItemList->GetDataFromPos( n ); if ( n == nPos ) @@ -2945,7 +2945,7 @@ Menu* Menu::ImplFindSelectMenu() { Menu* pSelMenu = nEventId ? this : NULL; - for ( sal_uIntPtr n = GetItemList()->Count(); n && !pSelMenu; ) + for ( sal_uLong n = GetItemList()->Count(); n && !pSelMenu; ) { MenuItemData* pData = GetItemList()->GetDataFromPos( --n ); @@ -2960,7 +2960,7 @@ Menu* Menu::ImplFindMenu( sal_uInt16 nItemId ) { Menu* pSelMenu = NULL; - for ( sal_uIntPtr n = GetItemList()->Count(); n && !pSelMenu; ) + for ( sal_uLong n = GetItemList()->Count(); n && !pSelMenu; ) { MenuItemData* pData = GetItemList()->GetDataFromPos( --n ); @@ -3615,7 +3615,7 @@ sal_uInt16 PopupMenu::Execute( Window* pExecWindow, const Rectangle& rRect, sal_ ENSURE_OR_RETURN( pExecWindow, "PopupMenu::Execute: need a non-NULL window!", 0 ); - sal_uIntPtr nPopupModeFlags = 0; + sal_uLong nPopupModeFlags = 0; if ( nFlags & POPUPMENU_EXECUTE_DOWN ) nPopupModeFlags = FLOATWIN_POPUPMODE_DOWN; else if ( nFlags & POPUPMENU_EXECUTE_UP ) @@ -3633,7 +3633,7 @@ sal_uInt16 PopupMenu::Execute( Window* pExecWindow, const Rectangle& rRect, sal_ return ImplExecute( pExecWindow, rRect, nPopupModeFlags, 0, sal_False ); } -sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uIntPtr nPopupModeFlags, Menu* pSFrom, sal_Bool bPreSelectFirst ) +sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong nPopupModeFlags, Menu* pSFrom, sal_Bool bPreSelectFirst ) { if ( !pSFrom && ( PopupMenu::IsInExecute() || !GetItemCount() ) ) return 0; @@ -3646,7 +3646,7 @@ sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uIntP nSelectedId = 0; bCanceled = sal_False; - sal_uIntPtr nFocusId = 0; + sal_uLong nFocusId = 0; sal_Bool bRealExecute = sal_False; if ( !pStartedFrom ) { @@ -4224,7 +4224,7 @@ IMPL_LINK( MenuFloatingWindow, HighlightChanged, Timer*, pTimer ) { if ( pActivePopup && ( pActivePopup != pItemData->pSubMenu ) ) { - sal_uIntPtr nOldFlags = GetPopupModeFlags(); + sal_uLong nOldFlags = GetPopupModeFlags(); SetPopupModeFlags( GetPopupModeFlags() | FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE ); KillActivePopup(); SetPopupModeFlags( nOldFlags ); @@ -4234,7 +4234,7 @@ IMPL_LINK( MenuFloatingWindow, HighlightChanged, Timer*, pTimer ) pActivePopup = (PopupMenu*)pItemData->pSubMenu; long nY = nScrollerHeight+ImplGetStartY(); MenuItemData* pData = 0; - for ( sal_uIntPtr n = 0; n < nHighlightedItem; n++ ) + for ( sal_uLong n = 0; n < nHighlightedItem; n++ ) { pData = pMenu->pItemList->GetDataFromPos( n ); nY += pData->aSz.Height(); @@ -4265,7 +4265,7 @@ IMPL_LINK( MenuFloatingWindow, HighlightChanged, Timer*, pTimer ) // die lange im Activate Rescheduled haben und jetzt schon nicht mehr // angezeigt werden sollen. Menu* pTest = pActivePopup; - sal_uIntPtr nOldFlags = GetPopupModeFlags(); + sal_uLong nOldFlags = GetPopupModeFlags(); SetPopupModeFlags( GetPopupModeFlags() | FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE ); sal_uInt16 nRet = pActivePopup->ImplExecute( this, Rectangle( aItemTopLeft, aItemBottomRight ), FLOATWIN_POPUPMODE_RIGHT, pMenu, pTimer ? sal_False : sal_True ); SetPopupModeFlags( nOldFlags ); @@ -4328,7 +4328,7 @@ void MenuFloatingWindow::Execute() // Application::Yield(); } -void MenuFloatingWindow::StopExecute( sal_uIntPtr nFocusId ) +void MenuFloatingWindow::StopExecute( sal_uLong nFocusId ) { // Focus wieder herstellen // (kann schon im Select wieder hergestellt wurden sein) @@ -4387,7 +4387,7 @@ void MenuFloatingWindow::KillActivePopup( PopupMenu* pThisOnly ) void MenuFloatingWindow::EndExecute() { Menu* pStart = pMenu ? pMenu->ImplGetStartMenu() : NULL; - sal_uIntPtr nFocusId = 0; + sal_uLong nFocusId = 0; if ( pStart && pStart->bIsMenuBar ) { nFocusId = ((MenuBarWindow*)((MenuBar*)pStart)->ImplGetWindow())->GetFocusId(); @@ -5366,7 +5366,7 @@ void MenuBarWindow::ImplCreatePopup( sal_Bool bPreSelectFirst ) pActivePopup = (PopupMenu*)pItemData->pSubMenu; long nX = 0; MenuItemData* pData = 0; - for ( sal_uIntPtr n = 0; n < nHighlightedItem; n++ ) + for ( sal_uLong n = 0; n < nHighlightedItem; n++ ) { pData = pMenu->GetItemList()->GetDataFromPos( n ); nX += pData->aSz.Width(); @@ -5534,7 +5534,7 @@ void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n, sal_Bool bSelectEntry, sa ImplGetSVData()->maWinData.mbNoDeactivate = sal_False; if( !ImplGetSVData()->maWinData.mbNoSaveFocus ) { - sal_uIntPtr nTempFocusId = nSaveFocusId; + sal_uLong nTempFocusId = nSaveFocusId; nSaveFocusId = 0; Window::EndSaveFocus( nTempFocusId, bAllowRestoreFocus ); // #105406# restore focus to document if we could not save focus before @@ -5568,8 +5568,8 @@ void MenuBarWindow::HighlightItem( sal_uInt16 nPos, sal_Bool bHighlight ) return; long nX = 0; - sal_uIntPtr nCount = pMenu->pItemList->Count(); - for ( sal_uIntPtr n = 0; n < nCount; n++ ) + sal_uLong nCount = pMenu->pItemList->Count(); + for ( sal_uLong n = 0; n < nCount; n++ ) { MenuItemData* pData = pMenu->pItemList->GetDataFromPos( n ); if ( n == nPos ) @@ -5646,8 +5646,8 @@ Rectangle MenuBarWindow::ImplGetItemRect( sal_uInt16 nPos ) if( pMenu ) { long nX = 0; - sal_uIntPtr nCount = pMenu->pItemList->Count(); - for ( sal_uIntPtr n = 0; n < nCount; n++ ) + sal_uLong nCount = pMenu->pItemList->Count(); + for ( sal_uLong n = 0; n < nCount; n++ ) { MenuItemData* pData = pMenu->pItemList->GetDataFromPos( n ); if ( n == nPos ) diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index 60d6f6b27fbf..7b3dcfaa3341 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -199,8 +199,8 @@ MessBox::MessBox( Window* pParent, const ResId& rResId ) : rtl::OString aHelpId( ReadByteStringRes() ); /* sal_uInt16 bSysModal = */ ReadShortRes(); SetHelpId( aHelpId ); - WinBits nBits = (((sal_uIntPtr)nHiButtons << 16) + nLoButtons) | - (((sal_uIntPtr)nHiDefButton << 16) + nLoDefButton); + WinBits nBits = (((sal_uLong)nHiButtons << 16) + nLoButtons) | + (((sal_uLong)nHiDefButton << 16) + nLoDefButton); ImplInit( pParent, nBits | WB_MOVEABLE | WB_HORZ | WB_CENTER ); ImplLoadRes( rResId ); diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index 9ed6103e5b01..31740214532b 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -82,7 +82,7 @@ ImplWheelWindow::ImplWheelWindow( Window* pParent ) : const sal_Bool bVert = ( nFlags & AUTOSCROLL_VERT ) != 0; // calculate maximum speed distance - mnMaxWidth = (sal_uIntPtr) ( 0.4 * hypot( (double) aSize.Width(), aSize.Height() ) ); + mnMaxWidth = (sal_uLong) ( 0.4 * hypot( (double) aSize.Width(), aSize.Height() ) ); // create wheel window SetTitleType( FLOATWIN_TITLE_NONE ); @@ -156,7 +156,7 @@ void ImplWheelWindow::ImplCreateImageList() // ------------------------------------------------------------------------ -void ImplWheelWindow::ImplSetWheelMode( sal_uIntPtr nWheelMode ) +void ImplWheelWindow::ImplSetWheelMode( sal_uLong nWheelMode ) { if( nWheelMode != mnWheelMode ) { @@ -209,13 +209,13 @@ void ImplWheelWindow::ImplRecalcScrollValues() } else { - sal_uIntPtr nCurTime; + sal_uLong nCurTime; // calc current time if( mnMaxWidth ) { const double fExp = ( (double) mnActDist / mnMaxWidth ) * log10( (double) MAX_TIME / MIN_TIME ); - nCurTime = (sal_uIntPtr) ( MAX_TIME / pow( 10., fExp ) ); + nCurTime = (sal_uLong) ( MAX_TIME / pow( 10., fExp ) ); } else nCurTime = MAX_TIME; @@ -339,7 +339,7 @@ void ImplWheelWindow::MouseMove( const MouseEvent& rMEvt ) const long nDistX = aMousePos.X() - maCenter.X(); const long nDistY = aMousePos.Y() - maCenter.Y(); - mnActDist = (sal_uIntPtr) hypot( (double) nDistX, nDistY ); + mnActDist = (sal_uLong) hypot( (double) nDistX, nDistY ); const PointerStyle eActStyle = ImplGetMousePointer( nDistX, nDistY ); const sal_uInt16 nFlags = ImplGetSVData()->maWinData.mnAutoScrollFlags; @@ -402,7 +402,7 @@ IMPL_LINK( ImplWheelWindow, ImplScrollHdl, Timer*, EMPTYARG ) if ( !ImplCallPreNotify( aNCmdEvt ) ) { - const sal_uIntPtr nTime = Time::GetSystemTicks(); + const sal_uLong nTime = Time::GetSystemTicks(); ImplDelData aDel( this ); pWindow->Command( aCEvt ); if( aDel.IsDead() ) diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx index a4a95e8b3c48..1b9011aa7859 100644 --- a/vcl/source/window/scrwnd.hxx +++ b/vcl/source/window/scrwnd.hxx @@ -57,12 +57,12 @@ private: Point maLastMousePos; Point maCenter; Timer* mpTimer; - sal_uIntPtr mnRepaintTime; - sal_uIntPtr mnTimeout; - sal_uIntPtr mnWheelMode; - sal_uIntPtr mnMaxWidth; - sal_uIntPtr mnActWidth; - sal_uIntPtr mnActDist; + sal_uLong mnRepaintTime; + sal_uLong mnTimeout; + sal_uLong mnWheelMode; + sal_uLong mnMaxWidth; + sal_uLong mnActWidth; + sal_uLong mnActDist; long mnActDeltaX; long mnActDeltaY; @@ -87,6 +87,6 @@ public: ~ImplWheelWindow(); void ImplStop(); - void ImplSetWheelMode( sal_uIntPtr nWheelMode ); - sal_uIntPtr ImplGetWheelMode() const { return mnWheelMode; } + void ImplSetWheelMode( sal_uLong nWheelMode ); + sal_uLong ImplGetWheelMode() const { return mnWheelMode; } }; diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index 3ad9fc72d575..a261b6bd96a7 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -1012,7 +1012,7 @@ void StatusBar::UserDraw( const UserDrawEvent& ) // ----------------------------------------------------------------------- -void StatusBar::InsertItem( sal_uInt16 nItemId, sal_uIntPtr nWidth, +void StatusBar::InsertItem( sal_uInt16 nItemId, sal_uLong nWidth, StatusBarItemBits nBits, long nOffset, sal_uInt16 nPos ) { @@ -1164,7 +1164,7 @@ void StatusBar::CopyItems( const StatusBar& rStatusBar ) mpItemList->Clear(); // Items kopieren - sal_uIntPtr i = 0; + sal_uLong i = 0; pItem = rStatusBar.mpItemList->GetObject( i ); while ( pItem ) { @@ -1311,7 +1311,7 @@ Point StatusBar::GetItemTextPos( sal_uInt16 nItemId ) const // ----------------------------------------------------------------------- -sal_uIntPtr StatusBar::GetItemWidth( sal_uInt16 nItemId ) const +sal_uLong StatusBar::GetItemWidth( sal_uInt16 nItemId ) const { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1709,8 +1709,8 @@ void StatusBar::SetText( const XubString& rText ) Size StatusBar::CalcWindowSizePixel() const { - sal_uIntPtr i = 0; - sal_uIntPtr nCount = mpItemList->Count(); + sal_uLong i = 0; + sal_uLong nCount = mpItemList->Count(); long nOffset = 0; long nCalcWidth = (STATUSBAR_OFFSET_X*2); long nCalcHeight; diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index b1947c5c8aae..48c7629c2026 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -503,7 +503,7 @@ Size SystemWindow::GetResizeOutputSizePixel() const static void ImplWindowStateFromStr( WindowStateData& rData, const ByteString& rStr ) { - sal_uIntPtr nValidMask = 0; + sal_uLong nValidMask = 0; xub_StrLen nIndex = 0; ByteString aTokenStr; @@ -556,7 +556,7 @@ static void ImplWindowStateFromStr( WindowStateData& rData, const ByteString& rS { // #94144# allow Minimize again, should be masked out when read from configuration // 91625 - ignore Minimize - sal_uIntPtr nState = (sal_uIntPtr)aTokenStr.ToInt32(); + sal_uLong nState = (sal_uLong)aTokenStr.ToInt32(); //nState &= ~(WINDOWSTATE_STATE_MINIMIZED); rData.SetState( nState ); nValidMask |= WINDOWSTATE_MASK_STATE; @@ -618,7 +618,7 @@ static void ImplWindowStateFromStr( WindowStateData& rData, const ByteString& rS static void ImplWindowStateToStr( const WindowStateData& rData, ByteString& rStr ) { - sal_uIntPtr nValidMask = rData.GetMask(); + sal_uLong nValidMask = rData.GetMask(); if ( !nValidMask ) return; @@ -638,7 +638,7 @@ static void ImplWindowStateToStr( const WindowStateData& rData, ByteString& rStr { // #94144# allow Minimize again, should be masked out when read from configuration // 91625 - ignore Minimize - sal_uIntPtr nState = rData.GetState(); + sal_uLong nState = rData.GetState(); //nState &= ~(WINDOWSTATE_STATE_MINIMIZED); rStr.Append( ByteString::CreateFromInt32( (long)nState ) ); } @@ -718,7 +718,7 @@ void SystemWindow::ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, lo void SystemWindow::SetWindowStateData( const WindowStateData& rData ) { - sal_uIntPtr nValidMask = rData.GetMask(); + sal_uLong nValidMask = rData.GetMask(); if ( !nValidMask ) return; @@ -731,7 +731,7 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData ) if ( pWindow->mpWindowImpl->mbFrame ) { - sal_uIntPtr nState = rData.GetState(); + sal_uLong nState = rData.GetState(); SalFrameState aState; aState.mnMask = rData.GetMask(); aState.mnX = rData.GetX(); @@ -860,7 +860,7 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData ) // 91625 - ignore Minimize if ( nValidMask & WINDOWSTATE_MASK_STATE ) { - sal_uIntPtr nState = rData.GetState(); + sal_uLong nState = rData.GetState(); if ( nState & WINDOWSTATE_STATE_ROLLUP ) RollUp(); else @@ -873,7 +873,7 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData ) void SystemWindow::GetWindowStateData( WindowStateData& rData ) const { - sal_uIntPtr nValidMask = rData.GetMask(); + sal_uLong nValidMask = rData.GetMask(); if ( !nValidMask ) return; @@ -935,7 +935,7 @@ void SystemWindow::GetWindowStateData( WindowStateData& rData ) const { Point aPos = GetPosPixel(); Size aSize = GetSizePixel(); - sal_uIntPtr nState = 0; + sal_uLong nState = 0; if ( IsRollUp() ) { @@ -970,7 +970,7 @@ void SystemWindow::SetWindowState( const ByteString& rStr ) // ----------------------------------------------------------------------- -ByteString SystemWindow::GetWindowState( sal_uIntPtr nMask ) const +ByteString SystemWindow::GetWindowState( sal_uLong nMask ) const { WindowStateData aData; aData.SetMask( nMask ); diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx index efee2aa38979..dcb95b9b52a2 100644 --- a/vcl/source/window/tabpage.cxx +++ b/vcl/source/window/tabpage.cxx @@ -167,7 +167,7 @@ void TabPage::Paint( const Rectangle& ) } // ----------------------------------------------------------------------- -void TabPage::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr ) +void TabPage::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong ) { Point aPos = pDev->LogicToPixel( rPos ); Size aSize = pDev->LogicToPixel( rSize ); diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index a659aec19019..105cf18bb43a 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -172,7 +172,7 @@ public: { mpBoxList->Insert( pBox ); } void Remove( ToolBox* pBox ) { mpBoxList->Remove( pBox ); } - sal_uIntPtr Count() const + sal_uLong Count() const { return mpBoxList->Count(); } ToolBox* FindToolBox( const Rectangle& rRect ); @@ -1731,7 +1731,7 @@ void ToolBox::ImplLoadRes( const ResId& rResId ) DockingWindow::ImplLoadRes( rResId ); - sal_uIntPtr nObjMask; + sal_uLong nObjMask; nObjMask = ReadLongRes(); @@ -1767,10 +1767,10 @@ void ToolBox::ImplLoadRes( const ResId& rResId ) if ( nObjMask & RSC_TOOLBOX_ITEMLIST ) { - sal_uIntPtr nEle = ReadLongRes(); + sal_uLong nEle = ReadLongRes(); // Item hinzufuegen - for ( sal_uIntPtr i = 0; i < nEle; i++ ) + for ( sal_uLong i = 0; i < nEle; i++ ) { InsertItem( ResId( (RSHEADER_TYPE *)GetClassRes(), *pMgr ) ); IncrementRes( GetObjSizeRes( (RSHEADER_TYPE *)GetClassRes() ) ); @@ -2157,8 +2157,8 @@ sal_Bool ToolBox::ImplCalcItem() sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, sal_Bool bCalcHorz ) { - sal_uIntPtr nLineStart = 0; - sal_uIntPtr nGroupStart = 0; + sal_uLong nLineStart = 0; + sal_uLong nGroupStart = 0; long nLineWidth = 0; long nCurWidth; long nLastGroupLineWidth = 0; @@ -6192,10 +6192,10 @@ sal_Bool ToolBox::ImplChangeHighlightUpDn( sal_Bool bUp, sal_Bool bNoCycle ) if( pToolItem ) { - sal_uIntPtr pos = ToolBox::ImplFindItemPos( pToolItem, mpData->m_aItems ); - sal_uIntPtr nCount = mpData->m_aItems.size(); + sal_uLong pos = ToolBox::ImplFindItemPos( pToolItem, mpData->m_aItems ); + sal_uLong nCount = mpData->m_aItems.size(); - sal_uIntPtr i=0; + sal_uLong i=0; do { if( bUp ) diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index e6f5767f1331..c993c9143a2c 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -570,7 +570,7 @@ void ToolBox::UserDraw( const UserDrawEvent& ) void ToolBox::InsertItem( const ResId& rResId, sal_uInt16 nPos ) { - sal_uIntPtr nObjMask; + sal_uLong nObjMask; sal_Bool bImage = sal_False; // Wurde Image gesetzt // Item anlegen @@ -980,10 +980,10 @@ const Size& ToolBox::GetDefaultImageSize() const { static Size aSmallButtonSize( TB_SMALLIMAGESIZE, TB_SMALLIMAGESIZE ); - static sal_uIntPtr s_nSymbolsStyle = STYLE_SYMBOLS_DEFAULT; + static sal_uLong s_nSymbolsStyle = STYLE_SYMBOLS_DEFAULT; static Size aLargeButtonSize( TB_LARGEIMAGESIZE, TB_LARGEIMAGESIZE ); - sal_uIntPtr nSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyle(); + sal_uLong nSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyle(); if ( s_nSymbolsStyle != nSymbolsStyle ) { s_nSymbolsStyle = nSymbolsStyle; @@ -2040,7 +2040,7 @@ Rectangle ToolBox::GetCharacterBounds( sal_uInt16 nItemID, long nIndex ) const ImplFillLayoutData(); if( mpData->m_pLayoutData ) { - for( sal_uIntPtr i = 0; i < mpData->m_pLayoutData->m_aLineItemIds.size(); i++ ) + for( sal_uLong i = 0; i < mpData->m_pLayoutData->m_aLineItemIds.size(); i++ ) { if( mpData->m_pLayoutData->m_aLineItemIds[i] == nItemID ) { @@ -2063,7 +2063,7 @@ long ToolBox::GetIndexForPoint( const Point& rPoint, sal_uInt16& rItemID ) const if( mpData->m_pLayoutData ) { nIndex = mpData->m_pLayoutData->GetIndexForPoint( rPoint ); - for( sal_uIntPtr i = 0; i < mpData->m_pLayoutData->m_aLineIndices.size(); i++ ) + for( sal_uLong i = 0; i < mpData->m_pLayoutData->m_aLineIndices.size(); i++ ) { if( mpData->m_pLayoutData->m_aLineIndices[i] <= nIndex && (i == mpData->m_pLayoutData->m_aLineIndices.size()-1 || mpData->m_pLayoutData->m_aLineIndices[i+1] > nIndex) ) @@ -2101,7 +2101,7 @@ sal_uInt16 ToolBox::GetDisplayItemId( long nText ) const sal_uInt16 nItemId = 0; if( ! mpData->m_pLayoutData ) ImplFillLayoutData(); - if( mpData->m_pLayoutData && nText >= 0 && (sal_uIntPtr)nText < mpData->m_pLayoutData->m_aLineItemIds.size() ) + if( mpData->m_pLayoutData && nText >= 0 && (sal_uLong)nText < mpData->m_pLayoutData->m_aLineItemIds.size() ) nItemId = mpData->m_pLayoutData->m_aLineItemIds[nText]; return nItemId; } diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index ade795b51a04..2f8b70d73e65 100755 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -778,7 +778,7 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste if ( mpWindowImpl->mbFrame ) { // create frame - sal_uIntPtr nFrameStyle = 0; + sal_uLong nFrameStyle = 0; if ( nStyle & WB_MOVEABLE ) nFrameStyle |= SAL_FRAME_STYLE_MOVEABLE; @@ -1209,7 +1209,7 @@ WinBits Window::ImplInitRes( const ResId& rResId ) void Window::ImplLoadRes( const ResId& rResId ) { - sal_uIntPtr nObjMask = ReadLongRes(); + sal_uLong nObjMask = ReadLongRes(); // we need to calculate auto helpids before the resource gets closed // if the resource only contains flags, it will be closed before we try to read a help id @@ -1218,7 +1218,7 @@ void Window::ImplLoadRes( const ResId& rResId ) rtl::OString aHelpId = ImplAutoHelpID( rResId.GetResMgr() ); // ResourceStyle - sal_uIntPtr nRSStyle = ReadLongRes(); + sal_uLong nRSStyle = ReadLongRes(); // WinBits ReadLongRes(); @@ -1799,7 +1799,7 @@ sal_Bool Window::ImplSysObjClip( const Region* pOldRegion ) long nY; long nWidth; long nHeight; - sal_uIntPtr nRectCount; + sal_uLong nRectCount; ImplRegionInfo aInfo; sal_Bool bRegionRect; @@ -3784,7 +3784,7 @@ void Window::ImplCallMouseMove( sal_uInt16 nMouseCode, sal_Bool bModChanged ) { if ( mpWindowImpl->mpFrameData->mbMouseIn && mpWindowImpl->mpFrameWindow->mpWindowImpl->mbReallyVisible ) { - sal_uIntPtr nTime = Time::GetSystemTicks(); + sal_uLong nTime = Time::GetSystemTicks(); long nX = mpWindowImpl->mpFrameData->mnLastMouseX; long nY = mpWindowImpl->mpFrameData->mnLastMouseY; sal_uInt16 nCode = nMouseCode; @@ -4882,7 +4882,7 @@ void Window::PostPaint() // ----------------------------------------------------------------------- -void Window::Draw( OutputDevice*, const Point&, const Size&, sal_uIntPtr ) +void Window::Draw( OutputDevice*, const Point&, const Size&, sal_uLong ) { DBG_CHKTHIS( Window, ImplDbgCheckWindow ); } @@ -5031,7 +5031,7 @@ void Window::Tracking( const TrackingEvent& rTEvt ) // ----------------------------------------------------------------------- -void Window::UserEvent( sal_uIntPtr, void* ) +void Window::UserEvent( sal_uLong, void* ) { DBG_CHKTHIS( Window, ImplDbgCheckWindow ); } @@ -5355,7 +5355,7 @@ long Window::Notify( NotifyEvent& rNEvt ) // ----------------------------------------------------------------------- -void Window::ImplCallEventListeners( sal_uIntPtr nEvent, void* pData ) +void Window::ImplCallEventListeners( sal_uLong nEvent, void* pData ) { // The implementation was moved to CallEventListeners(), // because derived classes in svtools must be able to @@ -5368,7 +5368,7 @@ void Window::ImplCallEventListeners( sal_uIntPtr nEvent, void* pData ) // ----------------------------------------------------------------------- -void Window::CallEventListeners( sal_uIntPtr nEvent, void* pData ) +void Window::CallEventListeners( sal_uLong nEvent, void* pData ) { VclWindowEvent aEvent( this, nEvent, pData ); @@ -5440,25 +5440,25 @@ void Window::RemoveChildEventListener( const Link& rEventListener ) // ----------------------------------------------------------------------- -sal_uIntPtr Window::PostUserEvent( sal_uIntPtr nEvent, void* pEventData ) +sal_uLong Window::PostUserEvent( sal_uLong nEvent, void* pEventData ) { - sal_uIntPtr nEventId; + sal_uLong nEventId; PostUserEvent( nEventId, nEvent, pEventData ); return nEventId; } // ----------------------------------------------------------------------- -sal_uIntPtr Window::PostUserEvent( const Link& rLink, void* pCaller ) +sal_uLong Window::PostUserEvent( const Link& rLink, void* pCaller ) { - sal_uIntPtr nEventId; + sal_uLong nEventId; PostUserEvent( nEventId, rLink, pCaller ); return nEventId; } // ----------------------------------------------------------------------- -sal_Bool Window::PostUserEvent( sal_uIntPtr& rEventId, sal_uIntPtr nEvent, void* pEventData ) +sal_Bool Window::PostUserEvent( sal_uLong& rEventId, sal_uLong nEvent, void* pEventData ) { DBG_CHKTHIS( Window, ImplDbgCheckWindow ); @@ -5469,7 +5469,7 @@ sal_Bool Window::PostUserEvent( sal_uIntPtr& rEventId, sal_uIntPtr nEvent, void* pSVEvent->mpWindow = this; pSVEvent->mbCall = sal_True; ImplAddDel( &(pSVEvent->maDelData) ); - rEventId = (sal_uIntPtr)pSVEvent; + rEventId = (sal_uLong)pSVEvent; if ( mpWindowImpl->mpFrame->PostEvent( pSVEvent ) ) return sal_True; else @@ -5483,7 +5483,7 @@ sal_Bool Window::PostUserEvent( sal_uIntPtr& rEventId, sal_uIntPtr nEvent, void* // ----------------------------------------------------------------------- -sal_Bool Window::PostUserEvent( sal_uIntPtr& rEventId, const Link& rLink, void* pCaller ) +sal_Bool Window::PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller ) { DBG_CHKTHIS( Window, ImplDbgCheckWindow ); @@ -5494,7 +5494,7 @@ sal_Bool Window::PostUserEvent( sal_uIntPtr& rEventId, const Link& rLink, void* pSVEvent->mpWindow = this; pSVEvent->mbCall = sal_True; ImplAddDel( &(pSVEvent->maDelData) ); - rEventId = (sal_uIntPtr)pSVEvent; + rEventId = (sal_uLong)pSVEvent; if ( mpWindowImpl->mpFrame->PostEvent( pSVEvent ) ) return sal_True; else @@ -5508,7 +5508,7 @@ sal_Bool Window::PostUserEvent( sal_uIntPtr& rEventId, const Link& rLink, void* // ----------------------------------------------------------------------- -void Window::RemoveUserEvent( sal_uIntPtr nUserEvent ) +void Window::RemoveUserEvent( sal_uLong nUserEvent ) { DBG_CHKTHIS( Window, ImplDbgCheckWindow ); @@ -5532,7 +5532,7 @@ void Window::RemoveUserEvent( sal_uIntPtr nUserEvent ) IMPL_LINK( Window, ImplAsyncStateChangedHdl, void*, pState ) { - StateChanged( (StateChangedType)(sal_uIntPtr)pState ); + StateChanged( (StateChangedType)(sal_uLong)pState ); return 0; } @@ -5542,7 +5542,7 @@ void Window::PostStateChanged( StateChangedType nState ) { DBG_CHKTHIS( Window, ImplDbgCheckWindow ); - PostUserEvent( LINK( this, Window, ImplAsyncStateChangedHdl ), (void*)(sal_uIntPtr)nState ); + PostUserEvent( LINK( this, Window, ImplAsyncStateChangedHdl ), (void*)(sal_uLong)nState ); } // ----------------------------------------------------------------------- @@ -5841,7 +5841,7 @@ void Window::SetSettings( const AllSettings& rSettings, sal_Bool bChild ) AllSettings aOldSettings = maSettings; OutputDevice::SetSettings( rSettings ); - sal_uIntPtr nChangeFlags = aOldSettings.GetChangeFlags( rSettings ); + sal_uLong nChangeFlags = aOldSettings.GetChangeFlags( rSettings ); // AppFont-Aufloesung und DPI-Aufloesung neu berechnen ImplInitResolutionSettings(); @@ -5878,7 +5878,7 @@ void Window::UpdateSettings( const AllSettings& rSettings, sal_Bool bChild ) } AllSettings aOldSettings = maSettings; - sal_uIntPtr nChangeFlags = maSettings.Update( maSettings.GetWindowUpdate(), rSettings ); + sal_uLong nChangeFlags = maSettings.Update( maSettings.GetWindowUpdate(), rSettings ); nChangeFlags |= SETTINGS_IN_UPDATE_SETTINGS; // Set this flag so the receiver of the data changed // event can distinguish between the changing of global // setting and a local change ( with SetSettings ) @@ -6066,7 +6066,7 @@ void Window::SetWindowRegionPixel( const Region& rRegion ) long nY; long nWidth; long nHeight; - sal_uIntPtr nRectCount; + sal_uLong nRectCount; ImplRegionInfo aInfo; sal_Bool bRegionRect; diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index b4dad39cbebc..669fce05a791 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -172,7 +172,7 @@ void Window::ImplSaveOverlapBackground() if ( !mpWindowImpl->mbFrame ) { - sal_uIntPtr nSaveBackSize = mnOutWidth*mnOutHeight; + sal_uLong nSaveBackSize = mnOutWidth*mnOutHeight; if ( nSaveBackSize <= IMPL_MAXSAVEBACKSIZE ) { if ( nSaveBackSize+mpWindowImpl->mpFrameData->mnAllSaveBackSize <= IMPL_MAXALLSAVEBACKSIZE ) @@ -1214,7 +1214,7 @@ sal_Bool Window::HandleScrollCommand( const CommandEvent& rCmd, if ( pData && (COMMAND_WHEEL_SCROLL == pData->GetMode()) ) { - sal_uIntPtr nScrollLines = pData->GetScrollLines(); + sal_uLong nScrollLines = pData->GetScrollLines(); long nLines; if ( nScrollLines == COMMAND_WHEEL_PAGESCROLL ) { diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index a5820a752788..32879b277e48 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -149,7 +149,7 @@ static sal_Bool ImplHandleMouseFloatMode( Window* pChild, const Point& rMousePos sal_uInt16 nHitTest = IMPL_FLOATWIN_HITTEST_OUTSIDE; FloatingWindow* pFloat = pSVData->maWinData.mpFirstFloat->ImplFloatHitTest( pChild, rMousePos, nHitTest ); FloatingWindow* pLastLevelFloat; - sal_uIntPtr nPopupFlags; + sal_uLong nPopupFlags; if ( nSVEvent == EVENT_MOUSEMOVE ) { if ( bMouseLeave ) @@ -351,7 +351,7 @@ static long ContextMenuEventLink( void* pCEvent, void* ) } long ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouseLeave, - long nX, long nY, sal_uIntPtr nMsgTime, + long nX, long nY, sal_uLong nMsgTime, sal_uInt16 nCode, sal_uInt16 nMode ) { ImplSVData* pSVData = ImplGetSVData(); @@ -592,7 +592,7 @@ long ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse nClicks, sal_False ); - sal_uIntPtr nCount = Application::ReleaseSolarMutex(); + sal_uLong nCount = Application::ReleaseSolarMutex(); // FIXME: where do I get Action from ? ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource > xDragSource = pMouseDownWin->GetDragSource(); @@ -670,7 +670,7 @@ long ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse if ( nSVEvent == EVENT_MOUSEBUTTONDOWN ) { const MouseSettings& rMSettings = pChild->GetSettings().GetMouseSettings(); - sal_uIntPtr nDblClkTime = rMSettings.GetDoubleClickTime(); + sal_uLong nDblClkTime = rMSettings.GetDoubleClickTime(); long nDblClkW = rMSettings.GetDoubleClickWidth(); long nDblClkH = rMSettings.GetDoubleClickHeight(); //long nMouseX = nX; @@ -1254,7 +1254,7 @@ static long ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent, static long ImplHandleExtTextInput( Window* pWindow, const XubString& rText, const sal_uInt16* pTextAttr, - sal_uIntPtr nCursorPos, sal_uInt16 nCursorFlags ) + sal_uLong nCursorPos, sal_uInt16 nCursorFlags ) { ImplSVData* pSVData = ImplGetSVData(); Window* pChild = NULL; @@ -1551,7 +1551,7 @@ static long ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent& rEv FloatingWindow* pLastLevelFloat = pSVData->maWinData.mpFirstFloat->ImplFindLastLevelFloat(); if( pLastLevelFloat ) { - sal_uIntPtr nPopupFlags = pLastLevelFloat->GetPopupModeFlags(); + sal_uLong nPopupFlags = pLastLevelFloat->GetPopupModeFlags(); if ( nPopupFlags & FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE ) { pLastLevelFloat->EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL | FLOATWIN_POPUPMODEEND_CLOSEALL ); @@ -2339,8 +2339,8 @@ static void ImplHandleSalSurroundingTextRequest( Window *pWindow, // ----------------------------------------------------------------------- static void ImplHandleSurroundingTextSelectionChange( Window *pWindow, - sal_uIntPtr nStart, - sal_uIntPtr nEnd ) + sal_uLong nStart, + sal_uLong nEnd ) { Window* pChild = ImplGetKeyInputWindow( pWindow ); if( pChild ) @@ -2609,7 +2609,7 @@ long ImplWindowFrameProc( Window* pWindow, SalFrame* /*pFrame*/, break; #ifdef DBG_UTIL default: - DBG_ERROR1( "ImplWindowFrameProc(): unknown event (%lu)", (sal_uIntPtr)nEvent ); + DBG_ERROR1( "ImplWindowFrameProc(): unknown event (%lu)", (sal_uLong)nEvent ); break; #endif } diff --git a/vcl/source/window/wpropset.cxx b/vcl/source/window/wpropset.cxx index 33c2f00363cf..fcb0c560291e 100644 --- a/vcl/source/window/wpropset.cxx +++ b/vcl/source/window/wpropset.cxx @@ -293,7 +293,7 @@ IMPL_LINK( vcl::WindowPropertySet, ChildEventListener, VclWindowEvent*, pEvent ) = mpImpl->maProperties.find( pEvent->GetWindow()->getIdentifier() ); if( it != mpImpl->maProperties.end() ) // this is valid, some unnamed child may have sent an event { - sal_uIntPtr nId = pEvent->GetId(); + sal_uLong nId = pEvent->GetId(); // check if anything interesting happened if( // general windowy things diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx index 24726a9177ea..81c2b36345eb 100644 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -46,8 +46,8 @@ // ======================================================================= -#define WORKWIN_WINDOWSTATE_FULLSCREEN ((sal_uIntPtr)0x00010000) -#define WORKWIN_WINDOWSTATE_ALL ((sal_uIntPtr)0x00FF0000) +#define WORKWIN_WINDOWSTATE_FULLSCREEN ((sal_uLong)0x00010000) +#define WORKWIN_WINDOWSTATE_ALL ((sal_uLong)0x00FF0000) // ======================================================================= @@ -272,7 +272,7 @@ sal_Bool WorkWindow::SetPluginParent( SystemParentData* pParent ) return bRet; } -void WorkWindow::ImplSetFrameState( sal_uIntPtr aFrameState ) +void WorkWindow::ImplSetFrameState( sal_uLong aFrameState ) { SalFrameState aState; aState.mnMask = SAL_FRAMESTATE_MASK_STATE; diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index 104aa2e80dd3..36d475b8795b 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -527,7 +527,7 @@ public: YieldFunc handle ); virtual void Remove( int fd ); - virtual void StartTimer( sal_uIntPtr nMS ); + virtual void StartTimer( sal_uLong nMS ); virtual void StopTimer(); virtual void Wakeup(); virtual void PostUserEvent(); @@ -727,7 +727,7 @@ gboolean GtkXLib::timeoutFn(gpointer data) return FALSE; } -void GtkXLib::StartTimer( sal_uIntPtr nMS ) +void GtkXLib::StartTimer( sal_uLong nMS ) { m_nTimeoutMS = nMS; // for restarting diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index df7ce072bde7..2b0e90dc9bc0 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -65,7 +65,7 @@ void GtkHookedYieldMutex::ThreadsEnter() acquire(); if( !aYieldStack.empty() ) { /* Previously called ThreadsLeave() */ - sal_uIntPtr nCount = aYieldStack.front(); + sal_uLong nCount = aYieldStack.front(); aYieldStack.pop_front(); while( nCount-- > 1 ) acquire(); @@ -188,12 +188,12 @@ GtkInstance::~GtkInstance() DeInitAtkBridge(); } -SalFrame* GtkInstance::CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle ) +SalFrame* GtkInstance::CreateFrame( SalFrame* pParent, sal_uLong nStyle ) { return new GtkSalFrame( pParent, nStyle ); } -SalFrame* GtkInstance::CreateChildFrame( SystemParentData* pParentData, sal_uIntPtr ) +SalFrame* GtkInstance::CreateChildFrame( SystemParentData* pParentData, sal_uLong ) { SalFrame* pFrame = new GtkSalFrame( pParentData ); diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index dfb311fa9c8d..bb5326292a3c 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -479,7 +479,7 @@ void GtkSalGraphics::ResetClipRegion() X11SalGraphics::ResetClipRegion(); } -void GtkSalGraphics::BeginSetClipRegion( sal_uIntPtr nCount ) +void GtkSalGraphics::BeginSetClipRegion( sal_uLong nCount ) { m_aClipRegion.SetNull(); X11SalGraphics::BeginSetClipRegion( nCount ); diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index 4ef66f746b49..a164e9f658fc 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -392,7 +392,7 @@ GtkSalFrame::GraphicsHolder::~GraphicsHolder() delete pGraphics; } -GtkSalFrame::GtkSalFrame( SalFrame* pParent, sal_uIntPtr nStyle ) +GtkSalFrame::GtkSalFrame( SalFrame* pParent, sal_uLong nStyle ) { m_nScreen = getDisplay()->GetDefaultScreenNumber(); getDisplay()->registerFrame( this ); @@ -755,7 +755,7 @@ GtkSalFrame *GtkSalFrame::getFromWindow( GtkWindow *pWindow ) return (GtkSalFrame *) g_object_get_data( G_OBJECT( pWindow ), "SalFrame" ); } -void GtkSalFrame::Init( SalFrame* pParent, sal_uIntPtr nStyle ) +void GtkSalFrame::Init( SalFrame* pParent, sal_uLong nStyle ) { if( nStyle & SAL_FRAME_STYLE_DEFAULT ) // ensure default style { @@ -1043,7 +1043,7 @@ void GtkSalFrame::SetTitle( const String& rTitle ) } static inline sal_uInt8 * -getRow( BitmapBuffer *pBuffer, sal_uIntPtr nRow ) +getRow( BitmapBuffer *pBuffer, sal_uLong nRow ) { if( BMP_SCANLINE_ADJUSTMENT( pBuffer->mnFormat ) == BMP_FORMAT_TOP_DOWN ) return pBuffer->mpBits + nRow * pBuffer->mnScanlineSize; @@ -1602,7 +1602,7 @@ void GtkSalFrame::SetWindowState( const SalFrameState* pState ) if( ! m_pWindow || ! pState || isChild( true, false ) ) return; - const sal_uIntPtr nMaxGeometryMask = + const sal_uLong nMaxGeometryMask = SAL_FRAMESTATE_MASK_X | SAL_FRAMESTATE_MASK_Y | SAL_FRAMESTATE_MASK_WIDTH | SAL_FRAMESTATE_MASK_HEIGHT | SAL_FRAMESTATE_MASK_MAXIMIZED_X | SAL_FRAMESTATE_MASK_MAXIMIZED_Y | @@ -2462,7 +2462,7 @@ void GtkSalFrame::ResetClipRegion() gdk_window_shape_combine_region( m_pWindow->window, NULL, 0, 0 ); } -void GtkSalFrame::BeginSetClipRegion( sal_uIntPtr ) +void GtkSalFrame::BeginSetClipRegion( sal_uLong ) { if( m_pRegion ) gdk_region_destroy( m_pRegion ); @@ -2702,7 +2702,7 @@ gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame GtkSalFrame* pThis = (GtkSalFrame*)frame; GdkEventScroll* pSEvent = (GdkEventScroll*)pEvent; - static sal_uIntPtr nLines = 0; + static sal_uLong nLines = 0; if( ! nLines ) { char* pEnv = getenv( "SAL_WHEELLINES" ); @@ -2714,8 +2714,8 @@ gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame bool bNeg = (pSEvent->direction == GDK_SCROLL_DOWN || pSEvent->direction == GDK_SCROLL_RIGHT ); SalWheelMouseEvent aEvent; aEvent.mnTime = pSEvent->time; - aEvent.mnX = (sal_uIntPtr)pSEvent->x; - aEvent.mnY = (sal_uIntPtr)pSEvent->y; + aEvent.mnX = (sal_uLong)pSEvent->x; + aEvent.mnY = (sal_uLong)pSEvent->y; aEvent.mnDelta = bNeg ? -120 : 120; aEvent.mnNotchDelta = bNeg ? -1 : 1; aEvent.mnScrollLines = nLines; diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx index 96648ce02d30..f7ef753dc628 100644 --- a/vcl/unx/gtk/window/gtkobject.cxx +++ b/vcl/unx/gtk/window/gtkobject.cxx @@ -109,7 +109,7 @@ sal_uInt16 GtkSalObject::GetClipRegionType() return SAL_OBJECT_CLIP_INCLUDERECTS; } -void GtkSalObject::BeginSetClipRegion( sal_uIntPtr ) +void GtkSalObject::BeginSetClipRegion( sal_uLong ) { if( m_pRegion ) gdk_region_destroy( m_pRegion ); diff --git a/vcl/unx/headless/svpdummies.cxx b/vcl/unx/headless/svpdummies.cxx index 6aed05bf135b..162b3c5f755c 100644 --- a/vcl/unx/headless/svpdummies.cxx +++ b/vcl/unx/headless/svpdummies.cxx @@ -51,7 +51,7 @@ SvpSalObject::~SvpSalObject() void SvpSalObject::ResetClipRegion() {} sal_uInt16 SvpSalObject::GetClipRegionType() { return 0; } -void SvpSalObject::BeginSetClipRegion( sal_uIntPtr ) {} +void SvpSalObject::BeginSetClipRegion( sal_uLong ) {} void SvpSalObject::UnionClipRegion( long, long, long, long ) {} void SvpSalObject::EndSetClipRegion() {} void SvpSalObject::SetPosSize( long, long, long, long ) {} diff --git a/vcl/unx/headless/svpdummies.hxx b/vcl/unx/headless/svpdummies.hxx index 48b3ffc5de19..a72ba11e5c12 100644 --- a/vcl/unx/headless/svpdummies.hxx +++ b/vcl/unx/headless/svpdummies.hxx @@ -45,7 +45,7 @@ public: // overload all pure virtual methods virtual void ResetClipRegion(); virtual sal_uInt16 GetClipRegionType(); - virtual void BeginSetClipRegion( sal_uIntPtr nRects ); + virtual void BeginSetClipRegion( sal_uLong nRects ); virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); virtual void EndSetClipRegion(); diff --git a/vcl/unx/headless/svpframe.cxx b/vcl/unx/headless/svpframe.cxx index b4835dbcf133..9fb54cf29ef1 100644 --- a/vcl/unx/headless/svpframe.cxx +++ b/vcl/unx/headless/svpframe.cxx @@ -39,7 +39,7 @@ SvpSalFrame* SvpSalFrame::s_pFocusFrame = NULL; SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance, SalFrame* pParent, - sal_uIntPtr nSalFrameStyle, + sal_uLong nSalFrameStyle, SystemParentData* ) : m_pInstance( pInstance ), m_pParent( static_cast<SvpSalFrame*>(pParent) ), @@ -435,7 +435,7 @@ void SvpSalFrame::ResetClipRegion() { } -void SvpSalFrame::BeginSetClipRegion( sal_uIntPtr ) +void SvpSalFrame::BeginSetClipRegion( sal_uLong ) { } diff --git a/vcl/unx/headless/svpframe.hxx b/vcl/unx/headless/svpframe.hxx index 37a9a02cde4e..af40fb66fb7f 100644 --- a/vcl/unx/headless/svpframe.hxx +++ b/vcl/unx/headless/svpframe.hxx @@ -42,7 +42,7 @@ class SvpSalFrame : public SalFrame, public SvpElement SvpSalInstance* m_pInstance; SvpSalFrame* m_pParent; // pointer to parent frame std::list< SvpSalFrame* > m_aChildren; // List of child frames - sal_uIntPtr m_nStyle; + sal_uLong m_nStyle; bool m_bVisible; long m_nMinWidth; long m_nMinHeight; @@ -58,7 +58,7 @@ class SvpSalFrame : public SalFrame, public SvpElement public: SvpSalFrame( SvpSalInstance* pInstance, SalFrame* pParent, - sal_uIntPtr nSalFrameStyle, + sal_uLong nSalFrameStyle, SystemParentData* pSystemParent = NULL ); virtual ~SvpSalFrame(); @@ -116,7 +116,7 @@ public: virtual bool SetPluginParent( SystemParentData* pNewParent ); virtual void SetBackgroundBitmap( SalBitmap* pBitmap ); virtual void ResetClipRegion(); - virtual void BeginSetClipRegion( sal_uIntPtr nRects ); + virtual void BeginSetClipRegion( sal_uLong nRects ); virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); virtual void EndSetClipRegion(); diff --git a/vcl/unx/headless/svpgdi.cxx b/vcl/unx/headless/svpgdi.cxx index 5485347213f3..95ce1bb45a1d 100644 --- a/vcl/unx/headless/svpgdi.cxx +++ b/vcl/unx/headless/svpgdi.cxx @@ -152,7 +152,7 @@ void SvpSalGraphics::ResetClipRegion() m_aClipMap.reset(); } -void SvpSalGraphics::BeginSetClipRegion( sal_uIntPtr n ) +void SvpSalGraphics::BeginSetClipRegion( sal_uLong n ) { if( n <= 1 ) { @@ -309,13 +309,13 @@ void SvpSalGraphics::drawRect( long nX, long nY, long nWidth, long nHeight ) dbgOut( m_aDevice ); } -void SvpSalGraphics::drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry ) +void SvpSalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry ) { if( m_bUseLineColor && nPoints ) { B2DPolygon aPoly; aPoly.append( B2DPoint( pPtAry->mnX, pPtAry->mnY ), nPoints ); - for( sal_uIntPtr i = 1; i < nPoints; i++ ) + for( sal_uLong i = 1; i < nPoints; i++ ) aPoly.setB2DPoint( i, B2DPoint( pPtAry[i].mnX, pPtAry[i].mnY ) ); aPoly.setClosed( false ); m_aDevice->drawPolygon( aPoly, m_aLineColor, m_aDrawMode, m_aClipMap ); @@ -323,13 +323,13 @@ void SvpSalGraphics::drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry ) dbgOut( m_aDevice ); } -void SvpSalGraphics::drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry ) +void SvpSalGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry ) { if( ( m_bUseLineColor || m_bUseFillColor ) && nPoints ) { B2DPolygon aPoly; aPoly.append( B2DPoint( pPtAry->mnX, pPtAry->mnY ), nPoints ); - for( sal_uIntPtr i = 1; i < nPoints; i++ ) + for( sal_uLong i = 1; i < nPoints; i++ ) aPoly.setB2DPoint( i, B2DPoint( pPtAry[i].mnX, pPtAry[i].mnY ) ); if( m_bUseFillColor ) { @@ -388,14 +388,14 @@ bool SvpSalGraphics::drawPolyLine( const ::basegfx::B2DPolygon&, double /*fTrans return false; } -sal_Bool SvpSalGraphics::drawPolyLineBezier( sal_uIntPtr, +sal_Bool SvpSalGraphics::drawPolyLineBezier( sal_uLong, const SalPoint*, const sal_uInt8* ) { return sal_False; } -sal_Bool SvpSalGraphics::drawPolygonBezier( sal_uIntPtr, +sal_Bool SvpSalGraphics::drawPolygonBezier( sal_uLong, const SalPoint*, const sal_uInt8* ) { @@ -538,19 +538,19 @@ void SvpSalGraphics::invert( long nX, long nY, long nWidth, long nHeight, SalInv dbgOut( m_aDevice ); } -void SvpSalGraphics::invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert /*nFlags*/ ) +void SvpSalGraphics::invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert /*nFlags*/ ) { // FIXME: handle SAL_INVERT_50 and SAL_INVERT_TRACKFRAME B2DPolygon aPoly; aPoly.append( B2DPoint( pPtAry->mnX, pPtAry->mnY ), nPoints ); - for( sal_uIntPtr i = 1; i < nPoints; i++ ) + for( sal_uLong i = 1; i < nPoints; i++ ) aPoly.setB2DPoint( i, B2DPoint( pPtAry[i].mnX, pPtAry[i].mnY ) ); aPoly.setClosed( true ); m_aDevice->fillPolyPolygon( B2DPolyPolygon(aPoly), basebmp::Color( 0xffffff ), DrawMode_XOR, m_aClipMap ); dbgOut( m_aDevice ); } -sal_Bool SvpSalGraphics::drawEPS( long, long, long, long, void*, sal_uIntPtr ) +sal_Bool SvpSalGraphics::drawEPS( long, long, long, long, void*, sal_uLong ) { return sal_False; } diff --git a/vcl/unx/headless/svpgdi.hxx b/vcl/unx/headless/svpgdi.hxx index 2510d505f6b1..a7486a55198f 100644 --- a/vcl/unx/headless/svpgdi.hxx +++ b/vcl/unx/headless/svpgdi.hxx @@ -68,7 +68,7 @@ public: virtual long GetGraphicsWidth() const; virtual void ResetClipRegion(); - virtual void BeginSetClipRegion( sal_uIntPtr nCount ); + virtual void BeginSetClipRegion( sal_uLong nCount ); virtual sal_Bool unionClipRegion( long nX, long nY, long nWidth, long nHeight ); virtual bool unionClipRegion( const ::basegfx::B2DPolyPolygon& ); virtual void EndSetClipRegion(); @@ -87,7 +87,7 @@ public: virtual void SetTextColor( SalColor nSalColor ); virtual sal_uInt16 SetFont( ImplFontSelectData*, int nFallbackLevel ); virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ); - virtual sal_uIntPtr GetKernPairs( sal_uIntPtr nPairs, ImplKernPairData* pKernPairs ); + virtual sal_uLong GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs ); virtual const ImplFontCharMap* GetImplFontCharMap() const; virtual void GetDevFontList( ImplDevFontList* ); virtual void GetDevFontSubstList( OutputDevice* ); @@ -122,15 +122,15 @@ public: virtual void drawRect( long nX, long nY, long nWidth, long nHeight ); virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ); virtual bool drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin ); - virtual void drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry ); - virtual void drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry ); + virtual void drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry ); + virtual void drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry ); virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ); - virtual sal_Bool drawPolyLineBezier( sal_uIntPtr nPoints, + virtual sal_Bool drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); - virtual sal_Bool drawPolygonBezier( sal_uIntPtr nPoints, + virtual sal_Bool drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, @@ -161,9 +161,9 @@ public: virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ); virtual SalColor getPixel( long nX, long nY ); virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ); - virtual void invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert nFlags ); + virtual void invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags ); - virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ); + virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ); virtual SystemGraphicsData GetGraphicsData() const; virtual SystemFontData GetSysFontData( int nFallbacklevel ) const; diff --git a/vcl/unx/headless/svpinst.cxx b/vcl/unx/headless/svpinst.cxx index b6665550563d..f9ac7e7e2a1e 100644 --- a/vcl/unx/headless/svpinst.cxx +++ b/vcl/unx/headless/svpinst.cxx @@ -192,7 +192,7 @@ inline int operator >= ( const timeval &t1, const timeval &t2 ) return t1.tv_usec >= t2.tv_usec; return t1.tv_sec > t2.tv_sec; } -inline timeval &operator += ( timeval &t1, sal_uIntPtr t2 ) +inline timeval &operator += ( timeval &t1, sal_uLong t2 ) { t1.tv_sec += t2 / 1000; t1.tv_usec += t2 ? (t2 % 1000) * 1000 : 500; @@ -235,12 +235,12 @@ bool SvpSalInstance::CheckTimeout( bool bExecuteTimers ) return bRet; } -SalFrame* SvpSalInstance::CreateChildFrame( SystemParentData* pParent, sal_uIntPtr nStyle ) +SalFrame* SvpSalInstance::CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle ) { return new SvpSalFrame( this, NULL, nStyle, pParent ); } -SalFrame* SvpSalInstance::CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle ) +SalFrame* SvpSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nStyle ) { return new SvpSalFrame( this, pParent, nStyle ); } @@ -299,13 +299,13 @@ vos::IMutex* SvpSalInstance::GetYieldMutex() return &m_aYieldMutex; } -sal_uIntPtr SvpSalInstance::ReleaseYieldMutex() +sal_uLong SvpSalInstance::ReleaseYieldMutex() { if ( m_aYieldMutex.GetThreadId() == vos::OThread::getCurrentIdentifier() ) { - sal_uIntPtr nCount = m_aYieldMutex.GetAcquireCount(); - sal_uIntPtr n = nCount; + sal_uLong nCount = m_aYieldMutex.GetAcquireCount(); + sal_uLong n = nCount; while ( n ) { m_aYieldMutex.release(); @@ -318,7 +318,7 @@ sal_uIntPtr SvpSalInstance::ReleaseYieldMutex() return 0; } -void SvpSalInstance::AcquireYieldMutex( sal_uIntPtr nCount ) +void SvpSalInstance::AcquireYieldMutex( sal_uLong nCount ) { while ( nCount ) { @@ -346,7 +346,7 @@ void SvpSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents ) // release yield mutex std::list< SalUserEvent > aEvents; - sal_uIntPtr nAcquireCount = ReleaseYieldMutex(); + sal_uLong nAcquireCount = ReleaseYieldMutex(); if( osl_acquireMutex( m_aEventGuard ) ) { if( ! m_aUserEvents.empty() ) @@ -497,7 +497,7 @@ void SvpSalInstance::StopTimer() m_nTimeoutMS = 0; } -void SvpSalInstance::StartTimer( sal_uIntPtr nMS ) +void SvpSalInstance::StartTimer( sal_uLong nMS ) { timeval Timeout (m_aTimeout); // previous timeout. gettimeofday (&m_aTimeout, 0); @@ -525,7 +525,7 @@ void SvpSalTimer::Stop() m_pInstance->StopTimer(); } -void SvpSalTimer::Start( sal_uIntPtr nMS ) +void SvpSalTimer::Start( sal_uLong nMS ) { m_pInstance->StartTimer( nMS ); } diff --git a/vcl/unx/headless/svpinst.hxx b/vcl/unx/headless/svpinst.hxx index 05f3c01f5bb5..736916bbaced 100644 --- a/vcl/unx/headless/svpinst.hxx +++ b/vcl/unx/headless/svpinst.hxx @@ -49,7 +49,7 @@ class SvpSalYieldMutex : public vos::OMutex { protected: - sal_uIntPtr mnCount; + sal_uLong mnCount; vos::OThread::TThreadIdentifier mnThreadId; public: @@ -59,7 +59,7 @@ public: virtual void release(); virtual sal_Bool tryToAcquire(); - sal_uIntPtr GetAcquireCount() const { return mnCount; } + sal_uLong GetAcquireCount() const { return mnCount; } vos::OThread::TThreadIdentifier GetThreadId() const { return mnThreadId; } }; @@ -75,7 +75,7 @@ public: virtual ~SvpSalTimer(); // overload all pure virtual methods - virtual void Start( sal_uIntPtr nMS ); + virtual void Start( sal_uLong nMS ); virtual void Stop(); }; @@ -86,7 +86,7 @@ class SvpSalFrame; class SvpSalInstance : public SalInstance { timeval m_aTimeout; - sal_uIntPtr m_nTimeoutMS; + sal_uLong m_nTimeoutMS; int m_pTimeoutFDS[2]; SvpSalYieldMutex m_aYieldMutex; @@ -120,7 +120,7 @@ public: void PostEvent( const SalFrame* pFrame, void* pData, sal_uInt16 nEvent ); void CancelEvent( const SalFrame* pFrame, void* pData, sal_uInt16 nEvent ); - void StartTimer( sal_uIntPtr nMS ); + void StartTimer( sal_uLong nMS ); void StopTimer(); void Wakeup(); @@ -131,8 +131,8 @@ public: bool CheckTimeout( bool bExecuteTimers = true ); // Frame - virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uIntPtr nStyle ); - virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle ); + virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle ); + virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle ); virtual void DestroyFrame( SalFrame* pFrame ); // Object (System Child Window) @@ -174,8 +174,8 @@ public: // YieldMutex virtual vos::IMutex* GetYieldMutex(); - virtual sal_uIntPtr ReleaseYieldMutex(); - virtual void AcquireYieldMutex( sal_uIntPtr nCount ); + virtual sal_uLong ReleaseYieldMutex(); + virtual void AcquireYieldMutex( sal_uLong nCount ); virtual bool CheckYieldMutex(); // wait next event and dispatch diff --git a/vcl/unx/headless/svpprn.cxx b/vcl/unx/headless/svpprn.cxx index a81f894e4505..0c8a119806af 100644 --- a/vcl/unx/headless/svpprn.cxx +++ b/vcl/unx/headless/svpprn.cxx @@ -558,7 +558,7 @@ sal_Bool PspSalInfoPrinter::SetPrinterData( ImplJobSetup* pJobSetup ) // Only the data must be changed, where the bit // in nGetDataFlags is set sal_Bool PspSalInfoPrinter::SetData( - sal_uIntPtr nSetDataFlags, + sal_uLong nSetDataFlags, ImplJobSetup* pJobSetup ) { JobData aData; @@ -707,7 +707,7 @@ void PspSalInfoPrinter::GetPageInfo( // ----------------------------------------------------------------------- -sal_uIntPtr PspSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup ) +sal_uLong PspSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup ) { if( ! pJobSetup ) return 0; @@ -721,7 +721,7 @@ sal_uIntPtr PspSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup ) // ----------------------------------------------------------------------- -String PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_uIntPtr nPaperBin ) +String PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_uLong nPaperBin ) { JobData aData; JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aData ); @@ -745,7 +745,7 @@ String PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_uI // ----------------------------------------------------------------------- -sal_uIntPtr PspSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, sal_uInt16 nType ) +sal_uLong PspSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, sal_uInt16 nType ) { switch( nType ) { @@ -845,7 +845,7 @@ sal_Bool PspSalPrinter::StartJob( const XubString* pFileName, const XubString& rJobName, const XubString& rAppName, - sal_uIntPtr nCopies, + sal_uLong nCopies, bool bCollate, bool /*bDirect*/, ImplJobSetup* pJobSetup ) @@ -990,7 +990,7 @@ sal_Bool PspSalPrinter::EndPage() // ----------------------------------------------------------------------- -sal_uIntPtr PspSalPrinter::GetErrorCode() +sal_uLong PspSalPrinter::GetErrorCode() { return 0; } diff --git a/vcl/unx/headless/svpprn.hxx b/vcl/unx/headless/svpprn.hxx index 8c7372115cde..84dbf8277054 100644 --- a/vcl/unx/headless/svpprn.hxx +++ b/vcl/unx/headless/svpprn.hxx @@ -50,14 +50,14 @@ public: virtual void ReleaseGraphics( SalGraphics* pGraphics ); virtual sal_Bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ); virtual sal_Bool SetPrinterData( ImplJobSetup* pSetupData ); - virtual sal_Bool SetData( sal_uIntPtr nFlags, ImplJobSetup* pSetupData ); + virtual sal_Bool SetData( sal_uLong nFlags, ImplJobSetup* pSetupData ); virtual void GetPageInfo( const ImplJobSetup* pSetupData, long& rOutWidth, long& rOutHeight, long& rPageOffX, long& rPageOffY, long& rPageWidth, long& rPageHeight ); - virtual sal_uIntPtr GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ); - virtual sal_uIntPtr GetPaperBinCount( const ImplJobSetup* pSetupData ); - virtual String GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin ); + virtual sal_uLong GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ); + virtual sal_uLong GetPaperBinCount( const ImplJobSetup* pSetupData ); + virtual String GetPaperBinName( const ImplJobSetup* pSetupData, sal_uLong nPaperBin ); virtual void InitPaperFormats( const ImplJobSetup* pSetupData ); virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData ); }; @@ -75,7 +75,7 @@ public: psp::PrinterJob m_aPrintJob; psp::JobData m_aJobData; psp::PrinterGfx m_aPrinterGfx; - sal_uIntPtr m_nCopies; + sal_uLong m_nCopies; bool m_bCollate; SalInfoPrinter* m_pInfoPrinter; @@ -87,7 +87,7 @@ public: virtual sal_Bool StartJob( const XubString* pFileName, const XubString& rJobName, const XubString& rAppName, - sal_uIntPtr nCopies, + sal_uLong nCopies, bool bCollate, bool bDirect, ImplJobSetup* pSetupData ); @@ -95,7 +95,7 @@ public: virtual sal_Bool AbortJob(); virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, sal_Bool bNewJobData ); virtual sal_Bool EndPage(); - virtual sal_uIntPtr GetErrorCode(); + virtual sal_uLong GetErrorCode(); }; class Timer; diff --git a/vcl/unx/headless/svppspgraphics.cxx b/vcl/unx/headless/svppspgraphics.cxx index fe9a883fa583..fda458c5c73e 100644 --- a/vcl/unx/headless/svppspgraphics.cxx +++ b/vcl/unx/headless/svppspgraphics.cxx @@ -219,7 +219,7 @@ void PspGraphics::ResetClipRegion() m_pPrinterGfx->ResetClipRegion (); } -void PspGraphics::BeginSetClipRegion( sal_uIntPtr n ) +void PspGraphics::BeginSetClipRegion( sal_uLong n ) { m_pPrinterGfx->BeginSetClipRegion(n); } @@ -305,12 +305,12 @@ void PspGraphics::drawRect( long nX, long nY, long nDX, long nDY ) m_pPrinterGfx->DrawRect (Rectangle(Point(nX, nY), Size(nDX, nDY))); } -void PspGraphics::drawPolyLine( sal_uIntPtr nPoints, const SalPoint *pPtAry ) +void PspGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry ) { m_pPrinterGfx->DrawPolyLine (nPoints, (Point*)pPtAry); } -void PspGraphics::drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry ) +void PspGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry ) { // Point must be equal to SalPoint! see vcl/inc/salgtype.hxx m_pPrinterGfx->DrawPolygon (nPoints, (Point*)pPtAry); @@ -329,13 +329,13 @@ bool PspGraphics::drawPolyLine( const ::basegfx::B2DPolygon&, double /*fTranspar return false; } -sal_Bool PspGraphics::drawPolyLineBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) +sal_Bool PspGraphics::drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) { m_pPrinterGfx->DrawPolyLineBezier (nPoints, (Point*)pPtAry, pFlgAry); return sal_True; } -sal_Bool PspGraphics::drawPolygonBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) +sal_Bool PspGraphics::drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) { m_pPrinterGfx->DrawPolygonBezier (nPoints, (Point*)pPtAry, pFlgAry); return sal_True; @@ -357,13 +357,13 @@ bool PspGraphics::drawPolyPolygon( const basegfx::B2DPolyPolygon&, double /*fTra return false; } -void PspGraphics::invert( sal_uIntPtr /*nPoints*/, +void PspGraphics::invert( sal_uLong /*nPoints*/, const SalPoint* /*pPtAry*/, SalInvert /*nFlags*/ ) { DBG_ASSERT( 0, "Error: PrinterGfx::Invert() not implemented" ); } -sal_Bool PspGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ) +sal_Bool PspGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) { return m_pPrinterGfx->DrawEPS( Rectangle( Point( nX, nY ), Size( nWidth, nHeight ) ), pPtr, nSize ); } @@ -817,10 +817,10 @@ void PspGraphics::GetFontMetric( ImplFontMetricData *pMetric, int ) } } -sal_uInt32 PspGraphics::GetKernPairs( sal_uIntPtr nPairs, ImplKernPairData *pKernPairs ) +sal_uInt32 PspGraphics::GetKernPairs( sal_uLong nPairs, ImplKernPairData *pKernPairs ) { const ::std::list< ::psp::KernPair >& rPairs( m_pPrinterGfx->getKernPairs() ); - sal_uIntPtr nHavePairs = rPairs.size(); + sal_uLong nHavePairs = rPairs.size(); if( pKernPairs && nPairs ) { ::std::list< ::psp::KernPair >::const_iterator it; diff --git a/vcl/unx/headless/svppspgraphics.hxx b/vcl/unx/headless/svppspgraphics.hxx index ee6f5bc25570..fe9352c1fd8b 100644 --- a/vcl/unx/headless/svppspgraphics.hxx +++ b/vcl/unx/headless/svppspgraphics.hxx @@ -90,7 +90,7 @@ public: virtual long GetGraphicsWidth() const; virtual void ResetClipRegion(); - virtual void BeginSetClipRegion( sal_uIntPtr nCount ); + virtual void BeginSetClipRegion( sal_uLong nCount ); virtual sal_Bool unionClipRegion( long nX, long nY, long nWidth, long nHeight ); virtual bool unionClipRegion( const ::basegfx::B2DPolyPolygon& ); virtual void EndSetClipRegion(); @@ -106,7 +106,7 @@ public: virtual void SetTextColor( SalColor nSalColor ); virtual sal_uInt16 SetFont( ImplFontSelectData*, int nFallbackLevel ); virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ); - virtual sal_uIntPtr GetKernPairs( sal_uIntPtr nPairs, ImplKernPairData* pKernPairs ); + virtual sal_uLong GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs ); virtual const ImplFontCharMap* GetImplFontCharMap() const; virtual void GetDevFontList( ImplDevFontList* ); virtual void GetDevFontSubstList( OutputDevice* ); @@ -139,17 +139,17 @@ public: virtual void drawPixel( long nX, long nY, SalColor nSalColor ); virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ); virtual void drawRect( long nX, long nY, long nWidth, long nHeight ); - virtual void drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry ); - virtual void drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry ); + virtual void drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry ); + virtual void drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry ); virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ); virtual bool drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin ); virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ); - virtual sal_Bool drawPolyLineBezier( sal_uIntPtr nPoints, + virtual sal_Bool drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); - virtual sal_Bool drawPolygonBezier( sal_uIntPtr nPoints, + virtual sal_Bool drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, @@ -180,9 +180,9 @@ public: virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ); virtual SalColor getPixel( long nX, long nY ); virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ); - virtual void invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert nFlags ); + virtual void invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags ); - virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ); + virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ); virtual bool filterText( const String& rOrigText, String& rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart, xub_StrLen& rCutStop ); virtual SystemGraphicsData GetGraphicsData() const; diff --git a/vcl/unx/headless/svptext.cxx b/vcl/unx/headless/svptext.cxx index dbe1b2c4dc32..fba7fe4bf31d 100644 --- a/vcl/unx/headless/svptext.cxx +++ b/vcl/unx/headless/svptext.cxx @@ -254,15 +254,15 @@ void SvpSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLe // --------------------------------------------------------------------------- -sal_uIntPtr SvpSalGraphics::GetKernPairs( sal_uIntPtr nPairs, ImplKernPairData* pKernPairs ) +sal_uLong SvpSalGraphics::GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs ) { - sal_uIntPtr nGotPairs = 0; + sal_uLong nGotPairs = 0; if( m_pServerFont[0] != NULL ) { ImplKernPairData* pTmpKernPairs = NULL; nGotPairs = m_pServerFont[0]->GetKernPairs( &pTmpKernPairs ); - for( sal_uIntPtr i = 0; i < nPairs && i < nGotPairs; ++i ) + for( sal_uLong i = 0; i < nPairs && i < nGotPairs; ++i ) pKernPairs[ i ] = pTmpKernPairs[ i ]; delete[] pTmpKernPairs; } diff --git a/vcl/unx/inc/plugins/gtk/gtkframe.hxx b/vcl/unx/inc/plugins/gtk/gtkframe.hxx index 528b08925ad4..1ddc9e24e4f1 100644 --- a/vcl/unx/inc/plugins/gtk/gtkframe.hxx +++ b/vcl/unx/inc/plugins/gtk/gtkframe.hxx @@ -167,7 +167,7 @@ class GtkSalFrame : public SalFrame GdkWindow* m_pForeignTopLevel; GdkNativeWindow m_aForeignTopLevelWindow; Pixmap m_hBackgroundPixmap; - sal_uIntPtr m_nStyle; + sal_uLong m_nStyle; SalExtStyle m_nExtStyle; GtkFixed* m_pFixedContainer; GtkSalFrame* m_pParent; @@ -199,7 +199,7 @@ class GtkSalFrame : public SalFrame GdkRegion* m_pRegion; - void Init( SalFrame* pParent, sal_uIntPtr nStyle ); + void Init( SalFrame* pParent, sal_uLong nStyle ); void Init( SystemParentData* pSysData ); void InitCommon(); @@ -251,7 +251,7 @@ class GtkSalFrame : public SalFrame bool isChild( bool bPlug = true, bool bSysChild = true ) { - sal_uIntPtr nMask = 0; + sal_uLong nMask = 0; if( bPlug ) nMask |= SAL_FRAME_STYLE_PLUG; if( bSysChild ) @@ -270,7 +270,7 @@ class GtkSalFrame : public SalFrame DECL_LINK( ImplDelayedFullScreenHdl, void* ); public: - GtkSalFrame( SalFrame* pParent, sal_uIntPtr nStyle ); + GtkSalFrame( SalFrame* pParent, sal_uLong nStyle ); GtkSalFrame( SystemParentData* pSysData ); // dispatches an event, returns true if dispatched @@ -386,7 +386,7 @@ public: // set clip region to none (-> rectangular windows, normal state) virtual void ResetClipRegion(); // start setting the clipregion consisting of nRects rectangles - virtual void BeginSetClipRegion( sal_uIntPtr nRects ); + virtual void BeginSetClipRegion( sal_uLong nRects ); // add a rectangle to the clip region virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); // done setting up the clipregion diff --git a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx b/vcl/unx/inc/plugins/gtk/gtkgdi.hxx index 57e36ca5a2ed..0b4439e6881f 100644 --- a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx +++ b/vcl/unx/inc/plugins/gtk/gtkgdi.hxx @@ -79,7 +79,7 @@ public: void updateSettings( AllSettings& rSettings ); virtual void ResetClipRegion(); - virtual void BeginSetClipRegion( sal_uIntPtr nCount ); + virtual void BeginSetClipRegion( sal_uLong nCount ); virtual sal_Bool unionClipRegion( long nX, long nY, long nWidth, long nHeight ); virtual bool unionClipRegion( const ::basegfx::B2DPolyPolygon& ); virtual void EndSetClipRegion(); diff --git a/vcl/unx/inc/plugins/gtk/gtkinst.hxx b/vcl/unx/inc/plugins/gtk/gtkinst.hxx index 58c485ce6e20..a9f788831199 100644 --- a/vcl/unx/inc/plugins/gtk/gtkinst.hxx +++ b/vcl/unx/inc/plugins/gtk/gtkinst.hxx @@ -63,7 +63,7 @@ class GtkHookedYieldMutex : public GtkYieldMutex { virtual int Grab() { return 0; }; virtual void Ungrab(int ) {}; - std::list<sal_uIntPtr> aYieldStack; + std::list<sal_uLong> aYieldStack; public: GtkHookedYieldMutex(); virtual void acquire(); @@ -84,8 +84,8 @@ public: {} virtual ~GtkInstance(); - virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle ); - virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uIntPtr nStyle ); + virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle ); + virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle ); virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True ); virtual SalSystem* CreateSalSystem(); virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType); diff --git a/vcl/unx/inc/plugins/gtk/gtkobject.hxx b/vcl/unx/inc/plugins/gtk/gtkobject.hxx index fdba1bb9fd38..67434f038617 100644 --- a/vcl/unx/inc/plugins/gtk/gtkobject.hxx +++ b/vcl/unx/inc/plugins/gtk/gtkobject.hxx @@ -50,7 +50,7 @@ public: // overload all pure virtual methods virtual void ResetClipRegion(); virtual sal_uInt16 GetClipRegionType(); - virtual void BeginSetClipRegion( sal_uIntPtr nRects ); + virtual void BeginSetClipRegion( sal_uLong nRects ); virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); virtual void EndSetClipRegion(); diff --git a/vcl/unx/inc/plugins/kde/kdedata.hxx b/vcl/unx/inc/plugins/kde/kdedata.hxx index e31c4b7cc8e7..210799493638 100644 --- a/vcl/unx/inc/plugins/kde/kdedata.hxx +++ b/vcl/unx/inc/plugins/kde/kdedata.hxx @@ -67,7 +67,7 @@ class KDESalFrame : public X11SalFrame GraphicsHolder m_aGraphics[ nMaxGraphics ]; public: - KDESalFrame( SalFrame* pParent, sal_uIntPtr ); + KDESalFrame( SalFrame* pParent, sal_uLong ); virtual ~KDESalFrame(); virtual SalGraphics* GetGraphics(); @@ -83,7 +83,7 @@ public: KDESalInstance( SalYieldMutex* pMutex ) : X11SalInstance( pMutex ) {} virtual ~KDESalInstance() {} - virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle ); + virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle ); }; class KDEXLib : public SalXLib diff --git a/vcl/unx/inc/saldata.hxx b/vcl/unx/inc/saldata.hxx index 34180474e256..42240237a5ec 100644 --- a/vcl/unx/inc/saldata.hxx +++ b/vcl/unx/inc/saldata.hxx @@ -85,7 +85,7 @@ public: inline SalXLib* GetLib() const { return pXLib_; } inline pthread_t GetMainThread() const { return hMainThread_; } - void StartTimer( sal_uIntPtr nMS ); + void StartTimer( sal_uLong nMS ); inline void StopTimer(); void Timeout() const; @@ -114,7 +114,7 @@ inline void X11SalData::XError( Display *pDisplay, XErrorEvent *pEvent ) const class YieldMutexReleaser { - sal_uIntPtr m_nYieldCount; + sal_uLong m_nYieldCount; public: inline YieldMutexReleaser(); inline ~YieldMutexReleaser(); diff --git a/vcl/unx/inc/saldisp.hxx b/vcl/unx/inc/saldisp.hxx index 2c35ce4445ed..2b2f6ff6f3d7 100644 --- a/vcl/unx/inc/saldisp.hxx +++ b/vcl/unx/inc/saldisp.hxx @@ -212,7 +212,7 @@ class VCL_DLLPUBLIC SalXLib { protected: timeval m_aTimeout; - sal_uIntPtr m_nTimeoutMS; + sal_uLong m_nTimeoutMS; int m_pTimeoutFDS[2]; bool m_bHaveSystemChildFrames; @@ -254,7 +254,7 @@ public: void PushXErrorLevel( bool bIgnore ); void PopXErrorLevel(); - virtual void StartTimer( sal_uIntPtr nMS ); + virtual void StartTimer( sal_uLong nMS ); virtual void StopTimer(); bool CheckTimeout( bool bExecuteTimers = true ); @@ -358,11 +358,11 @@ protected: ScreenData m_aInvalidScreenData; Pair aResolution_; // [dpi] bool mbExactResolution; - sal_uIntPtr nMaxRequestSize_; // [byte] + sal_uLong nMaxRequestSize_; // [byte] srv_vendor_t meServerVendor; SalWM eWindowManager_; - sal_uIntPtr nProperties_; // PROPERTY_SUPPORT, BUG, FEATURE + sal_uLong nProperties_; // PROPERTY_SUPPORT, BUG, FEATURE sal_Bool bLocal_; // Server==Client? Init // in SalDisplay::IsLocal() sal_Bool mbLocalIsValid; // bLocal_ is valid ? @@ -493,8 +493,8 @@ public: RenderEntryMap& GetRenderEntries( int nScreen ) const { return getDataForScreen(nScreen).m_aRenderData; } const Pair &GetResolution() const { return aResolution_; } bool GetExactResolution() const { return mbExactResolution; } - sal_uIntPtr GetProperties() const { return nProperties_; } - sal_uIntPtr GetMaxRequestSize() const { return nMaxRequestSize_; } + sal_uLong GetProperties() const { return nProperties_; } + sal_uLong GetMaxRequestSize() const { return nMaxRequestSize_; } XLIB_Time GetLastUserEventTime( bool bAlwaysReget = false ) const; bool XIfEventWithTimeout( XEvent*, XPointer, X_if_predicate, long i_nTimeout = 1000 ) const; diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx index 9d3dd511de19..30cbb0cea365 100644 --- a/vcl/unx/kde/salnativewidgets-kde.cxx +++ b/vcl/unx/kde/salnativewidgets-kde.cxx @@ -1710,7 +1710,7 @@ sal_Bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart // KDESalFrame implementation // ----------------------------------------------------------------------- -KDESalFrame::KDESalFrame( SalFrame* pParent, sal_uIntPtr nStyle ) : +KDESalFrame::KDESalFrame( SalFrame* pParent, sal_uLong nStyle ) : X11SalFrame( pParent, nStyle ) { } @@ -2083,7 +2083,7 @@ KDESalFrame::GraphicsHolder::~GraphicsHolder() // ----------------------------------------------------------------------- SalFrame * -KDESalInstance::CreateFrame( SalFrame *pParent, sal_uIntPtr nStyle ) +KDESalInstance::CreateFrame( SalFrame *pParent, sal_uLong nStyle ) { return new KDESalFrame( pParent, nStyle ); } diff --git a/vcl/unx/source/app/i18n_status.cxx b/vcl/unx/source/app/i18n_status.cxx index 594cdf9c89de..844775779935 100644 --- a/vcl/unx/source/app/i18n_status.cxx +++ b/vcl/unx/source/app/i18n_status.cxx @@ -102,7 +102,7 @@ class XIMStatusWindow : public StatusWindow // for delayed showing bool m_bDelayedShow; I18NStatus::ShowReason m_eDelayedReason; - sal_uIntPtr m_nDelayedEvent; + sal_uLong m_nDelayedEvent; // for toggling bool m_bOn; diff --git a/vcl/unx/source/app/salinst.cxx b/vcl/unx/source/app/salinst.cxx index 431367deeef1..b67988605673 100644 --- a/vcl/unx/source/app/salinst.cxx +++ b/vcl/unx/source/app/salinst.cxx @@ -227,14 +227,14 @@ vos::IMutex* X11SalInstance::GetYieldMutex() // ----------------------------------------------------------------------- -sal_uIntPtr X11SalInstance::ReleaseYieldMutex() +sal_uLong X11SalInstance::ReleaseYieldMutex() { SalYieldMutex* pYieldMutex = mpSalYieldMutex; if ( pYieldMutex->GetThreadId() == vos::OThread::getCurrentIdentifier() ) { - sal_uIntPtr nCount = pYieldMutex->GetAcquireCount(); - sal_uIntPtr n = nCount; + sal_uLong nCount = pYieldMutex->GetAcquireCount(); + sal_uLong n = nCount; while ( n ) { pYieldMutex->release(); @@ -249,7 +249,7 @@ sal_uIntPtr X11SalInstance::ReleaseYieldMutex() // ----------------------------------------------------------------------- -void X11SalInstance::AcquireYieldMutex( sal_uIntPtr nCount ) +void X11SalInstance::AcquireYieldMutex( sal_uLong nCount ) { SalYieldMutex* pYieldMutex = mpSalYieldMutex; while ( nCount ) @@ -288,14 +288,14 @@ void* X11SalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rReturn return pDisplay ? (void*)pDisplay : (void*)""; } -SalFrame *X11SalInstance::CreateFrame( SalFrame *pParent, sal_uIntPtr nSalFrameStyle ) +SalFrame *X11SalInstance::CreateFrame( SalFrame *pParent, sal_uLong nSalFrameStyle ) { SalFrame *pFrame = new X11SalFrame( pParent, nSalFrameStyle ); return pFrame; } -SalFrame* X11SalInstance::CreateChildFrame( SystemParentData* pParentData, sal_uIntPtr nStyle ) +SalFrame* X11SalInstance::CreateChildFrame( SystemParentData* pParentData, sal_uLong nStyle ) { SalFrame* pFrame = new X11SalFrame( NULL, nStyle, pParentData ); diff --git a/vcl/unx/source/app/saltimer.cxx b/vcl/unx/source/app/saltimer.cxx index cb8f7d06f64e..1085967f74a2 100644 --- a/vcl/unx/source/app/saltimer.cxx +++ b/vcl/unx/source/app/saltimer.cxx @@ -58,7 +58,7 @@ void SalXLib::StopTimer() m_nTimeoutMS = 0; } -void SalXLib::StartTimer( sal_uIntPtr nMS ) +void SalXLib::StartTimer( sal_uLong nMS ) { timeval Timeout (m_aTimeout); // previous timeout. gettimeofday (&m_aTimeout, 0); @@ -89,7 +89,7 @@ void X11SalTimer::Stop() GetX11SalData()->GetLib()->StopTimer(); } -void X11SalTimer::Start( sal_uIntPtr nMS ) +void X11SalTimer::Start( sal_uLong nMS ) { GetX11SalData()->GetLib()->StartTimer( nMS ); } diff --git a/vcl/unx/source/gdi/gcach_xpeer.cxx b/vcl/unx/source/gdi/gcach_xpeer.cxx index c3ff95b99082..9b876eb329b8 100644 --- a/vcl/unx/source/gdi/gcach_xpeer.cxx +++ b/vcl/unx/source/gdi/gcach_xpeer.cxx @@ -465,13 +465,13 @@ Pixmap X11GlyphPeer::GetPixmap( ServerFont& rServerFont, int nGlyphIndex, int nR if( rServerFont.GetGlyphBitmap1( nGlyphIndex, maRawBitmap ) ) { // #94666# circumvent bug in some X11 systems, e.g. XF410.LynxEM.v163 - sal_uIntPtr nPixmapWidth = 8 * maRawBitmap.mnScanlineSize - 1; + sal_uLong nPixmapWidth = 8 * maRawBitmap.mnScanlineSize - 1; nPixmapWidth = Max( nPixmapWidth, maRawBitmap.mnWidth ); rGlyphData.SetSize( Size( nPixmapWidth, maRawBitmap.mnHeight ) ); rGlyphData.SetOffset( +maRawBitmap.mnXOffset, +maRawBitmap.mnYOffset ); - const sal_uIntPtr nBytes = maRawBitmap.mnHeight * maRawBitmap.mnScanlineSize; + const sal_uLong nBytes = maRawBitmap.mnHeight * maRawBitmap.mnScanlineSize; if( nBytes > 0 ) { // conversion table LSB<->MSB (for XCreatePixmapFromData) @@ -621,7 +621,7 @@ Glyph X11GlyphPeer::GetGlyphId( ServerFont& rServerFont, int nGlyphIndex ) GlyphSet aGlyphSet = GetGlyphSet( rServerFont, -1 ); aGlyphId = nGlyphIndex & 0x00FFFFFF; - const sal_uIntPtr nBytes = maRawBitmap.mnScanlineSize * maRawBitmap.mnHeight; + const sal_uLong nBytes = maRawBitmap.mnScanlineSize * maRawBitmap.mnHeight; XRenderPeer::GetInstance().AddGlyph( aGlyphSet, aGlyphId, aGlyphInfo, (char*)maRawBitmap.mpBits, nBytes ); mnBytesUsed += nBytes; diff --git a/vcl/unx/source/gdi/pspgraphics.cxx b/vcl/unx/source/gdi/pspgraphics.cxx index 57cbca3f1ae8..422c547fca45 100644 --- a/vcl/unx/source/gdi/pspgraphics.cxx +++ b/vcl/unx/source/gdi/pspgraphics.cxx @@ -293,7 +293,7 @@ void PspGraphics::ResetClipRegion() m_pPrinterGfx->ResetClipRegion (); } -void PspGraphics::BeginSetClipRegion( sal_uIntPtr n ) +void PspGraphics::BeginSetClipRegion( sal_uLong n ) { m_pPrinterGfx->BeginSetClipRegion(n); } @@ -379,12 +379,12 @@ void PspGraphics::drawRect( long nX, long nY, long nDX, long nDY ) m_pPrinterGfx->DrawRect (Rectangle(Point(nX, nY), Size(nDX, nDY))); } -void PspGraphics::drawPolyLine( sal_uIntPtr nPoints, const SalPoint *pPtAry ) +void PspGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry ) { m_pPrinterGfx->DrawPolyLine (nPoints, (Point*)pPtAry); } -void PspGraphics::drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry ) +void PspGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry ) { // Point must be equal to SalPoint! see vcl/inc/salgtype.hxx m_pPrinterGfx->DrawPolygon (nPoints, (Point*)pPtAry); @@ -409,13 +409,13 @@ bool PspGraphics::drawPolyLine( const basegfx::B2DPolygon&, double /*fTransparen return false; } -sal_Bool PspGraphics::drawPolyLineBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) +sal_Bool PspGraphics::drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) { m_pPrinterGfx->DrawPolyLineBezier (nPoints, (Point*)pPtAry, pFlgAry); return sal_True; } -sal_Bool PspGraphics::drawPolygonBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) +sal_Bool PspGraphics::drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) { m_pPrinterGfx->DrawPolygonBezier (nPoints, (Point*)pPtAry, pFlgAry); return sal_True; @@ -431,13 +431,13 @@ sal_Bool PspGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly, return sal_True; } -void PspGraphics::invert( sal_uIntPtr, +void PspGraphics::invert( sal_uLong, const SalPoint*, SalInvert ) { DBG_ASSERT( 0, "Error: PrinterGfx::Invert() not implemented" ); } -sal_Bool PspGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ) +sal_Bool PspGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) { return m_pPrinterGfx->DrawEPS( Rectangle( Point( nX, nY ), Size( nWidth, nHeight ) ), pPtr, nSize ); } @@ -915,10 +915,10 @@ void PspGraphics::GetFontMetric( ImplFontMetricData *pMetric, int ) } } -sal_uInt32 PspGraphics::GetKernPairs( sal_uIntPtr nPairs, ImplKernPairData *pKernPairs ) +sal_uInt32 PspGraphics::GetKernPairs( sal_uLong nPairs, ImplKernPairData *pKernPairs ) { const ::std::list< ::psp::KernPair >& rPairs( m_pPrinterGfx->getKernPairs() ); - sal_uIntPtr nHavePairs = rPairs.size(); + sal_uLong nHavePairs = rPairs.size(); if( pKernPairs && nPairs ) { ::std::list< ::psp::KernPair >::const_iterator it; diff --git a/vcl/unx/source/gdi/salbmp.cxx b/vcl/unx/source/gdi/salbmp.cxx index 5ddcd7d311b9..42d657b431bd 100644 --- a/vcl/unx/source/gdi/salbmp.cxx +++ b/vcl/unx/source/gdi/salbmp.cxx @@ -64,7 +64,7 @@ SalBitmap* X11SalInstance::CreateSalBitmap() } ImplSalBitmapCache* X11SalBitmap::mpCache = NULL; -sal_uIntPtr X11SalBitmap::mnCacheInstCount = 0; +sal_uLong X11SalBitmap::mnCacheInstCount = 0; // ----------------------------------------------------------------------------- @@ -214,7 +214,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( Drawable aDrawable, { const SalTwoRect aTwoRect = { 0, 0, nWidth, nHeight, 0, 0, nWidth, nHeight }; BitmapBuffer aSrcBuf; - sal_uIntPtr nDstFormat = BMP_FORMAT_BOTTOM_UP; + sal_uLong nDstFormat = BMP_FORMAT_BOTTOM_UP; const BitmapPalette* pDstPal = NULL; aSrcBuf.mnFormat = BMP_FORMAT_TOP_DOWN; @@ -304,7 +304,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( Drawable aDrawable, else if( aSrcBuf.mnBitCount <= 8 ) { const SalColormap& rColMap = pSalDisp->GetColormap( nScreen ); - const sal_uInt16 nCols = Min( (sal_uIntPtr)rColMap.GetUsed(), (sal_uIntPtr)(1 << nDrawableDepth) ); + const sal_uInt16 nCols = Min( (sal_uLong)rColMap.GetUsed(), (sal_uLong)(1 << nDrawableDepth) ); rPal.SetEntryCount( nCols ); pDstPal = &rPal; @@ -363,7 +363,7 @@ XImage* X11SalBitmap::ImplCreateXImage( SalDisplay *pSalDisp, int nScreen, long if( pImage ) { BitmapBuffer* pDstBuf; - sal_uIntPtr nDstFormat = BMP_FORMAT_TOP_DOWN; + sal_uLong nDstFormat = BMP_FORMAT_TOP_DOWN; BitmapPalette* pPal = NULL; ColorMask* pMask = NULL; @@ -430,7 +430,7 @@ XImage* X11SalBitmap::ImplCreateXImage( SalDisplay *pSalDisp, int nScreen, long else if( pImage->depth <= 8 ) { const SalColormap& rColMap = pSalDisp->GetColormap( nScreen ); - const sal_uInt16 nCols = Min( (sal_uIntPtr)rColMap.GetUsed(), (sal_uIntPtr)(1 << pImage->depth) ); + const sal_uInt16 nCols = Min( (sal_uLong)rColMap.GetUsed(), (sal_uLong)(1 << pImage->depth) ); pPal = new BitmapPalette( nCols ); @@ -1018,10 +1018,10 @@ void ImplSalDDB::ImplDraw( Drawable aSrcDrawable, long nSrcDrawableDepth, struct ImplBmpObj { X11SalBitmap* mpBmp; - sal_uIntPtr mnMemSize; - sal_uIntPtr mnFlags; + sal_uLong mnMemSize; + sal_uLong mnFlags; - ImplBmpObj( X11SalBitmap* pBmp, sal_uIntPtr nMemSize, sal_uIntPtr nFlags ) : + ImplBmpObj( X11SalBitmap* pBmp, sal_uLong nMemSize, sal_uLong nFlags ) : mpBmp( pBmp ), mnMemSize( nMemSize ), mnFlags( nFlags ) {} }; @@ -1041,7 +1041,7 @@ ImplSalBitmapCache::~ImplSalBitmapCache() // ----------------------------------------------------------------------------- -void ImplSalBitmapCache::ImplAdd( X11SalBitmap* pBmp, sal_uIntPtr nMemSize, sal_uIntPtr nFlags ) +void ImplSalBitmapCache::ImplAdd( X11SalBitmap* pBmp, sal_uLong nMemSize, sal_uLong nFlags ) { ImplBmpObj* pObj; bool bFound = sal_False; diff --git a/vcl/unx/source/gdi/salgdi.cxx b/vcl/unx/source/gdi/salgdi.cxx index 1b350e3460b8..a3f3a4fb264e 100644 --- a/vcl/unx/source/gdi/salgdi.cxx +++ b/vcl/unx/source/gdi/salgdi.cxx @@ -67,21 +67,21 @@ class SalPolyLine XPoint Points_[STATIC_POINTS]; XPoint *pFirst_; public: - inline SalPolyLine( sal_uIntPtr nPoints ); - inline SalPolyLine( sal_uIntPtr nPoints, const SalPoint *p ); + inline SalPolyLine( sal_uLong nPoints ); + inline SalPolyLine( sal_uLong nPoints, const SalPoint *p ); inline ~SalPolyLine(); - inline XPoint &operator [] ( sal_uIntPtr n ) const + inline XPoint &operator [] ( sal_uLong n ) const { return pFirst_[n]; } }; -inline SalPolyLine::SalPolyLine( sal_uIntPtr nPoints ) +inline SalPolyLine::SalPolyLine( sal_uLong nPoints ) : pFirst_( nPoints+1 > STATIC_POINTS ? new XPoint[nPoints+1] : Points_ ) {} -inline SalPolyLine::SalPolyLine( sal_uIntPtr nPoints, const SalPoint *p ) +inline SalPolyLine::SalPolyLine( sal_uLong nPoints, const SalPoint *p ) : pFirst_( nPoints+1 > STATIC_POINTS ? new XPoint[nPoints+1] : Points_ ) { - for( sal_uIntPtr i = 0; i < nPoints; i++ ) + for( sal_uLong i = 0; i < nPoints; i++ ) { pFirst_[i].x = (short)p[i].mnX; pFirst_[i].y = (short)p[i].mnY; @@ -398,19 +398,19 @@ GC X11SalGraphics::GetTrackingGC() } // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -void X11SalGraphics::DrawLines( sal_uIntPtr nPoints, +void X11SalGraphics::DrawLines( sal_uLong nPoints, const SalPolyLine &rPoints, GC pGC, bool bClose ) { // errechne wie viele Linien XWindow auf einmal zeichnen kann - sal_uIntPtr nMaxLines = (GetDisplay()->GetMaxRequestSize() - sizeof(xPolyPointReq)) + sal_uLong nMaxLines = (GetDisplay()->GetMaxRequestSize() - sizeof(xPolyPointReq)) / sizeof(xPoint); if( nMaxLines > nPoints ) nMaxLines = nPoints; // gebe alle Linien aus, die XWindows zeichnen kann. - sal_uIntPtr n; + sal_uLong n; for( n = 0; nPoints - n > nMaxLines; n += nMaxLines - 1 ) XDrawLines( GetXDisplay(), GetDrawable(), @@ -597,7 +597,7 @@ void X11SalGraphics::ResetClipRegion() } // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -void X11SalGraphics::BeginSetClipRegion( sal_uIntPtr ) +void X11SalGraphics::BeginSetClipRegion( sal_uLong ) { if( pClipRegion_ ) XDestroyRegion( pClipRegion_ ); @@ -839,13 +839,13 @@ void X11SalGraphics::drawRect( long nX, long nY, long nDX, long nDY ) } // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -void X11SalGraphics::drawPolyLine( sal_uIntPtr nPoints, const SalPoint *pPtAry ) +void X11SalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry ) { drawPolyLine( nPoints, pPtAry, false ); } // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -void X11SalGraphics::drawPolyLine( sal_uIntPtr nPoints, const SalPoint *pPtAry, bool bClose ) +void X11SalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry, bool bClose ) { if( nPenColor_ != 0xFFFFFFFF ) { @@ -856,7 +856,7 @@ void X11SalGraphics::drawPolyLine( sal_uIntPtr nPoints, const SalPoint *pPtAry, } // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -void X11SalGraphics::drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry ) +void X11SalGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry ) { if( nPoints == 0 ) return; @@ -972,14 +972,14 @@ void X11SalGraphics::drawPolyPolygon( sal_uInt32 nPoly, // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -sal_Bool X11SalGraphics::drawPolyLineBezier( sal_uIntPtr, const SalPoint*, const BYTE* ) +sal_Bool X11SalGraphics::drawPolyLineBezier( sal_uLong, const SalPoint*, const BYTE* ) { return sal_False; } // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -sal_Bool X11SalGraphics::drawPolygonBezier( sal_uIntPtr, const SalPoint*, const BYTE* ) +sal_Bool X11SalGraphics::drawPolygonBezier( sal_uLong, const SalPoint*, const BYTE* ) { return sal_False; } @@ -994,7 +994,7 @@ sal_Bool X11SalGraphics::drawPolyPolygonBezier( sal_uInt32, const sal_uInt32*, // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -void X11SalGraphics::invert( sal_uIntPtr nPoints, +void X11SalGraphics::invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags ) { @@ -1021,7 +1021,7 @@ void X11SalGraphics::invert( sal_uIntPtr nPoints, // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -BOOL X11SalGraphics::drawEPS( long,long,long,long,void*,sal_uIntPtr ) +BOOL X11SalGraphics::drawEPS( long,long,long,long,void*,sal_uLong ) { return sal_False; } diff --git a/vcl/unx/source/gdi/salgdi3.cxx b/vcl/unx/source/gdi/salgdi3.cxx index a80f9e7ef011..f4af3b4256ee 100644 --- a/vcl/unx/source/gdi/salgdi3.cxx +++ b/vcl/unx/source/gdi/salgdi3.cxx @@ -1777,14 +1777,14 @@ X11SalGraphics::GetFontMetric( ImplFontMetricData *pMetric, int nFallbackLevel ) // --------------------------------------------------------------------------- sal_uInt32 -X11SalGraphics::GetKernPairs( sal_uIntPtr nPairs, ImplKernPairData *pKernPairs ) +X11SalGraphics::GetKernPairs( sal_uLong nPairs, ImplKernPairData *pKernPairs ) { if( ! bPrinter_ ) { if( mpServerFont[0] != NULL ) { ImplKernPairData* pTmpKernPairs; - sal_uIntPtr nGotPairs = mpServerFont[0]->GetKernPairs( &pTmpKernPairs ); + sal_uLong nGotPairs = mpServerFont[0]->GetKernPairs( &pTmpKernPairs ); for( unsigned int i = 0; i < nPairs && i < nGotPairs; ++i ) pKernPairs[ i ] = pTmpKernPairs[ i ]; delete[] pTmpKernPairs; diff --git a/vcl/unx/source/gdi/salprnpsp.cxx b/vcl/unx/source/gdi/salprnpsp.cxx index 35d01e7cb5ca..f3b50db6a9d9 100644 --- a/vcl/unx/source/gdi/salprnpsp.cxx +++ b/vcl/unx/source/gdi/salprnpsp.cxx @@ -662,7 +662,7 @@ sal_Bool PspSalInfoPrinter::SetPrinterData( ImplJobSetup* pJobSetup ) // Only the data must be changed, where the bit // in nGetDataFlags is set sal_Bool PspSalInfoPrinter::SetData( - sal_uIntPtr nSetDataFlags, + sal_uLong nSetDataFlags, ImplJobSetup* pJobSetup ) { JobData aData; @@ -823,7 +823,7 @@ void PspSalInfoPrinter::GetPageInfo( // ----------------------------------------------------------------------- -sal_uIntPtr PspSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup ) +sal_uLong PspSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup ) { if( ! pJobSetup ) return 0; @@ -837,7 +837,7 @@ sal_uIntPtr PspSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup ) // ----------------------------------------------------------------------- -String PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_uIntPtr nPaperBin ) +String PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_uLong nPaperBin ) { JobData aData; JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aData ); @@ -846,7 +846,7 @@ String PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_uI if( aData.m_pParser ) { const PPDKey* pKey = aData.m_pParser ? aData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "InputSlot" ) ) ): NULL; - if( ! pKey || nPaperBin >= (sal_uIntPtr)pKey->countValues() ) + if( ! pKey || nPaperBin >= (sal_uLong)pKey->countValues() ) aRet = aData.m_pParser->getDefaultInputSlot(); else { @@ -861,7 +861,7 @@ String PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_uI // ----------------------------------------------------------------------- -sal_uIntPtr PspSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, sal_uInt16 nType ) +sal_uLong PspSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, sal_uInt16 nType ) { switch( nType ) { @@ -959,7 +959,7 @@ sal_Bool PspSalPrinter::StartJob( const XubString* pFileName, const XubString& rJobName, const XubString& rAppName, - sal_uIntPtr nCopies, + sal_uLong nCopies, bool bCollate, bool bDirect, ImplJobSetup* pJobSetup ) @@ -1111,7 +1111,7 @@ sal_Bool PspSalPrinter::EndPage() // ----------------------------------------------------------------------- -sal_uIntPtr PspSalPrinter::GetErrorCode() +sal_uLong PspSalPrinter::GetErrorCode() { return 0; } diff --git a/vcl/unx/source/printer/jobdata.cxx b/vcl/unx/source/printer/jobdata.cxx index b3aceffcad6d..811f93bcb826 100644 --- a/vcl/unx/source/printer/jobdata.cxx +++ b/vcl/unx/source/printer/jobdata.cxx @@ -167,7 +167,7 @@ bool JobData::getStreamBuffer( void*& pData, int& bytes ) // now append the PPDContext stream buffer aStream.WriteLine( "PPDContexData" ); - sal_uIntPtr nBytes; + sal_uLong nBytes; void* pContextBuffer = m_aContext.getStreamableBuffer( nBytes ); if( nBytes ) aStream.Write( pContextBuffer, nBytes ); diff --git a/vcl/unx/source/printer/ppdparser.cxx b/vcl/unx/source/printer/ppdparser.cxx index 14bd83add924..9a85d02db894 100644 --- a/vcl/unx/source/printer/ppdparser.cxx +++ b/vcl/unx/source/printer/ppdparser.cxx @@ -311,7 +311,7 @@ void PPDDecompressStream::Open( const rtl::OUString& i_rFile ) mpFileStream->Seek( 0 ); // check for compress'ed or gzip'ed file - sal_uIntPtr nCompressMethod = 0; + sal_uLong nCompressMethod = 0; if( aLine.Len() > 1 && static_cast<unsigned char>(aLine.GetChar( 0 )) == 0x1f ) { if( static_cast<unsigned char>(aLine.GetChar( 1 )) == 0x8b ) // check for gzip @@ -1417,7 +1417,7 @@ String PPDParser::getSlot( int nSlot ) const if( nSlot > 0 && nSlot < m_pInputSlots->countValues() ) return m_pInputSlots->getValue( nSlot )->m_aOption; else if( m_pInputSlots->countValues() > 0 ) - return m_pInputSlots->getValue( (sal_uIntPtr)0 )->m_aOption; + return m_pInputSlots->getValue( (sal_uLong)0 )->m_aOption; return String(); } @@ -1430,7 +1430,7 @@ String PPDParser::getSlotCommand( int nSlot ) const if( nSlot > 0 && nSlot < m_pInputSlots->countValues() ) return m_pInputSlots->getValue( nSlot )->m_aValue; else if( m_pInputSlots->countValues() > 0 ) - return m_pInputSlots->getValue( (sal_uIntPtr)0 )->m_aValue; + return m_pInputSlots->getValue( (sal_uLong)0 )->m_aValue; return String(); } @@ -1457,7 +1457,7 @@ String PPDParser::getPaperDimension( int nPaperDimension ) const if( nPaperDimension > 0 && nPaperDimension < m_pPaperDimensions->countValues() ) return m_pPaperDimensions->getValue( nPaperDimension )->m_aOption; else if( m_pPaperDimensions->countValues() > 0 ) - return m_pPaperDimensions->getValue( (sal_uIntPtr)0 )->m_aOption; + return m_pPaperDimensions->getValue( (sal_uLong)0 )->m_aOption; return String(); } @@ -1470,7 +1470,7 @@ String PPDParser::getPaperDimensionCommand( int nPaperDimension ) const if( nPaperDimension > 0 && nPaperDimension < m_pPaperDimensions->countValues() ) return m_pPaperDimensions->getValue( nPaperDimension )->m_aValue; else if( m_pPaperDimensions->countValues() > 0 ) - return m_pPaperDimensions->getValue( (sal_uIntPtr)0 )->m_aValue; + return m_pPaperDimensions->getValue( (sal_uLong)0 )->m_aValue; return String(); } @@ -1578,7 +1578,7 @@ String PPDParser::getDuplex( int nDuplex ) const if( nDuplex > 0 && nDuplex < m_pDuplexTypes->countValues() ) return m_pDuplexTypes->getValue( nDuplex )->m_aOption; else if( m_pDuplexTypes->countValues() > 0 ) - return m_pDuplexTypes->getValue( (sal_uIntPtr)0 )->m_aOption; + return m_pDuplexTypes->getValue( (sal_uLong)0 )->m_aOption; return String(); } @@ -1591,7 +1591,7 @@ String PPDParser::getDuplexCommand( int nDuplex ) const if( nDuplex > 0 && nDuplex < m_pDuplexTypes->countValues() ) return m_pDuplexTypes->getValue( nDuplex )->m_aValue; else if( m_pDuplexTypes->countValues() > 0 ) - return m_pDuplexTypes->getValue( (sal_uIntPtr)0 )->m_aValue; + return m_pDuplexTypes->getValue( (sal_uLong)0 )->m_aValue; return String(); } @@ -2033,7 +2033,7 @@ void PPDContext::getUnconstrainedValues( const PPDKey* pKey, ::std::list< const // ------------------------------------------------------------------- -void* PPDContext::getStreamableBuffer( sal_uIntPtr& rBytes ) const +void* PPDContext::getStreamableBuffer( sal_uLong& rBytes ) const { rBytes = 0; if( ! m_aCurrentValues.size() ) @@ -2079,7 +2079,7 @@ void* PPDContext::getStreamableBuffer( sal_uIntPtr& rBytes ) const // ------------------------------------------------------------------- -void PPDContext::rebuildFromStreamBuffer( void* pBuffer, sal_uIntPtr nBytes ) +void PPDContext::rebuildFromStreamBuffer( void* pBuffer, sal_uLong nBytes ) { if( ! m_pParser ) return; diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx index 64ea220a6cde..f456ccc8d628 100644 --- a/vcl/unx/source/window/salframe.cxx +++ b/vcl/unx/source/window/salframe.cxx @@ -209,7 +209,7 @@ void X11SalFrame::askForXEmbedFocus( sal_Int32 i_nTimeCode ) // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -void X11SalFrame::Init( sal_uIntPtr nSalFrameStyle, int nScreen, SystemParentData* pParentData, bool bUseGeometry ) +void X11SalFrame::Init( sal_uLong nSalFrameStyle, int nScreen, SystemParentData* pParentData, bool bUseGeometry ) { if( nScreen < 0 || nScreen >= GetDisplay()->GetScreenCount() ) nScreen = GetDisplay()->GetDefaultScreenNumber(); @@ -645,7 +645,7 @@ void X11SalFrame::Init( sal_uIntPtr nSalFrameStyle, int nScreen, SystemParentDat } // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -X11SalFrame::X11SalFrame( SalFrame *pParent, sal_uIntPtr nSalFrameStyle, SystemParentData* pSystemParent ) +X11SalFrame::X11SalFrame( SalFrame *pParent, sal_uLong nSalFrameStyle, SystemParentData* pSystemParent ) { X11SalData* pSalData = GetX11SalData(); @@ -3062,7 +3062,7 @@ long X11SalFrame::HandleMouseEvent( XEvent *pEvent ) if( pEvent->type == ButtonRelease ) return 0; - static sal_uIntPtr nLines = 0; + static sal_uLong nLines = 0; if( ! nLines ) { char* pEnv = getenv( "SAL_WHEELLINES" ); @@ -3600,7 +3600,7 @@ long X11SalFrame::HandleFocusEvent( XFocusChangeEvent *pEvent ) if ((mpParent != NULL && nStyle_ == 0) && pSVData->maWinData.mpFirstFloat ) { - sal_uIntPtr nMode = pSVData->maWinData.mpFirstFloat->GetPopupModeFlags(); + sal_uLong nMode = pSVData->maWinData.mpFirstFloat->GetPopupModeFlags(); pSVData->maWinData.mpFirstFloat->SetPopupModeFlags( nMode & ~(FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE)); } @@ -4477,7 +4477,7 @@ void X11SalFrame::ResetClipRegion() op, ordering ); } -void X11SalFrame::BeginSetClipRegion( sal_uIntPtr nRects ) +void X11SalFrame::BeginSetClipRegion( sal_uLong nRects ) { if( m_pClipRectangles ) delete [] m_pClipRectangles; diff --git a/vcl/unx/source/window/salobj.cxx b/vcl/unx/source/window/salobj.cxx index 782b4aae897f..93aeeba66ee8 100644 --- a/vcl/unx/source/window/salobj.cxx +++ b/vcl/unx/source/window/salobj.cxx @@ -219,7 +219,7 @@ SalClipRegion::~SalClipRegion() void -SalClipRegion::BeginSetClipRegion( sal_uIntPtr nRects ) +SalClipRegion::BeginSetClipRegion( sal_uLong nRects ) { if (ClipRectangleList) delete [] ClipRectangleList; @@ -324,7 +324,7 @@ X11SalObject::ResetClipRegion() void -X11SalObject::BeginSetClipRegion( sal_uIntPtr nRectCount ) +X11SalObject::BeginSetClipRegion( sal_uLong nRectCount ) { maClipRegion.BeginSetClipRegion ( nRectCount ); } diff --git a/vcl/win/inc/saldata.hxx b/vcl/win/inc/saldata.hxx index 9a0c95c9e026..7cb792521b87 100644 --- a/vcl/win/inc/saldata.hxx +++ b/vcl/win/inc/saldata.hxx @@ -97,8 +97,8 @@ public: long* mpDitherDiff; // Dither mapping table BYTE* mpDitherLow; // Dither mapping table BYTE* mpDitherHigh; // Dither mapping table - sal_uIntPtr mnTimerMS; // Current Time (in MS) of the Timer - sal_uIntPtr mnTimerOrgMS; // Current Original Time (in MS) + sal_uLong mnTimerMS; // Current Time (in MS) of the Timer + sal_uLong mnTimerOrgMS; // Current Original Time (in MS) DWORD mnNextTimerTime; DWORD mnLastEventTime; UINT mnTimerId; // windows timer id @@ -184,8 +184,8 @@ struct HDCCache }; void ImplClearHDCCache( SalData* pData ); -HDC ImplGetCachedDC( sal_uIntPtr nID, HBITMAP hBmp = 0 ); -void ImplReleaseCachedDC( sal_uIntPtr nID ); +HDC ImplGetCachedDC( sal_uLong nID, HBITMAP hBmp = 0 ); +void ImplReleaseCachedDC( sal_uLong nID ); bool ImplAddTempFont( SalData&, const String& rFontFileURL ); void ImplReleaseTempFonts( SalData& ); @@ -211,8 +211,8 @@ void ImplSalYieldMutexAcquireWithWait(); sal_Bool ImplSalYieldMutexTryToAcquire(); void ImplSalYieldMutexAcquire(); void ImplSalYieldMutexRelease(); -sal_uIntPtr ImplSalReleaseYieldMutex(); -void ImplSalAcquireYieldMutex( sal_uIntPtr nCount ); +sal_uLong ImplSalReleaseYieldMutex(); +void ImplSalAcquireYieldMutex( sal_uLong nCount ); sal_Bool ImplInterceptChildWindowKeyDown( MSG& rMsg ); // \\WIN\SOURCE\WINDOW\SALFRAME.CXX diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index 99f7bd5edddd..7b6d7480a715 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -107,7 +107,7 @@ class SalYieldMutex : public vos::OMutex { public: // for ImplSalYield() WinSalInstance* mpInstData; - sal_uIntPtr mnCount; + sal_uLong mnCount; DWORD mnThreadId; public: @@ -117,7 +117,7 @@ public: virtual void SAL_CALL release(); virtual sal_Bool SAL_CALL tryToAcquire(); - sal_uIntPtr GetAcquireCount( sal_uIntPtr nThreadId ); + sal_uLong GetAcquireCount( sal_uLong nThreadId ); }; // ----------------------------------------------------------------------- @@ -196,7 +196,7 @@ sal_Bool SAL_CALL SalYieldMutex::tryToAcquire() // ----------------------------------------------------------------------- -sal_uIntPtr SalYieldMutex::GetAcquireCount( sal_uIntPtr nThreadId ) +sal_uLong SalYieldMutex::GetAcquireCount( sal_uLong nThreadId ) { if ( nThreadId == mnThreadId ) return mnCount; @@ -287,15 +287,15 @@ void ImplSalYieldMutexRelease() // ----------------------------------------------------------------------- -sal_uIntPtr ImplSalReleaseYieldMutex() +sal_uLong ImplSalReleaseYieldMutex() { WinSalInstance* pInst = GetSalData()->mpFirstInstance; if ( !pInst ) return 0; SalYieldMutex* pYieldMutex = pInst->mpSalYieldMutex; - sal_uIntPtr nCount = pYieldMutex->GetAcquireCount( GetCurrentThreadId() ); - sal_uIntPtr n = nCount; + sal_uLong nCount = pYieldMutex->GetAcquireCount( GetCurrentThreadId() ); + sal_uLong n = nCount; while ( n ) { pYieldMutex->release(); @@ -307,7 +307,7 @@ sal_uIntPtr ImplSalReleaseYieldMutex() // ----------------------------------------------------------------------- -void ImplSalAcquireYieldMutex( sal_uIntPtr nCount ) +void ImplSalAcquireYieldMutex( sal_uLong nCount ) { WinSalInstance* pInst = GetSalData()->mpFirstInstance; if ( !pInst ) @@ -680,14 +680,14 @@ vos::IMutex* WinSalInstance::GetYieldMutex() // ----------------------------------------------------------------------- -sal_uIntPtr WinSalInstance::ReleaseYieldMutex() +sal_uLong WinSalInstance::ReleaseYieldMutex() { return ImplSalReleaseYieldMutex(); } // ----------------------------------------------------------------------- -void WinSalInstance::AcquireYieldMutex( sal_uIntPtr nCount ) +void WinSalInstance::AcquireYieldMutex( sal_uLong nCount ) { ImplSalAcquireYieldMutex( nCount ); } @@ -751,8 +751,8 @@ void WinSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents ) SalYieldMutex* pYieldMutex = mpSalYieldMutex; SalData* pSalData = GetSalData(); DWORD nCurThreadId = GetCurrentThreadId(); - sal_uIntPtr nCount = pYieldMutex->GetAcquireCount( nCurThreadId ); - sal_uIntPtr n = nCount; + sal_uLong nCount = pYieldMutex->GetAcquireCount( nCurThreadId ); + sal_uLong n = nCount; while ( n ) { pYieldMutex->release(); @@ -824,11 +824,11 @@ LRESULT CALLBACK SalComWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPar rDef = FALSE; break; case SAL_MSG_STARTTIMER: - ImplSalStartTimer( (sal_uIntPtr) lParam, FALSE ); + ImplSalStartTimer( (sal_uLong) lParam, FALSE ); rDef = FALSE; break; case SAL_MSG_CREATEFRAME: - nRet = (LRESULT)ImplSalCreateFrame( GetSalData()->mpFirstInstance, (HWND)lParam, (sal_uIntPtr)wParam ); + nRet = (LRESULT)ImplSalCreateFrame( GetSalData()->mpFirstInstance, (HWND)lParam, (sal_uLong)wParam ); rDef = FALSE; break; case SAL_MSG_RECREATEHWND: @@ -1025,7 +1025,7 @@ bool WinSalInstance::AnyInput( sal_uInt16 nType ) // ----------------------------------------------------------------------- -void SalTimer::Start( sal_uIntPtr nMS ) +void SalTimer::Start( sal_uLong nMS ) { // Um auf Main-Thread umzuschalten SalData* pSalData = GetSalData(); @@ -1042,7 +1042,7 @@ void SalTimer::Start( sal_uIntPtr nMS ) // ----------------------------------------------------------------------- -SalFrame* WinSalInstance::CreateChildFrame( SystemParentData* pSystemParentData, sal_uIntPtr nSalFrameStyle ) +SalFrame* WinSalInstance::CreateChildFrame( SystemParentData* pSystemParentData, sal_uLong nSalFrameStyle ) { // Um auf Main-Thread umzuschalten return (SalFrame*)ImplSendMessage( mhComWnd, SAL_MSG_CREATEFRAME, nSalFrameStyle, (LPARAM)pSystemParentData->hWnd ); @@ -1050,7 +1050,7 @@ SalFrame* WinSalInstance::CreateChildFrame( SystemParentData* pSystemParentData, // ----------------------------------------------------------------------- -SalFrame* WinSalInstance::CreateFrame( SalFrame* pParent, sal_uIntPtr nSalFrameStyle ) +SalFrame* WinSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nSalFrameStyle ) { // Um auf Main-Thread umzuschalten HWND hWndParent; diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx index 43e4989e4924..6026f80e6346 100644 --- a/vcl/win/source/app/saltimer.cxx +++ b/vcl/win/source/app/saltimer.cxx @@ -42,7 +42,7 @@ // ======================================================================= -void ImplSalStartTimer( sal_uIntPtr nMS, sal_Bool bMutex ) +void ImplSalStartTimer( sal_uLong nMS, sal_Bool bMutex ) { SalData* pSalData = GetSalData(); @@ -70,7 +70,7 @@ WinSalTimer::~WinSalTimer() { } -void WinSalTimer::Start( sal_uIntPtr nMS ) +void WinSalTimer::Start( sal_uLong nMS ) { // switch to main thread SalData* pSalData = GetSalData(); diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx index 536cf40c1043..8be85d210bd6 100644 --- a/vcl/win/source/gdi/salbmp.cxx +++ b/vcl/win/source/gdi/salbmp.cxx @@ -315,7 +315,7 @@ HGLOBAL WinSalBitmap::ImplCreateDIB( const Size& rSize, sal_uInt16 nBits, const if ( rSize.Width() && rSize.Height() ) { - const sal_uIntPtr nImageSize = AlignedWidth4Bytes( nBits * rSize.Width() ) * rSize.Height(); + const sal_uLong nImageSize = AlignedWidth4Bytes( nBits * rSize.Width() ) * rSize.Height(); const sal_uInt16 nColors = ( nBits <= 8 ) ? ( 1 << nBits ) : 0; hDIB = GlobalAlloc( GHND, sizeof( BITMAPINFOHEADER ) + nColors * sizeof( RGBQUAD ) + nImageSize ); @@ -360,7 +360,7 @@ HANDLE WinSalBitmap::ImplCopyDIBOrDDB( HANDLE hHdl, bool bDIB ) if ( bDIB && hHdl ) { - const sal_uIntPtr nSize = GlobalSize( hHdl ); + const sal_uLong nSize = GlobalSize( hHdl ); if ( (hCopy = GlobalAlloc( GHND, nSize )) != 0 ) { @@ -419,7 +419,7 @@ BitmapBuffer* WinSalBitmap::AcquireBuffer( bool /*bReadOnly*/ ) PBITMAPINFO pNewBI = (PBITMAPINFO) GlobalLock( hNewDIB ); PBITMAPINFOHEADER pNewBIH = (PBITMAPINFOHEADER) pNewBI; const sal_uInt16 nColorCount = ImplGetDIBColorCount( hNewDIB ); - const sal_uIntPtr nOffset = *(DWORD*) pBI + nColorCount * sizeof( RGBQUAD ); + const sal_uLong nOffset = *(DWORD*) pBI + nColorCount * sizeof( RGBQUAD ); BYTE* pOldBits = (PBYTE) pBI + nOffset; BYTE* pNewBits = (PBYTE) pNewBI + nOffset; @@ -464,7 +464,7 @@ BitmapBuffer* WinSalBitmap::AcquireBuffer( bool /*bReadOnly*/ ) } else if( ( pBIH->biBitCount == 16 ) || ( pBIH->biBitCount == 32 ) ) { - sal_uIntPtr nOffset = 0UL; + sal_uLong nOffset = 0UL; if( pBIH->biCompression == BI_BITFIELDS ) { @@ -529,12 +529,12 @@ void WinSalBitmap::ImplDecodeRLEBuffer( const BYTE* pSrcBuf, BYTE* pDstBuf, HPBYTE pRLE = (HPBYTE) pSrcBuf; HPBYTE pDIB = (HPBYTE) pDstBuf; HPBYTE pRow = (HPBYTE) pDstBuf; - sal_uIntPtr nWidthAl = AlignedWidth4Bytes( rSizePixel.Width() * ( bRLE4 ? 4UL : 8UL ) ); + sal_uLong nWidthAl = AlignedWidth4Bytes( rSizePixel.Width() * ( bRLE4 ? 4UL : 8UL ) ); HPBYTE pLast = pDIB + rSizePixel.Height() * nWidthAl - 1; - sal_uIntPtr nCountByte; - sal_uIntPtr nRunByte; - sal_uIntPtr nX = 0; - sal_uIntPtr i; + sal_uLong nCountByte; + sal_uLong nRunByte; + sal_uLong nX = 0; + sal_uLong i; BYTE cTmp; bool bEndDecoding = FALSE; diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index f58050a1890f..8cb52c917b38 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -241,7 +241,7 @@ void ImplInitSalGDI() PALETTEENTRY* pPalEntry; LOGPALETTE* pLogPal; const sal_uInt16 nDitherPalCount = DITHER_PAL_COUNT; - sal_uIntPtr nTotalCount = DITHER_MAX_SYSCOLOR + nDitherPalCount + DITHER_EXTRA_COLORS; + sal_uLong nTotalCount = DITHER_MAX_SYSCOLOR + nDitherPalCount + DITHER_EXTRA_COLORS; // create logical palette pLogPal = (LOGPALETTE*) new char[ sizeof( LOGPALETTE ) + ( nTotalCount * sizeof( PALETTEENTRY ) ) ]; @@ -551,7 +551,7 @@ void ImplSalDeInitGraphics( WinSalGraphics* pData ) // ======================================================================= -HDC ImplGetCachedDC( sal_uIntPtr nID, HBITMAP hBmp ) +HDC ImplGetCachedDC( sal_uLong nID, HBITMAP hBmp ) { SalData* pSalData = GetSalData(); HDCCache* pC = &pSalData->mpHDCCache[ nID ]; @@ -585,7 +585,7 @@ HDC ImplGetCachedDC( sal_uIntPtr nID, HBITMAP hBmp ) // ======================================================================= -void ImplReleaseCachedDC( sal_uIntPtr nID ) +void ImplReleaseCachedDC( sal_uLong nID ) { SalData* pSalData = GetSalData(); HDCCache* pC = &pSalData->mpHDCCache[ nID ]; @@ -598,7 +598,7 @@ void ImplReleaseCachedDC( sal_uIntPtr nID ) void ImplClearHDCCache( SalData* pData ) { - for( sal_uIntPtr i = 0; i < CACHESIZE_HDC; i++ ) + for( sal_uLong i = 0; i < CACHESIZE_HDC; i++ ) { HDCCache* pC = &pData->mpHDCCache[ i ]; @@ -621,21 +621,21 @@ void ImplClearHDCCache( SalData* pData ) // might also contain bezier control points for the PolyDraw() GDI method // Make sure pWinPointAry and pWinFlagAry are big enough void ImplPreparePolyDraw( bool bCloseFigures, - sal_uIntPtr nPoly, - const sal_uIntPtr* pPoints, + sal_uLong nPoly, + const sal_uLong* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry, POINT* pWinPointAry, BYTE* pWinFlagAry ) { - sal_uIntPtr nCurrPoly; + sal_uLong nCurrPoly; for( nCurrPoly=0; nCurrPoly<nPoly; ++nCurrPoly ) { const POINT* pCurrPoint = reinterpret_cast<const POINT*>( *pPtAry++ ); const BYTE* pCurrFlag = *pFlgAry++; - const sal_uIntPtr nCurrPoints = *pPoints++; + const sal_uLong nCurrPoints = *pPoints++; const bool bHaveFlagArray( pCurrFlag ); - sal_uIntPtr nCurrPoint; + sal_uLong nCurrPoint; if( nCurrPoints ) { @@ -691,7 +691,7 @@ void ImplPreparePolyDraw( bool bCloseFigures, // ======================================================================= // #100127# draw an array of points which might also contain bezier control points -void ImplRenderPath( HDC hdc, sal_uIntPtr nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ) +void ImplRenderPath( HDC hdc, sal_uLong nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ) { if( nPoints ) { @@ -849,7 +849,7 @@ void WinSalGraphics::ResetClipRegion() // ----------------------------------------------------------------------- -void WinSalGraphics::BeginSetClipRegion( sal_uIntPtr nRectCount ) +void WinSalGraphics::BeginSetClipRegion( sal_uLong nRectCount ) { if ( mhRegion ) { @@ -857,7 +857,7 @@ void WinSalGraphics::BeginSetClipRegion( sal_uIntPtr nRectCount ) mhRegion = 0; } - sal_uIntPtr nRectBufSize = sizeof(RECT)*nRectCount; + sal_uLong nRectBufSize = sizeof(RECT)*nRectCount; if ( nRectCount < SAL_CLIPRECT_COUNT ) { if ( !mpStdClipRgnData ) @@ -946,7 +946,7 @@ void WinSalGraphics::EndSetClipRegion() } else { - sal_uIntPtr nSize = mpClipRgnData->rdh.nRgnSize+sizeof(RGNDATAHEADER); + sal_uLong nSize = mpClipRgnData->rdh.nRgnSize+sizeof(RGNDATAHEADER); mhRegion = ExtCreateRegion( NULL, nSize, mpClipRgnData ); // if ExtCreateRegion(...) is not supported @@ -960,7 +960,7 @@ void WinSalGraphics::EndSetClipRegion() mhRegion = CreateRectRgn( pRect->left, pRect->top, pRect->right, pRect->bottom ); pRect++; - for( sal_uIntPtr n = 1; n < pHeader->nCount; n++, pRect++ ) + for( sal_uLong n = 1; n < pHeader->nCount; n++, pRect++ ) { HRGN hRgn = CreateRectRgn( pRect->left, pRect->top, pRect->right, pRect->bottom ); CombineRgn( mhRegion, mhRegion, hRgn, RGN_OR ); @@ -1318,7 +1318,7 @@ void WinSalGraphics::drawRect( long nX, long nY, long nWidth, long nHeight ) // ----------------------------------------------------------------------- -void WinSalGraphics::drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry ) +void WinSalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry ) { // Unter NT koennen wir das Array direkt weiterreichen DBG_ASSERT( sizeof( POINT ) == sizeof( SalPoint ), @@ -1333,7 +1333,7 @@ void WinSalGraphics::drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry ) // ----------------------------------------------------------------------- -void WinSalGraphics::drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry ) +void WinSalGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry ) { // Unter NT koennen wir das Array direkt weiterreichen DBG_ASSERT( sizeof( POINT ) == sizeof( SalPoint ), @@ -1421,7 +1421,7 @@ void WinSalGraphics::drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoint // ----------------------------------------------------------------------- -sal_Bool WinSalGraphics::drawPolyLineBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ) +sal_Bool WinSalGraphics::drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ) { #ifdef USE_GDI_BEZIERS // Unter NT koennen wir das Array direkt weiterreichen @@ -1438,7 +1438,7 @@ sal_Bool WinSalGraphics::drawPolyLineBezier( sal_uIntPtr nPoints, const SalPoint // ----------------------------------------------------------------------- -sal_Bool WinSalGraphics::drawPolygonBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ) +sal_Bool WinSalGraphics::drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ) { #ifdef USE_GDI_BEZIERS // Unter NT koennen wir das Array direkt weiterreichen @@ -1497,8 +1497,8 @@ sal_Bool WinSalGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt DBG_ASSERT( sizeof( POINT ) == sizeof( SalPoint ), "WinSalGraphics::DrawPolyPolygonBezier(): POINT != SalPoint" ); - sal_uIntPtr nCurrPoly, nTotalPoints; - const sal_uIntPtr* pCurrPoints = pPoints; + sal_uLong nCurrPoly, nTotalPoints; + const sal_uLong* pCurrPoints = pPoints; for( nCurrPoly=0, nTotalPoints=0; nCurrPoly<nPoly; ++nCurrPoly ) nTotalPoints += *pCurrPoints++; @@ -1550,11 +1550,11 @@ sal_Bool WinSalGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt #define POSTSCRIPT_BOUNDINGSEARCH 0x1000 // we only try to get the BoundingBox // in the first 4096 bytes -static BYTE* ImplSearchEntry( BYTE* pSource, BYTE* pDest, sal_uIntPtr nComp, sal_uIntPtr nSize ) +static BYTE* ImplSearchEntry( BYTE* pSource, BYTE* pDest, sal_uLong nComp, sal_uLong nSize ) { while ( nComp-- >= nSize ) { - sal_uIntPtr i; + sal_uLong i; for ( i = 0; i < nSize; i++ ) { if ( ( pSource[i]&~0x20 ) != ( pDest[i]&~0x20 ) ) @@ -1567,7 +1567,7 @@ static BYTE* ImplSearchEntry( BYTE* pSource, BYTE* pDest, sal_uIntPtr nComp, sal return NULL; } -static sal_Bool ImplGetBoundingBox( double* nNumb, BYTE* pSource, sal_uIntPtr nSize ) +static sal_Bool ImplGetBoundingBox( double* nNumb, BYTE* pSource, sal_uLong nSize ) { sal_Bool bRetValue = FALSE; BYTE* pDest = ImplSearchEntry( pSource, (BYTE*)"%%BoundingBox:", nSize, 14 ); @@ -1629,7 +1629,7 @@ static sal_Bool ImplGetBoundingBox( double* nNumb, BYTE* pSource, sal_uIntPtr nS return bRetValue; } -sal_Bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ) +sal_Bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) { sal_Bool bRetValue = FALSE; @@ -1749,8 +1749,8 @@ sal_Bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, v // #107797# Write out actual EPS content // ---------------------------------------------------------------------------------- - sal_uIntPtr nToDo = nSize; - sal_uIntPtr nDoNow; + sal_uLong nToDo = nSize; + sal_uLong nDoNow; while ( nToDo ) { nDoNow = nToDo; @@ -1760,7 +1760,7 @@ sal_Bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, v // of size POSTSCRIPT_BUFSIZE at construction time of aBuf *((sal_uInt16*)aBuf.getStr()) = (sal_uInt16)nDoNow; memcpy( (void*)(aBuf.getStr() + 2), (BYTE*)pPtr + nSize - nToDo, nDoNow ); - sal_uIntPtr nResult = Escape ( mhDC, nEscape, nDoNow + 2, (LPTSTR)aBuf.getStr(), 0 ); + sal_uLong nResult = Escape ( mhDC, nEscape, nDoNow + 2, (LPTSTR)aBuf.getStr(), 0 ); if (!nResult ) break; nToDo -= nResult; diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx index e10d3e1c2864..f957c59f8a01 100644 --- a/vcl/win/source/gdi/salgdi2.cxx +++ b/vcl/win/source/gdi/salgdi2.cxx @@ -754,7 +754,7 @@ void WinSalGraphics::invert( long nX, long nY, long nWidth, long nHeight, SalInv // ----------------------------------------------------------------------- -void WinSalGraphics::invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert nSalFlags ) +void WinSalGraphics::invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nSalFlags ) { HPEN hPen; HPEN hOldPen; diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index f0215a22937f..140bd3ea25a0 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -1889,12 +1889,12 @@ static void ImplGetAllFontCharSets( WinSalGraphics* pData ) static void ImplAddKerningPairs( WinSalGraphics* pData ) { - sal_uIntPtr nPairs = ::GetKerningPairsA( pData->mhDC, 0, NULL ); + sal_uLong nPairs = ::GetKerningPairsA( pData->mhDC, 0, NULL ); if ( !nPairs ) return; CHARSETINFO aInfo; - if ( !TranslateCharsetInfo( (DWORD*)(sal_uIntPtr)GetTextCharset( pData->mhDC ), &aInfo, TCI_SRCCHARSET ) ) + if ( !TranslateCharsetInfo( (DWORD*)(sal_uLong)GetTextCharset( pData->mhDC ), &aInfo, TCI_SRCCHARSET ) ) return; if ( !pData->mpFontKernPairs ) @@ -1909,10 +1909,10 @@ static void ImplAddKerningPairs( WinSalGraphics* pData ) } UINT nCP = aInfo.ciACP; - sal_uIntPtr nOldPairs = pData->mnFontKernPairCount; + sal_uLong nOldPairs = pData->mnFontKernPairCount; KERNINGPAIR* pTempPair = pData->mpFontKernPairs+pData->mnFontKernPairCount; nPairs = ::GetKerningPairsA( pData->mhDC, nPairs, pTempPair ); - for ( sal_uIntPtr i = 0; i < nPairs; i++ ) + for ( sal_uLong i = 0; i < nPairs; i++ ) { unsigned char aBuf[2]; wchar_t nChar; @@ -1961,7 +1961,7 @@ static void ImplAddKerningPairs( WinSalGraphics* pData ) // TODO: get rid of linear search! KERNINGPAIR* pTempPair2 = pData->mpFontKernPairs; - for ( sal_uIntPtr j = 0; j < nOldPairs; j++ ) + for ( sal_uLong j = 0; j < nOldPairs; j++ ) { if ( (pTempPair2->wFirst == pTempPair->wFirst) && (pTempPair2->wSecond == pTempPair->wSecond) ) @@ -1986,7 +1986,7 @@ static void ImplAddKerningPairs( WinSalGraphics* pData ) // ----------------------------------------------------------------------- -sal_uIntPtr WinSalGraphics::GetKernPairs( sal_uIntPtr nPairs, ImplKernPairData* pKernPairs ) +sal_uLong WinSalGraphics::GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs ) { DBG_ASSERT( sizeof( KERNINGPAIR ) == sizeof( ImplKernPairData ), "WinSalGraphics::GetKernPairs(): KERNINGPAIR != ImplKernPairData" ); diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx index f2314c150e55..2c8f81bce364 100644 --- a/vcl/win/source/gdi/salprn.cxx +++ b/vcl/win/source/gdi/salprn.cxx @@ -128,9 +128,9 @@ static LPDEVMODEW SAL_DEVMODE_W( const ImplJobSetup* pSetupData ) // ======================================================================= -static sal_uIntPtr ImplWinQueueStatusToSal( DWORD nWinStatus ) +static sal_uLong ImplWinQueueStatusToSal( DWORD nWinStatus ) { - sal_uIntPtr nStatus = 0; + sal_uLong nStatus = 0; if ( nWinStatus & PRINTER_STATUS_PAUSED ) nStatus |= QUEUE_STATUS_PAUSED; if ( nWinStatus & PRINTER_STATUS_ERROR ) @@ -682,7 +682,7 @@ static sal_Bool ImplUpdateSalJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup LONG nSysJobSize = -1; HWND hWnd = 0; DWORD nMode = DM_OUT_BUFFER; - sal_uIntPtr nDriverDataLen = 0; + sal_uLong nDriverDataLen = 0; SalDriverData* pOutBuffer = NULL; BYTE* pInBuffer = NULL; @@ -727,7 +727,7 @@ static sal_Bool ImplUpdateSalJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup } // Release mutex, in the other case we don't get paints and so on - sal_uIntPtr nMutexCount=0; + sal_uLong nMutexCount=0; if ( pVisibleDlgParent ) nMutexCount = ImplSalReleaseYieldMutex(); @@ -807,7 +807,7 @@ static sal_Bool ImplUpdateSalJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup #define CHOOSE_DEVMODE(i)\ (pDevModeW ? pDevModeW->i : pDevModeA->i) -static void ImplDevModeToJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pSetupData, sal_uIntPtr nFlags ) +static void ImplDevModeToJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pSetupData, sal_uLong nFlags ) { if ( !pSetupData || !pSetupData->mpDriverData ) return; @@ -826,7 +826,7 @@ static void ImplDevModeToJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS // PaperBin if ( nFlags & SAL_JOBSET_PAPERBIN ) { - sal_uIntPtr nCount = ImplDeviceCaps( pPrinter, DC_BINS, NULL, pSetupData ); + sal_uLong nCount = ImplDeviceCaps( pPrinter, DC_BINS, NULL, pSetupData ); if ( nCount && (nCount != GDI_ERROR) ) { @@ -835,7 +835,7 @@ static void ImplDevModeToJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS pSetupData->mnPaperBin = 0; // search the right bin and assign index to mnPaperBin - for( sal_uIntPtr i = 0; i < nCount; i++ ) + for( sal_uLong i = 0; i < nCount; i++ ) { if( CHOOSE_DEVMODE(dmDefaultSource) == pBins[ i ] ) { @@ -858,9 +858,9 @@ static void ImplDevModeToJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS } else { - sal_uIntPtr nPaperCount = ImplDeviceCaps( pPrinter, DC_PAPERS, NULL, pSetupData ); + sal_uLong nPaperCount = ImplDeviceCaps( pPrinter, DC_PAPERS, NULL, pSetupData ); WORD* pPapers = NULL; - sal_uIntPtr nPaperSizeCount = ImplDeviceCaps( pPrinter, DC_PAPERSIZE, NULL, pSetupData ); + sal_uLong nPaperSizeCount = ImplDeviceCaps( pPrinter, DC_PAPERSIZE, NULL, pSetupData ); POINT* pPaperSizes = NULL; if ( nPaperCount && (nPaperCount != GDI_ERROR) ) { @@ -874,7 +874,7 @@ static void ImplDevModeToJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS } if( nPaperSizeCount == nPaperCount && pPaperSizes && pPapers ) { - for( sal_uIntPtr i = 0; i < nPaperCount; i++ ) + for( sal_uLong i = 0; i < nPaperCount; i++ ) { if( pPapers[ i ] == CHOOSE_DEVMODE(dmPaperSize) ) { @@ -1075,7 +1075,7 @@ static void ImplDevModeToJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS // ----------------------------------------------------------------------- -static void ImplJobSetupToDevMode( WinSalInfoPrinter* pPrinter, ImplJobSetup* pSetupData, sal_uIntPtr nFlags ) +static void ImplJobSetupToDevMode( WinSalInfoPrinter* pPrinter, ImplJobSetup* pSetupData, sal_uLong nFlags ) { if ( !pSetupData || !pSetupData->mpDriverData ) return; @@ -1095,7 +1095,7 @@ static void ImplJobSetupToDevMode( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS // PaperBin if ( nFlags & SAL_JOBSET_PAPERBIN ) { - sal_uIntPtr nCount = ImplDeviceCaps( pPrinter, DC_BINS, NULL, pSetupData ); + sal_uLong nCount = ImplDeviceCaps( pPrinter, DC_BINS, NULL, pSetupData ); if ( nCount && (nCount != GDI_ERROR) ) { @@ -1273,9 +1273,9 @@ static void ImplJobSetupToDevMode( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS default: { short nPaper = 0; - sal_uIntPtr nPaperCount = ImplDeviceCaps( pPrinter, DC_PAPERS, NULL, pSetupData ); + sal_uLong nPaperCount = ImplDeviceCaps( pPrinter, DC_PAPERS, NULL, pSetupData ); WORD* pPapers = NULL; - sal_uIntPtr nPaperSizeCount = ImplDeviceCaps( pPrinter, DC_PAPERSIZE, NULL, pSetupData ); + sal_uLong nPaperSizeCount = ImplDeviceCaps( pPrinter, DC_PAPERSIZE, NULL, pSetupData ); POINT* pPaperSizes = NULL; DWORD nLandscapeAngle = ImplDeviceCaps( pPrinter, DC_ORIENTATION, NULL, pSetupData ); if ( nPaperCount && (nPaperCount != GDI_ERROR) ) @@ -1292,7 +1292,7 @@ static void ImplJobSetupToDevMode( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS { PaperInfo aInfo(pSetupData->mnPaperWidth, pSetupData->mnPaperHeight); // compare paper formats and select a good match - for ( sal_uIntPtr i = 0; i < nPaperCount; i++ ) + for ( sal_uLong i = 0; i < nPaperCount; i++ ) { if ( aInfo.sloppyEqual(PaperInfo(pPaperSizes[i].x*10, pPaperSizes[i].y*10))) { @@ -1307,7 +1307,7 @@ static void ImplJobSetupToDevMode( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS if ( !nPaper && nLandscapeAngle != 0 ) { PaperInfo aRotatedInfo(pSetupData->mnPaperHeight, pSetupData->mnPaperWidth); - for ( sal_uIntPtr i = 0; i < nPaperCount; i++ ) + for ( sal_uLong i = 0; i < nPaperCount; i++ ) { if ( aRotatedInfo.sloppyEqual(PaperInfo(pPaperSizes[i].x*10, pPaperSizes[i].y*10)) ) { @@ -1645,7 +1645,7 @@ sal_Bool WinSalInfoPrinter::SetPrinterData( ImplJobSetup* pSetupData ) // ----------------------------------------------------------------------- -sal_Bool WinSalInfoPrinter::SetData( sal_uIntPtr nFlags, ImplJobSetup* pSetupData ) +sal_Bool WinSalInfoPrinter::SetData( sal_uLong nFlags, ImplJobSetup* pSetupData ) { ImplJobSetupToDevMode( this, pSetupData, nFlags ); if ( ImplUpdateSalJobSetup( this, pSetupData, TRUE, NULL ) ) @@ -1659,7 +1659,7 @@ sal_Bool WinSalInfoPrinter::SetData( sal_uIntPtr nFlags, ImplJobSetup* pSetupDat // ----------------------------------------------------------------------- -sal_uIntPtr WinSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pSetupData ) +sal_uLong WinSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pSetupData ) { DWORD nRet = ImplDeviceCaps( this, DC_BINS, NULL, pSetupData ); if ( nRet && (nRet != GDI_ERROR) ) @@ -1670,7 +1670,7 @@ sal_uIntPtr WinSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pSetupData // ----------------------------------------------------------------------- -XubString WinSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin ) +XubString WinSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pSetupData, sal_uLong nPaperBin ) { XubString aPaperBinName; @@ -1700,7 +1700,7 @@ XubString WinSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pSetupData, sa // ----------------------------------------------------------------------- -sal_uIntPtr WinSalInfoPrinter::GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ) +sal_uLong WinSalInfoPrinter::GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ) { DWORD nRet; @@ -1829,14 +1829,14 @@ BOOL CALLBACK SalPrintAbortProc( HDC hPrnDC, int /* nError */ ) // ----------------------------------------------------------------------- -static LPDEVMODEA ImplSalSetCopies( LPDEVMODEA pDevMode, sal_uIntPtr nCopies, sal_Bool bCollate ) +static LPDEVMODEA ImplSalSetCopies( LPDEVMODEA pDevMode, sal_uLong nCopies, sal_Bool bCollate ) { LPDEVMODEA pNewDevMode = pDevMode; if ( pDevMode && (nCopies > 1) ) { if ( nCopies > 32765 ) nCopies = 32765; - sal_uIntPtr nDevSize = pDevMode->dmSize+pDevMode->dmDriverExtra; + sal_uLong nDevSize = pDevMode->dmSize+pDevMode->dmDriverExtra; pNewDevMode = (LPDEVMODEA)rtl_allocateMemory( nDevSize ); memcpy( pNewDevMode, pDevMode, nDevSize ); pDevMode = pNewDevMode; @@ -1855,14 +1855,14 @@ static LPDEVMODEA ImplSalSetCopies( LPDEVMODEA pDevMode, sal_uIntPtr nCopies, sa return pNewDevMode; } -static LPDEVMODEW ImplSalSetCopies( LPDEVMODEW pDevMode, sal_uIntPtr nCopies, sal_Bool bCollate ) +static LPDEVMODEW ImplSalSetCopies( LPDEVMODEW pDevMode, sal_uLong nCopies, sal_Bool bCollate ) { LPDEVMODEW pNewDevMode = pDevMode; if ( pDevMode && (nCopies > 1) ) { if ( nCopies > 32765 ) nCopies = 32765; - sal_uIntPtr nDevSize = pDevMode->dmSize+pDevMode->dmDriverExtra; + sal_uLong nDevSize = pDevMode->dmSize+pDevMode->dmDriverExtra; pNewDevMode = (LPDEVMODEW)rtl_allocateMemory( nDevSize ); memcpy( pNewDevMode, pDevMode, nDevSize ); pDevMode = pNewDevMode; @@ -1966,7 +1966,7 @@ static int lcl_StartDocA( HDC hDC, DOCINFOA* pInfo, WinSalPrinter* pPrt ) sal_Bool WinSalPrinter::StartJob( const XubString* pFileName, const XubString& rJobName, const XubString&, - sal_uIntPtr nCopies, + sal_uLong nCopies, bool bCollate, bool /*bDirect*/, ImplJobSetup* pSetupData ) @@ -2207,7 +2207,7 @@ sal_Bool WinSalPrinter::EndJob() // call, however the real solution is supposed to be the threading // framework yet to come. SalData* pSalData = GetSalData(); - sal_uIntPtr nAcquire = pSalData->mpFirstInstance->ReleaseYieldMutex(); + sal_uLong nAcquire = pSalData->mpFirstInstance->ReleaseYieldMutex(); CATCH_DRIVER_EX_BEGIN; if( ::EndDoc( hDC ) <= 0 ) err = GetLastError(); @@ -2365,7 +2365,7 @@ sal_Bool WinSalPrinter::EndPage() // ----------------------------------------------------------------------- -sal_uIntPtr WinSalPrinter::GetErrorCode() +sal_uLong WinSalPrinter::GetErrorCode() { return mnError; } diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index dc011dba8de7..ee3bc2430e5c 100755 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -352,7 +352,7 @@ void ImplSalGetWorkArea( HWND hWnd, RECT *pRect, const RECT *pParentRect ) // ======================================================================= SalFrame* ImplSalCreateFrame( WinSalInstance* pInst, - HWND hWndParent, sal_uIntPtr nSalFrameStyle ) + HWND hWndParent, sal_uLong nSalFrameStyle ) { WinSalFrame* pFrame = new WinSalFrame; HWND hWnd; @@ -608,8 +608,8 @@ SalFrame* ImplSalCreateFrame( WinSalInstance* pInst, HWND ImplSalReCreateHWND( HWND hWndParent, HWND oldhWnd, sal_Bool bAsChild ) { HINSTANCE hInstance = GetSalData()->mhInst; - sal_uIntPtr nSysStyle = GetWindowLong( oldhWnd, GWL_STYLE ); - sal_uIntPtr nExSysStyle = GetWindowLong( oldhWnd, GWL_EXSTYLE ); + ULONG nSysStyle = GetWindowLong( oldhWnd, GWL_STYLE ); + ULONG nExSysStyle = GetWindowLong( oldhWnd, GWL_EXSTYLE ); if( bAsChild ) { @@ -2622,26 +2622,26 @@ XubString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode ) if ( nKeyCode & KEY_MOD1 ) { nSysCode = MapVirtualKey( VK_CONTROL, 0 ); - nSysCode = (nSysCode << 16) | (((sal_uIntPtr)1) << 25); + nSysCode = (nSysCode << 16) | (((sal_uLong)1) << 25); ImplGetKeyNameText( nSysCode, aKeyBuf, nKeyBufLen, nMaxKeyLen, "Ctrl" ); } if ( nKeyCode & KEY_MOD2 ) { nSysCode = MapVirtualKey( VK_MENU, 0 ); - nSysCode = (nSysCode << 16) | (((sal_uIntPtr)1) << 25); + nSysCode = (nSysCode << 16) | (((sal_uLong)1) << 25); ImplGetKeyNameText( nSysCode, aKeyBuf, nKeyBufLen, nMaxKeyLen, "Alt" ); } if ( nKeyCode & KEY_SHIFT ) { nSysCode = MapVirtualKey( VK_SHIFT, 0 ); - nSysCode = (nSysCode << 16) | (((sal_uIntPtr)1) << 25); + nSysCode = (nSysCode << 16) | (((sal_uLong)1) << 25); ImplGetKeyNameText( nSysCode, aKeyBuf, nKeyBufLen, nMaxKeyLen, "Shift" ); } sal_uInt16 nCode = nKeyCode & 0x0FFF; - sal_uIntPtr nSysCode2 = 0; + sal_uLong nSysCode2 = 0; sal_Char* pReplace = NULL; sal_Unicode cSVCode = 0; sal_Char aFBuf[4]; @@ -2680,42 +2680,42 @@ XubString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode ) { case KEY_DOWN: nSysCode = VK_DOWN; - nSysCode2 = (((sal_uIntPtr)1) << 24); + nSysCode2 = (((sal_uLong)1) << 24); pReplace = "Down"; break; case KEY_UP: nSysCode = VK_UP; - nSysCode2 = (((sal_uIntPtr)1) << 24); + nSysCode2 = (((sal_uLong)1) << 24); pReplace = "Up"; break; case KEY_LEFT: nSysCode = VK_LEFT; - nSysCode2 = (((sal_uIntPtr)1) << 24); + nSysCode2 = (((sal_uLong)1) << 24); pReplace = "Left"; break; case KEY_RIGHT: nSysCode = VK_RIGHT; - nSysCode2 = (((sal_uIntPtr)1) << 24); + nSysCode2 = (((sal_uLong)1) << 24); pReplace = "Right"; break; case KEY_HOME: nSysCode = VK_HOME; - nSysCode2 = (((sal_uIntPtr)1) << 24); + nSysCode2 = (((sal_uLong)1) << 24); pReplace = "Home"; break; case KEY_END: nSysCode = VK_END; - nSysCode2 = (((sal_uIntPtr)1) << 24); + nSysCode2 = (((sal_uLong)1) << 24); pReplace = "End"; break; case KEY_PAGEUP: nSysCode = VK_PRIOR; - nSysCode2 = (((sal_uIntPtr)1) << 24); + nSysCode2 = (((sal_uLong)1) << 24); pReplace = "Page Up"; break; case KEY_PAGEDOWN: nSysCode = VK_NEXT; - nSysCode2 = (((sal_uIntPtr)1) << 24); + nSysCode2 = (((sal_uLong)1) << 24); pReplace = "Page Down"; break; case KEY_RETURN: @@ -2740,12 +2740,12 @@ XubString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode ) break; case KEY_INSERT: nSysCode = VK_INSERT; - nSysCode2 = (((sal_uIntPtr)1) << 24); + nSysCode2 = (((sal_uLong)1) << 24); pReplace = "Insert"; break; case KEY_DELETE: nSysCode = VK_DELETE; - nSysCode2 = (((sal_uIntPtr)1) << 24); + nSysCode2 = (((sal_uLong)1) << 24); pReplace = "Delete"; break; @@ -2908,7 +2908,7 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings ) &nType, aValueBuf, &nValueSize ) == ERROR_SUCCESS ) { if ( nType == REG_SZ ) - aMouseSettings.SetMenuDelay( (sal_uIntPtr)ImplA2I( aValueBuf ) ); + aMouseSettings.SetMenuDelay( (sal_uLong)ImplA2I( aValueBuf ) ); } RegCloseKey( hRegKey ); @@ -3101,7 +3101,7 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings ) BOOL bDragFull; if ( SystemParametersInfo( SPI_GETDRAGFULLWINDOWS, 0, &bDragFull, 0 ) ) { - sal_uIntPtr nDragFullOptions = aStyleSettings.GetDragFullOptions(); + sal_uLong nDragFullOptions = aStyleSettings.GetDragFullOptions(); if ( bDragFull ) nDragFullOptions |= DRAGFULL_OPTION_WINDOWMOVE | DRAGFULL_OPTION_WINDOWSIZE | DRAGFULL_OPTION_DOCKING | DRAGFULL_OPTION_SPLIT; else @@ -3124,7 +3124,7 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings ) { if ( nType == REG_SZ ) { - nValue = (sal_uIntPtr)ImplA2I( aValueBuf ); + nValue = (sal_uLong)ImplA2I( aValueBuf ); if ( (nValue > 1000) && (nValue < 10000) ) { MiscSettings aMiscSettings = rSettings.GetMiscSettings(); @@ -3240,11 +3240,11 @@ void WinSalFrame::ResetClipRegion() // ----------------------------------------------------------------------- -void WinSalFrame::BeginSetClipRegion( sal_uIntPtr nRects ) +void WinSalFrame::BeginSetClipRegion( sal_uLong nRects ) { if( mpClipRgnData ) delete [] (BYTE*)mpClipRgnData; - sal_uIntPtr nRectBufSize = sizeof(RECT)*nRects; + sal_uLong nRectBufSize = sizeof(RECT)*nRects; mpClipRgnData = (RGNDATA*)new BYTE[sizeof(RGNDATA)-1+nRectBufSize]; mpClipRgnData->rdh.dwSize = sizeof( RGNDATAHEADER ); mpClipRgnData->rdh.iType = RDH_RECTANGLES; @@ -3316,7 +3316,7 @@ void WinSalFrame::EndSetClipRegion() } else { - sal_uIntPtr nSize = mpClipRgnData->rdh.nRgnSize+sizeof(RGNDATAHEADER); + sal_uLong nSize = mpClipRgnData->rdh.nRgnSize+sizeof(RGNDATAHEADER); hRegion = ExtCreateRegion( NULL, nSize, mpClipRgnData ); } delete [] (BYTE*)mpClipRgnData; @@ -5816,8 +5816,8 @@ static LRESULT ImplHandleIMEConfirmReconvertString( HWND hWnd, LPARAM lParam ) pFrame->CallCallback( SALEVENT_SURROUNDINGTEXTREQUEST, (void*)&aEvt ); - sal_uIntPtr nTmpStart = pReconvertString->dwCompStrOffset / sizeof(WCHAR); - sal_uIntPtr nTmpEnd = nTmpStart + pReconvertString->dwCompStrLen; + sal_uLong nTmpStart = pReconvertString->dwCompStrOffset / sizeof(WCHAR); + sal_uLong nTmpEnd = nTmpStart + pReconvertString->dwCompStrLen; if( nTmpStart != aEvt.mnStart || nTmpEnd != aEvt.mnEnd ) { @@ -6217,7 +6217,7 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lP rDef = FALSE; break; case SAL_MSG_ENDEXTTEXTINPUT: - ImplSalFrameEndExtTextInput( hWnd, (sal_uInt16)(sal_uIntPtr)(void*)wParam ); + ImplSalFrameEndExtTextInput( hWnd, (sal_uInt16)(sal_uLong)(void*)wParam ); rDef = FALSE; break; diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx index 68fc3f24491b..6de42adb0c3e 100644 --- a/vcl/win/source/window/salobj.cxx +++ b/vcl/win/source/window/salobj.cxx @@ -731,9 +731,9 @@ sal_uInt16 WinSalObject::GetClipRegionType() // ----------------------------------------------------------------------- -void WinSalObject::BeginSetClipRegion( sal_uIntPtr nRectCount ) +void WinSalObject::BeginSetClipRegion( sal_uLong nRectCount ) { - sal_uIntPtr nRectBufSize = sizeof(RECT)*nRectCount; + sal_uLong nRectBufSize = sizeof(RECT)*nRectCount; if ( nRectCount < SAL_CLIPRECT_COUNT ) { if ( !mpStdClipRgnData ) @@ -805,7 +805,7 @@ void WinSalObject::EndSetClipRegion() } else { - sal_uIntPtr nSize = mpClipRgnData->rdh.nRgnSize+sizeof(RGNDATAHEADER); + sal_uLong nSize = mpClipRgnData->rdh.nRgnSize+sizeof(RGNDATAHEADER); hRegion = ExtCreateRegion( NULL, nSize, mpClipRgnData ); if ( mpClipRgnData != mpStdClipRgnData ) delete [] (BYTE*)mpClipRgnData; @@ -819,7 +819,7 @@ void WinSalObject::EndSetClipRegion() void WinSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight ) { - sal_uIntPtr nStyle = 0; + sal_uLong nStyle = 0; sal_Bool bVisible = (GetWindowStyle( mhWnd ) & WS_VISIBLE) != 0; if ( bVisible ) { diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx index 2f388876a847..53dd111c7694 100755 --- a/vcl/workben/outdevgrind.cxx +++ b/vcl/workben/outdevgrind.cxx @@ -256,12 +256,12 @@ void setupMethodStubs( functor_vector_type& res ) aRect )); /* void DrawRect( const Rectangle& rRect, - sal_uIntPtr nHorzRount, sal_uIntPtr nVertRound ); + sal_uLong nHorzRount, sal_uLong nVertRound ); */ add(res, "DrawRect(round corners)", boost::bind( - (void (OutputDevice::*)( const Rectangle&, sal_uIntPtr nHorzRount, sal_uIntPtr nVertRound ))( + (void (OutputDevice::*)( const Rectangle&, sal_uLong nHorzRount, sal_uLong nVertRound ))( &OutputDevice::DrawRect), _1, aRect2, @@ -764,7 +764,7 @@ void setupMethodStubs( functor_vector_type& res ) _1, aPt1,aPt2,(sal_uInt16)WAVE_NORMAL )); - /* void DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uIntPtr nFlags ); */ + /* void DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uLong nFlags ); */ add(res, "DrawGrid", boost::bind( |