diff options
Diffstat (limited to 'vcl/inc')
76 files changed, 762 insertions, 762 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 ); |