diff options
| author | Noel <noelgrandin@gmail.com> | 2020-10-19 15:12:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-10-19 21:34:46 +0200 |
| commit | 3aef606f2758172a27718a06fea0ff9080e4d80f (patch) | |
| tree | ad323c90301d80bbb3b68163d8b87e5402b687ed /include/vcl | |
| parent | 5afba3e12c8d4eb1ebb8e087134eb87593bb017a (diff) | |
use tools::Long in vcl
Change-Id: Ice1055021e8568634e9a66ba89d3bb4ef4e731df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104522
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/vcl')
72 files changed, 650 insertions, 643 deletions
diff --git a/include/vcl/BitmapBuffer.hxx b/include/vcl/BitmapBuffer.hxx index 2a064951c447..4a4ec8404a08 100644 --- a/include/vcl/BitmapBuffer.hxx +++ b/include/vcl/BitmapBuffer.hxx @@ -30,9 +30,9 @@ struct SalTwoRect; struct VCL_DLLPUBLIC BitmapBuffer { ScanlineFormat mnFormat; - long mnWidth; - long mnHeight; - long mnScanlineSize; + tools::Long mnWidth; + tools::Long mnHeight; + tools::Long mnScanlineSize; sal_uInt16 mnBitCount; ColorMask maColorMask; BitmapPalette maPalette; diff --git a/include/vcl/BitmapConvolutionMatrixFilter.hxx b/include/vcl/BitmapConvolutionMatrixFilter.hxx index 185d14012d49..2d787cefe19f 100644 --- a/include/vcl/BitmapConvolutionMatrixFilter.hxx +++ b/include/vcl/BitmapConvolutionMatrixFilter.hxx @@ -20,7 +20,7 @@ class BitmapEx; class VCL_DLLPUBLIC BitmapConvolutionMatrixFilter : public BitmapFilter { public: - BitmapConvolutionMatrixFilter(const long (&rMatrix)[9]) + BitmapConvolutionMatrixFilter(const tools::Long (&rMatrix)[9]) : mrMatrix(rMatrix) { } @@ -28,7 +28,7 @@ public: virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override; private: - const long (&mrMatrix)[9]; + const tools::Long (&mrMatrix)[9]; }; #endif diff --git a/include/vcl/BitmapFilter.hxx b/include/vcl/BitmapFilter.hxx index 899d98047a03..c19d83b2d507 100644 --- a/include/vcl/BitmapFilter.hxx +++ b/include/vcl/BitmapFilter.hxx @@ -28,13 +28,14 @@ namespace vcl::bitmap // [0, 31, false], [32, 63, false], [64, 95, false], [96, 100, true] template <int STRIP_SIZE> void generateStripRanges( - long nFirst, long nLast, - std::function<void(long const nStart, long const nEnd, bool const bLast)> aFunction) + tools::Long nFirst, tools::Long nLast, + std::function<void(tools::Long const nStart, tools::Long const nEnd, bool const bLast)> + aFunction) { - long nStart = nFirst; + tools::Long nStart = nFirst; for (; nStart < nLast - STRIP_SIZE; nStart += STRIP_SIZE) { - long nEnd = nStart + STRIP_SIZE - 1; + tools::Long nEnd = nStart + STRIP_SIZE - 1; aFunction(nStart, nEnd, false); } aFunction(nStart, nLast, true); diff --git a/include/vcl/BitmapTools.hxx b/include/vcl/BitmapTools.hxx index 76598cb80812..12cdb1947b2c 100644 --- a/include/vcl/BitmapTools.hxx +++ b/include/vcl/BitmapTools.hxx @@ -69,7 +69,7 @@ VCL_DLLPUBLIC css::uno::Sequence< sal_Int8 > GetMaskDIB(BitmapEx const & aBmpEx) * @param data will be filled with alpha data, if xBitmap is alpha/transparent image * @param bHasAlpha will be set to true if resulting surface has alpha **/ -VCL_DLLPUBLIC void CanvasCairoExtractBitmapData( BitmapEx const & rBmpEx, Bitmap & rBitmap, unsigned char*& data, bool& bHasAlpha, long& rnWidth, long& rnHeight ); +VCL_DLLPUBLIC void CanvasCairoExtractBitmapData( BitmapEx const & rBmpEx, Bitmap & rBitmap, unsigned char*& data, bool& bHasAlpha, tools::Long& rnWidth, tools::Long& rnHeight ); VCL_DLLPUBLIC css::uno::Sequence< sal_Int8 > CanvasExtractBitmapData(BitmapEx const & rBitmapEx, const css::geometry::IntegerRectangle2D& rect); diff --git a/include/vcl/GraphicAttributes.hxx b/include/vcl/GraphicAttributes.hxx index 08b716b3db08..a26f59edc890 100644 --- a/include/vcl/GraphicAttributes.hxx +++ b/include/vcl/GraphicAttributes.hxx @@ -35,10 +35,10 @@ class VCL_DLLPUBLIC GraphicAttr private: double mfGamma; BmpMirrorFlags mnMirrFlags; - long mnLeftCrop; - long mnTopCrop; - long mnRightCrop; - long mnBottomCrop; + tools::Long mnLeftCrop; + tools::Long mnTopCrop; + tools::Long mnRightCrop; + tools::Long mnBottomCrop; sal_uInt16 mnRotate10; short mnContPercent; short mnLumPercent; @@ -61,18 +61,18 @@ public: void SetMirrorFlags(BmpMirrorFlags nMirrFlags) { mnMirrFlags = nMirrFlags; } BmpMirrorFlags GetMirrorFlags() const { return mnMirrFlags; } - void SetCrop(long nLeft_100TH_MM, long nTop_100TH_MM, long nRight_100TH_MM, - long nBottom_100TH_MM) + void SetCrop(tools::Long nLeft_100TH_MM, tools::Long nTop_100TH_MM, tools::Long nRight_100TH_MM, + tools::Long nBottom_100TH_MM) { mnLeftCrop = nLeft_100TH_MM; mnTopCrop = nTop_100TH_MM; mnRightCrop = nRight_100TH_MM; mnBottomCrop = nBottom_100TH_MM; } - long GetLeftCrop() const { return mnLeftCrop; } - long GetTopCrop() const { return mnTopCrop; } - long GetRightCrop() const { return mnRightCrop; } - long GetBottomCrop() const { return mnBottomCrop; } + tools::Long GetLeftCrop() const { return mnLeftCrop; } + tools::Long GetTopCrop() const { return mnTopCrop; } + tools::Long GetRightCrop() const { return mnRightCrop; } + tools::Long GetBottomCrop() const { return mnBottomCrop; } void SetRotation(sal_uInt16 nRotate10) { mnRotate10 = nRotate10; } sal_uInt16 GetRotation() const { return mnRotate10; } diff --git a/include/vcl/GraphicObject.hxx b/include/vcl/GraphicObject.hxx index c900bb02cbf7..e4c1edc817d6 100644 --- a/include/vcl/GraphicObject.hxx +++ b/include/vcl/GraphicObject.hxx @@ -265,11 +265,11 @@ public: OutputDevice* pOut, const Point& rPt, const Size& rSz, - long nExtraData = 0, + tools::Long nExtraData = 0, OutputDevice* pFirstFrameOutDev = nullptr ); - void StopAnimation( const OutputDevice* pOut = nullptr, long nExtraData = 0 ); + void StopAnimation( const OutputDevice* pOut = nullptr, tools::Long nExtraData = 0 ); static bool isGraphicObjectUniqueIdURL(OUString const & rURL); diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx index 2e8b557505f1..42689ed98c2a 100644 --- a/include/vcl/ITiledRenderable.hxx +++ b/include/vcl/ITiledRenderable.hxx @@ -61,8 +61,8 @@ public: int nOutputHeight, int nTilePosX, int nTilePosY, - long nTileWidth, - long nTileHeight ) = 0; + tools::Long nTileWidth, + tools::Long nTileHeight ) = 0; /** * Get the document size in twips. diff --git a/include/vcl/RawBitmap.hxx b/include/vcl/RawBitmap.hxx index 92e903b4292d..7fac44a166af 100644 --- a/include/vcl/RawBitmap.hxx +++ b/include/vcl/RawBitmap.hxx @@ -40,27 +40,27 @@ public: } mpData.reset(new sal_uInt8[nDataSize]); } - void SetPixel(long nY, long nX, Color nColor) + void SetPixel(tools::Long nY, tools::Long nX, Color nColor) { - long p = (nY * maSize.getWidth() + nX) * (mnBitCount / 8); + tools::Long p = (nY * maSize.getWidth() + nX) * (mnBitCount / 8); mpData[p++] = nColor.GetRed(); mpData[p++] = nColor.GetGreen(); mpData[p++] = nColor.GetBlue(); if (mnBitCount == 32) mpData[p] = nColor.GetTransparency(); } - Color GetPixel(long nY, long nX) const + Color GetPixel(tools::Long nY, tools::Long nX) const { - long p = (nY * maSize.getWidth() + nX) * mnBitCount / 8; + tools::Long p = (nY * maSize.getWidth() + nX) * mnBitCount / 8; if (mnBitCount == 24) return Color(mpData[p], mpData[p + 1], mpData[p + 2]); else return Color(mpData[p + 3], mpData[p], mpData[p + 1], mpData[p + 2]); } // so we don't accidentally leave any code in that uses palette color indexes - void SetPixel(long nY, long nX, BitmapColor nColor) = delete; - long Height() { return maSize.Height(); } - long Width() { return maSize.Width(); } + void SetPixel(tools::Long nY, tools::Long nX, BitmapColor nColor) = delete; + tools::Long Height() { return maSize.Height(); } + tools::Long Width() { return maSize.Width(); } sal_uInt8 GetBitCount() const { return mnBitCount; } }; diff --git a/include/vcl/accessibletable.hxx b/include/vcl/accessibletable.hxx index 8c2aeba6b7c3..b98080273dae 100644 --- a/include/vcl/accessibletable.hxx +++ b/include/vcl/accessibletable.hxx @@ -81,8 +81,8 @@ public: virtual vcl::Window* GetWindowInstance()= 0; virtual sal_Int32 GetAccessibleControlCount() const = 0; virtual bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint )= 0; - virtual long GetRowCount() const= 0; - virtual long GetColumnCount() const= 0; + virtual tools::Long GetRowCount() const= 0; + virtual tools::Long GetColumnCount() const= 0; virtual bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_Int32& _rnColPos, const Point& _rPoint )= 0; virtual tools::Rectangle calcHeaderRect( bool _bIsColumnBar ) = 0; virtual tools::Rectangle calcHeaderCellRect( bool _bColHeader, sal_Int32 _nPos ) = 0; diff --git a/include/vcl/accessibletableprovider.hxx b/include/vcl/accessibletableprovider.hxx index b69548ef2355..637abf236134 100644 --- a/include/vcl/accessibletableprovider.hxx +++ b/include/vcl/accessibletableprovider.hxx @@ -51,7 +51,7 @@ class IAccessibleTableProvider { public: /** @return The count of the rows. */ - virtual long GetRowCount() const = 0; + virtual tools::Long GetRowCount() const = 0; /** @return The count of the columns. */ virtual sal_uInt16 GetColumnCount() const = 0; @@ -73,19 +73,19 @@ public: virtual void SetNoSelection() = 0; virtual void SelectAll() = 0; - virtual void SelectRow( long _nRow, bool _bSelect = true, bool bExpand = true ) = 0; + virtual void SelectRow( tools::Long _nRow, bool _bSelect = true, bool bExpand = true ) = 0; virtual void SelectColumn( sal_uInt16 _nColumnPos, bool _bSelect = true ) = 0; virtual sal_Int32 GetSelectedRowCount() const = 0; virtual sal_Int32 GetSelectedColumnCount() const = 0; /** @return <TRUE/>, if the row is selected. */ - virtual bool IsRowSelected( long _nRow ) const = 0; - virtual bool IsColumnSelected( long _nColumnPos ) const = 0; + virtual bool IsRowSelected( tools::Long _nRow ) const = 0; + virtual bool IsColumnSelected( tools::Long _nColumnPos ) const = 0; virtual void GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const = 0; virtual void GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const = 0; /** @return <TRUE/>, if the cell is visible. */ virtual bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const = 0; - virtual OUString GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const = 0; + virtual OUString GetAccessibleCellText( tools::Long _nRow, sal_uInt16 _nColumnPos ) const = 0; virtual tools::Rectangle calcHeaderRect( bool _bIsColumnBar, bool _bOnScreen = true ) = 0; virtual tools::Rectangle calcTableRect( bool _bOnScreen = true ) = 0; diff --git a/include/vcl/animate/Animation.hxx b/include/vcl/animate/Animation.hxx index e355d7d1e2a1..e6b55a7c510f 100644 --- a/include/vcl/animate/Animation.hxx +++ b/include/vcl/animate/Animation.hxx @@ -41,10 +41,10 @@ public: void Clear(); - bool Start(OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSz, long nExtraData, - OutputDevice* pFirstFrameOutDev); + bool Start(OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSz, + tools::Long nExtraData, OutputDevice* pFirstFrameOutDev); - void Stop(const OutputDevice* pOutDev = nullptr, long nExtraData = 0); + void Stop(const OutputDevice* pOutDev = nullptr, tools::Long nExtraData = 0); void Draw(OutputDevice* pOutDev, const Point& rDestPt) const; void Draw(OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSz) const; diff --git a/include/vcl/animate/AnimationBitmap.hxx b/include/vcl/animate/AnimationBitmap.hxx index 6f5aa1768629..d06f820f8f97 100644 --- a/include/vcl/animate/AnimationBitmap.hxx +++ b/include/vcl/animate/AnimationBitmap.hxx @@ -34,7 +34,7 @@ struct AnimationBitmap BitmapEx maBitmapEx; Point maPositionPixel; Size maSizePixel; - long mnWait; + tools::Long mnWait; Disposal meDisposal; bool mbUserInput; @@ -46,7 +46,7 @@ struct AnimationBitmap } AnimationBitmap(const BitmapEx& rBitmapEx, const Point& rPositionPixel, const Size& rSizePixel, - long nWait = 0, Disposal eDisposal = Disposal::Not) + tools::Long nWait = 0, Disposal eDisposal = Disposal::Not) : maBitmapEx(rBitmapEx) , maPositionPixel(rPositionPixel) , maSizePixel(rSizePixel) diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index 9ed602942322..932bab285784 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -349,7 +349,7 @@ public: @return true, if the operation was completed successfully. */ - bool Rotate( long nAngle10, const Color& rFillColor ); + bool Rotate( tools::Long nAngle10, const Color& rFillColor ); /** Create on-off mask from bitmap diff --git a/include/vcl/bitmapaccess.hxx b/include/vcl/bitmapaccess.hxx index 72f53af6e31e..439228b2451e 100644 --- a/include/vcl/bitmapaccess.hxx +++ b/include/vcl/bitmapaccess.hxx @@ -27,8 +27,8 @@ #include <vcl/BitmapColor.hxx> #include <vcl/BitmapAccessMode.hxx> -typedef BitmapColor (*FncGetPixel)(ConstScanline pScanline, long nX, const ColorMask& rMask); -typedef void (*FncSetPixel)(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); +typedef BitmapColor (*FncGetPixel)(ConstScanline pScanline, tools::Long nX, const ColorMask& rMask); +typedef void (*FncSetPixel)(Scanline pScanline, tools::Long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); class VCL_DLLPUBLIC BitmapInfoAccess { @@ -43,12 +43,12 @@ public: return mpBuffer == nullptr; } - long Width() const + tools::Long Width() const { return mpBuffer ? mpBuffer->mnWidth : 0L; } - long Height() const + tools::Long Height() const { return mpBuffer ? mpBuffer->mnHeight : 0L; } @@ -164,7 +164,7 @@ public: return mpBuffer ? mpBuffer->mpBits : nullptr; } - Scanline GetScanline(long nY) const + Scanline GetScanline(tools::Long nY) const { assert(mpBuffer && "Access is not valid!"); assert(nY < mpBuffer->mnHeight && "y-coordinate out of range!"); @@ -176,26 +176,26 @@ public: return mpBuffer->mpBits + ((mpBuffer->mnHeight - 1 - nY) * mpBuffer->mnScanlineSize); } - BitmapColor GetPixelFromData(const sal_uInt8* pData, long nX) const + BitmapColor GetPixelFromData(const sal_uInt8* pData, tools::Long nX) const { assert(pData && "Access is not valid!"); return mFncGetPixel( pData, nX, maColorMask ); } - sal_uInt8 GetIndexFromData(const sal_uInt8* pData, long nX) const + sal_uInt8 GetIndexFromData(const sal_uInt8* pData, tools::Long nX) const { return GetPixelFromData( pData, nX ).GetIndex(); } - void SetPixelOnData(sal_uInt8* pData, long nX, const BitmapColor& rBitmapColor) + void SetPixelOnData(sal_uInt8* pData, tools::Long nX, const BitmapColor& rBitmapColor) { assert(pData && "Access is not valid!"); mFncSetPixel(pData, nX, rBitmapColor, maColorMask); } - BitmapColor GetPixel(long nY, long nX) const + BitmapColor GetPixel(tools::Long nY, tools::Long nX) const { assert(mpBuffer && "Access is not valid!"); assert(nX < mpBuffer->mnWidth && "x-coordinate out of range!"); @@ -204,7 +204,7 @@ public: return mFncGetPixel(GetScanline(nY), nX, maColorMask ); } - BitmapColor GetColor(long nY, long nX) const + BitmapColor GetColor(tools::Long nY, tools::Long nX) const { if (HasPalette()) return mpBuffer->maPalette[GetPixelIndex(nY, nX)]; @@ -212,7 +212,7 @@ public: return GetPixel(nY, nX); } - sal_uInt8 GetPixelIndex(long nY, long nX) const + sal_uInt8 GetPixelIndex(tools::Long nY, tools::Long nX) const { return GetPixel(nY, nX).GetIndex(); } @@ -239,41 +239,41 @@ public: return mpBuffer; } - static BitmapColor GetPixelForN1BitMsbPal(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelForN1BitLsbPal(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelForN4BitMsnPal(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelForN4BitLsnPal(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelForN8BitPal(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelForN8BitTcMask(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelForN24BitTcBgr(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelForN24BitTcRgb(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelForN32BitTcAbgr(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelForN32BitTcXbgr(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelForN32BitTcArgb(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelForN32BitTcXrgb(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelForN32BitTcBgra(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelForN32BitTcBgrx(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelForN32BitTcRgba(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelForN32BitTcRgbx(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelForN32BitTcMask(ConstScanline pScanline, long nX, const ColorMask& rMask); - - static void SetPixelForN1BitMsbPal(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelForN1BitLsbPal(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelForN4BitMsnPal(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelForN4BitLsnPal(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelForN8BitPal(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelForN8BitTcMask(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelForN24BitTcBgr(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelForN24BitTcRgb(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelForN32BitTcAbgr(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelForN32BitTcXbgr(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelForN32BitTcArgb(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelForN32BitTcXrgb(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelForN32BitTcBgra(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelForN32BitTcBgrx(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelForN32BitTcRgba(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelForN32BitTcRgbx(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelForN32BitTcMask(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static BitmapColor GetPixelForN1BitMsbPal(ConstScanline pScanline, tools::Long nX, const ColorMask& rMask); + static BitmapColor GetPixelForN1BitLsbPal(ConstScanline pScanline, tools::Long nX, const ColorMask& rMask); + static BitmapColor GetPixelForN4BitMsnPal(ConstScanline pScanline, tools::Long nX, const ColorMask& rMask); + static BitmapColor GetPixelForN4BitLsnPal(ConstScanline pScanline, tools::Long nX, const ColorMask& rMask); + static BitmapColor GetPixelForN8BitPal(ConstScanline pScanline, tools::Long nX, const ColorMask& rMask); + static BitmapColor GetPixelForN8BitTcMask(ConstScanline pScanline, tools::Long nX, const ColorMask& rMask); + static BitmapColor GetPixelForN24BitTcBgr(ConstScanline pScanline, tools::Long nX, const ColorMask& rMask); + static BitmapColor GetPixelForN24BitTcRgb(ConstScanline pScanline, tools::Long nX, const ColorMask& rMask); + static BitmapColor GetPixelForN32BitTcAbgr(ConstScanline pScanline, tools::Long nX, const ColorMask& rMask); + static BitmapColor GetPixelForN32BitTcXbgr(ConstScanline pScanline, tools::Long nX, const ColorMask& rMask); + static BitmapColor GetPixelForN32BitTcArgb(ConstScanline pScanline, tools::Long nX, const ColorMask& rMask); + static BitmapColor GetPixelForN32BitTcXrgb(ConstScanline pScanline, tools::Long nX, const ColorMask& rMask); + static BitmapColor GetPixelForN32BitTcBgra(ConstScanline pScanline, tools::Long nX, const ColorMask& rMask); + static BitmapColor GetPixelForN32BitTcBgrx(ConstScanline pScanline, tools::Long nX, const ColorMask& rMask); + static BitmapColor GetPixelForN32BitTcRgba(ConstScanline pScanline, tools::Long nX, const ColorMask& rMask); + static BitmapColor GetPixelForN32BitTcRgbx(ConstScanline pScanline, tools::Long nX, const ColorMask& rMask); + static BitmapColor GetPixelForN32BitTcMask(ConstScanline pScanline, tools::Long nX, const ColorMask& rMask); + + static void SetPixelForN1BitMsbPal(Scanline pScanline, tools::Long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelForN1BitLsbPal(Scanline pScanline, tools::Long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelForN4BitMsnPal(Scanline pScanline, tools::Long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelForN4BitLsnPal(Scanline pScanline, tools::Long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelForN8BitPal(Scanline pScanline, tools::Long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelForN8BitTcMask(Scanline pScanline, tools::Long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelForN24BitTcBgr(Scanline pScanline, tools::Long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelForN24BitTcRgb(Scanline pScanline, tools::Long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelForN32BitTcAbgr(Scanline pScanline, tools::Long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelForN32BitTcXbgr(Scanline pScanline, tools::Long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelForN32BitTcArgb(Scanline pScanline, tools::Long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelForN32BitTcXrgb(Scanline pScanline, tools::Long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelForN32BitTcBgra(Scanline pScanline, tools::Long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelForN32BitTcBgrx(Scanline pScanline, tools::Long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelForN32BitTcRgba(Scanline pScanline, tools::Long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelForN32BitTcRgbx(Scanline pScanline, tools::Long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelForN32BitTcMask(Scanline pScanline, tools::Long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); static FncGetPixel GetPixelFunction( ScanlineFormat nFormat ); static FncSetPixel SetPixelFunction( ScanlineFormat nFormat ); diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx index 4dac473bb2f5..7c9eb69383c1 100644 --- a/include/vcl/bitmapex.hxx +++ b/include/vcl/bitmapex.hxx @@ -233,7 +233,7 @@ public: @return true, if the operation was completed successfully. */ bool Rotate( - long nAngle10, + tools::Long nAngle10, const Color& rFillColor ); /** Replace all pixel having the search color with the specified color @@ -436,7 +436,7 @@ public: BitmapEx ModifyBitmapEx( const basegfx::BColorModifierStack& rBColorModifierStack) const; [[nodiscard]] - static BitmapEx AutoScaleBitmap( BitmapEx const & aBitmap, const long aStandardSize ); + static BitmapEx AutoScaleBitmap( BitmapEx const & aBitmap, const tools::Long aStandardSize ); /// populate from a canvas implementation bool Create( diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 4c3a7beafa5f..b91f87481305 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -55,8 +55,8 @@ public: SAL_DLLPRIVATE const tools::Rectangle& ImplGetFocusRect() const; SAL_DLLPRIVATE void ImplSetSymbolAlign( SymbolAlign eAlign ); /// The x-coordinate of the vertical separator line, use in MenuButton subclass only. - SAL_DLLPRIVATE long ImplGetSeparatorX() const; - SAL_DLLPRIVATE void ImplSetSeparatorX( long nX ); + SAL_DLLPRIVATE tools::Long ImplGetSeparatorX() const; + SAL_DLLPRIVATE void ImplSetSeparatorX( tools::Long nX ); protected: explicit Button( WindowType nType ); @@ -240,7 +240,7 @@ private: SAL_DLLPRIVATE void ImplDrawRadioButton(vcl::RenderContext& rRenderContext ); SAL_DLLPRIVATE void ImplUncheckAllOther(); SAL_DLLPRIVATE Size ImplGetRadioImageSize() const; - SAL_DLLPRIVATE long ImplGetImageToTextDistance() const; + SAL_DLLPRIVATE tools::Long ImplGetImageToTextDistance() const; RadioButton(const RadioButton &) = delete; RadioButton& operator= (const RadioButton &) = delete; @@ -301,7 +301,7 @@ public: static Image GetRadioImage( const AllSettings& rSettings, DrawButtonFlags nFlags ); - Size CalcMinimumSize( long nMaxWidth = 0 ) const; + Size CalcMinimumSize( tools::Long nMaxWidth = 0 ) const; virtual Size GetOptimalSize() const override; void SetToggleHdl( const Link<RadioButton&,void>& rLink ) { maToggleHdl = rLink; } diff --git a/include/vcl/commandevent.hxx b/include/vcl/commandevent.hxx index fd834bd822ac..9edcdb4d6f13 100644 --- a/include/vcl/commandevent.hxx +++ b/include/vcl/commandevent.hxx @@ -137,8 +137,8 @@ enum class CommandWheelMode class VCL_DLLPUBLIC CommandWheelData { private: - long mnDelta; - long mnNotchDelta; + tools::Long mnDelta; + tools::Long mnNotchDelta; double mnLines; CommandWheelMode mnWheelMode; sal_uInt16 mnCode; @@ -147,13 +147,13 @@ private: public: CommandWheelData(); - CommandWheelData( long nWheelDelta, long nWheelNotchDelta, + CommandWheelData( tools::Long nWheelDelta, tools::Long nWheelNotchDelta, double nScrollLines, CommandWheelMode nWheelMode, sal_uInt16 nKeyModifier, bool bHorz, bool bDeltaIsPixel = false ); - long GetDelta() const { return mnDelta; } - long GetNotchDelta() const { return mnNotchDelta; } + tools::Long GetDelta() const { return mnDelta; } + tools::Long GetNotchDelta() const { return mnNotchDelta; } double GetScrollLines() const { return mnLines; } bool IsHorz() const { return mbHorz; } bool IsDeltaPixel() const { return mbDeltaIsPixel; } @@ -173,14 +173,14 @@ public: class CommandScrollData { private: - long mnDeltaX; - long mnDeltaY; + tools::Long mnDeltaX; + tools::Long mnDeltaY; public: - CommandScrollData( long nDeltaX, long nDeltaY ); + CommandScrollData( tools::Long nDeltaX, tools::Long nDeltaY ); - long GetDeltaX() const { return mnDeltaX; } - long GetDeltaY() const { return mnDeltaY; } + tools::Long GetDeltaX() const { return mnDeltaX; } + tools::Long GetDeltaY() const { return mnDeltaY; } }; class CommandModKeyData diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index 3b734e494404..db285cba9054 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -140,13 +140,13 @@ public: // gets the displayed text virtual OUString GetDisplayText() const override; // returns the bounding box for the character at index nIndex (in control coordinates) - tools::Rectangle GetCharacterBounds( long nIndex ) const; + tools::Rectangle GetCharacterBounds( tools::Long nIndex ) const; // returns the character index for corresponding to rPoint (in control coordinates) // -1 is returned if no character is at that point - long GetIndexForPoint( const Point& rPoint ) const; + tools::Long GetIndexForPoint( const Point& rPoint ) const; // returns the interval [start,end] of line nLine // returns [-1,-1] for an invalid line - Pair GetLineStartEnd( long nLine ) const; + Pair GetLineStartEnd( tools::Long nLine ) const; /** ToRelativeLineIndex changes a layout data index to a count relative to its line. This is equivalent to getting the line start/end pairs with @@ -159,7 +159,7 @@ public: the relative index inside the displayed line or -1 if the absolute index does not match any line */ - long ToRelativeLineIndex( long nIndex ) const; + tools::Long ToRelativeLineIndex( tools::Long nIndex ) const; void SetLoseFocusHdl( const Link<Control&,void>& rLink ) { maLoseFocusHdl = rLink; } diff --git a/include/vcl/cursor.hxx b/include/vcl/cursor.hxx index c8e46da8082c..3937c0e48c4e 100644 --- a/include/vcl/cursor.hxx +++ b/include/vcl/cursor.hxx @@ -83,9 +83,9 @@ public: void SetSize( const Size& rNewSize ); const Size& GetSize() const { return maSize; } - void SetWidth( long nNewWidth ); - long GetWidth() const { return maSize.Width(); } - long GetHeight() const { return maSize.Height(); } + void SetWidth( tools::Long nNewWidth ); + tools::Long GetWidth() const { return maSize.Width(); } + tools::Long GetHeight() const { return maSize.Height(); } void SetOrientation( short nOrientation = 0 ); diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 9f0f7b9cf74f..0dd5988c23e7 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -90,10 +90,10 @@ private: Size maMinOutSize; Size maMaxOutSize; tools::Rectangle maDragArea; - long mnTrackX; - long mnTrackY; - long mnTrackWidth; - long mnTrackHeight; + tools::Long mnTrackX; + tools::Long mnTrackY; + tools::Long mnTrackWidth; + tools::Long mnTrackHeight; sal_Int32 mnDockLeft; sal_Int32 mnDockTop; sal_Int32 mnDockRight; @@ -160,8 +160,8 @@ public: void SetFloatStyle( WinBits nWinStyle ); WinBits GetFloatStyle() const { return mnFloatBits;} - void setPosSizePixel( long nX, long nY, - long nWidth, long nHeight, + void setPosSizePixel( tools::Long nX, tools::Long nY, + tools::Long nWidth, tools::Long nHeight, PosSizeFlags nFlags ); Point GetPosPixel() const; Size GetSizePixel() const; @@ -202,8 +202,8 @@ public: // required because those methods are not virtual in Window (!!!) and must // be available from the toolkit - void SetPosSizePixel( vcl::Window const *pWin, long nX, long nY, - long nWidth, long nHeight, + void SetPosSizePixel( vcl::Window const *pWin, tools::Long nX, tools::Long nY, + tools::Long nWidth, tools::Long nHeight, PosSizeFlags nFlags ); tools::Rectangle GetPosSizePixel( const vcl::Window *pWin ); }; @@ -223,10 +223,10 @@ private: Point maMouseOff; Size maRollUpOutSize; Size maMinOutSize; - long mnTrackX; - long mnTrackY; - long mnTrackWidth; - long mnTrackHeight; + tools::Long mnTrackX; + tools::Long mnTrackY; + tools::Long mnTrackWidth; + tools::Long mnTrackHeight; sal_Int32 mnDockLeft; sal_Int32 mnDockTop; sal_Int32 mnDockRight; @@ -321,8 +321,8 @@ public: void SetFloatStyle( WinBits nWinStyle ); WinBits GetFloatStyle() const; - virtual void setPosSizePixel( long nX, long nY, - long nWidth, long nHeight, + virtual void setPosSizePixel( tools::Long nX, tools::Long nY, + tools::Long nWidth, tools::Long nHeight, PosSizeFlags nFlags = PosSizeFlags::All ) override; using Window::SetPosSizePixel; Point GetPosPixel() const override; diff --git a/include/vcl/embeddedfontshelper.hxx b/include/vcl/embeddedfontshelper.hxx index 19ec9b1e1076..e1f2e5c28ece 100644 --- a/include/vcl/embeddedfontshelper.hxx +++ b/include/vcl/embeddedfontshelper.hxx @@ -14,6 +14,7 @@ #include <rtl/ustring.hxx> #include <tools/fontenum.hxx> +#include <tools/long.hxx> #include <vector> namespace com::sun::star::io { class XInputStream; } @@ -77,7 +78,7 @@ public: @param size size of the font data @param rights type of operation to be allowed for the font */ - static bool sufficientTTFRights( const void* data, long size, FontRights rights ); + static bool sufficientTTFRights( const void* data, tools::Long size, FontRights rights ); /** Removes all temporary fonts in the path used by fileUrlForTemporaryFont(). diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index 4dcce65a73e4..ee52c7c400d9 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -63,9 +63,9 @@ public: void setMaxWidthChars(sal_Int32 nWidth); void setMinWidthChars(sal_Int32 nWidth); - static Size CalcMinimumTextSize(Control const* pControl, long nMaxWidth = 0x7fffffff); - static Size getTextDimensions(Control const *pControl, const OUString &rTxt, long nMaxWidth); - Size CalcMinimumSize(long nMaxWidth = 0x7fffffff) const; + static Size CalcMinimumTextSize(Control const* pControl, tools::Long nMaxWidth = 0x7fffffff); + static Size getTextDimensions(Control const *pControl, const OUString &rTxt, tools::Long nMaxWidth); + Size CalcMinimumSize(tools::Long nMaxWidth = 0x7fffffff) const; virtual Size GetOptimalSize() const override; virtual bool set_property(const OString &rKey, const OUString &rValue) override; void set_mnemonic_widget(vcl::Window *pWindow); diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx index faccd0cff1a5..02f4a6d3f264 100644 --- a/include/vcl/font.hxx +++ b/include/vcl/font.hxx @@ -25,6 +25,7 @@ #include <vcl/dllapi.h> #include <tools/color.hxx> #include <tools/fontenum.hxx> +#include <tools/long.hxx> #include <i18nlangtag/lang.h> #include <vcl/fntstyle.hxx> #include <o3tl/cow_wrapper.hxx> @@ -106,10 +107,10 @@ public: void SetFontSize( const Size& ); const Size& GetFontSize() const; - void SetFontHeight( long nHeight ); - long GetFontHeight() const; - void SetAverageFontWidth( long nWidth ); - long GetAverageFontWidth() const; + void SetFontHeight( tools::Long nHeight ); + tools::Long GetFontHeight() const; + void SetAverageFontWidth( tools::Long nWidth ); + tools::Long GetAverageFontWidth() const; // Prefer LanguageTag over LanguageType void SetLanguageTag( const LanguageTag & ); diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index 3727f6531eff..bb20b618719a 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -111,12 +111,12 @@ public: void Clear(); void Mirror( BmpMirrorFlags nMirrorFlags ); - void Move( long nX, long nY ); + void Move( tools::Long nX, tools::Long nY ); // additional Move method getting specifics how to handle MapMode( MapUnit::MapPixel ) - void Move( long nX, long nY, long nDPIX, long nDPIY ); + void Move( tools::Long nX, tools::Long nY, tools::Long nDPIX, tools::Long nDPIY ); void Scale( double fScaleX, double fScaleY ); void Scale( const Fraction& rScaleX, const Fraction& rScaleY ); - void Rotate( long nAngle10 ); + void Rotate( tools::Long nAngle10 ); void Clip( const tools::Rectangle& ); bool HasTransparentActions() const; diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx index 0a8ddaf0173d..983330a89745 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -158,10 +158,10 @@ public: void StartAnimation( OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSize, - long nExtraData = 0, + tools::Long nExtraData = 0, OutputDevice* pFirstFrameOutDev = nullptr ); void StopAnimation( const OutputDevice* pOutputDevice, - long nExtraData ); + tools::Long nExtraData ); void SetAnimationNotifyHdl( const Link<Animation*,void>& rLink ); Link<Animation*,void> GetAnimationNotifyHdl() const; diff --git a/include/vcl/hatch.hxx b/include/vcl/hatch.hxx index c297e30fd414..92afd57b6126 100644 --- a/include/vcl/hatch.hxx +++ b/include/vcl/hatch.hxx @@ -21,6 +21,7 @@ #define INCLUDED_VCL_HATCH_HXX #include <tools/color.hxx> +#include <tools/long.hxx> #include <vcl/dllapi.h> #include <vcl/vclenum.hxx> @@ -33,7 +34,7 @@ struct ImplHatch { Color maColor; HatchStyle meStyle; - long mnDistance; + tools::Long mnDistance; sal_uInt16 mnAngle; ImplHatch(); @@ -47,7 +48,7 @@ public: Hatch(); Hatch( const Hatch& rHatch ); - Hatch( HatchStyle eStyle, const Color& rHatchColor, long nDistance, sal_uInt16 nAngle10 ); + Hatch( HatchStyle eStyle, const Color& rHatchColor, tools::Long nDistance, sal_uInt16 nAngle10 ); ~Hatch(); Hatch& operator=( const Hatch& rHatch ); @@ -59,8 +60,8 @@ public: void SetColor( const Color& rColor ); const Color& GetColor() const { return mpImplHatch->maColor; } - void SetDistance( long nDistance ); - long GetDistance() const { return mpImplHatch->mnDistance; } + void SetDistance( tools::Long nDistance ); + tools::Long GetDistance() const { return mpImplHatch->mnDistance; } void SetAngle( sal_uInt16 nAngle10 ); sal_uInt16 GetAngle() const { return mpImplHatch->mnAngle; } diff --git a/include/vcl/headbar.hxx b/include/vcl/headbar.hxx index 12d5c59415e6..3a19e9d73365 100644 --- a/include/vcl/headbar.hxx +++ b/include/vcl/headbar.hxx @@ -199,21 +199,21 @@ namespace o3tl #define HEADERBAR_APPEND (sal_uInt16(0xFFFF)) #define HEADERBAR_ITEM_NOTFOUND (sal_uInt16(0xFFFF)) -#define HEADERBAR_FULLSIZE (long(1000000000)) +#define HEADERBAR_FULLSIZE (tools::Long(1000000000)) class VCL_DLLPUBLIC HeaderBar : public vcl::Window { private: std::vector<std::unique_ptr<ImplHeadItem>> mvItemList; - long mnBorderOff1; - long mnBorderOff2; - long mnOffset; - long mnDX; - long mnDY; - long mnDragSize; - long mnStartPos; - long mnDragPos; - long mnMouseOff; + tools::Long mnBorderOff1; + tools::Long mnBorderOff2; + tools::Long mnOffset; + tools::Long mnDX; + tools::Long mnDY; + tools::Long mnDragSize; + tools::Long mnStartPos; + tools::Long mnDragPos; + tools::Long mnMouseOff; sal_uInt16 mnCurItemId; sal_uInt16 mnItemDragPos; bool mbDragable; @@ -233,10 +233,10 @@ private: using Window::ImplInit; VCL_DLLPRIVATE void ImplInit( WinBits nWinStyle ); VCL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); - VCL_DLLPRIVATE long ImplGetItemPos( sal_uInt16 nPos ) const; + VCL_DLLPRIVATE tools::Long ImplGetItemPos( sal_uInt16 nPos ) const; VCL_DLLPRIVATE tools::Rectangle ImplGetItemRect( sal_uInt16 nPos ) const; using Window::ImplHitTest; - VCL_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, long& nMouseOff, sal_uInt16& nPos ) const; + VCL_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, tools::Long& nMouseOff, sal_uInt16& nPos ) const; VCL_DLLPRIVATE void ImplInvertDrag( sal_uInt16 nStartPos, sal_uInt16 nEndPos ); VCL_DLLPRIVATE void ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, bool bHigh, const tools::Rectangle& rItemRect, const tools::Rectangle* pRect); @@ -272,14 +272,14 @@ public: virtual void DoubleClick(); void InsertItem( sal_uInt16 nItemId, const OUString& rText, - long nSize, HeaderBarItemBits nBits = HeaderBarItemBits::STDSTYLE, + tools::Long nSize, HeaderBarItemBits nBits = HeaderBarItemBits::STDSTYLE, sal_uInt16 nPos = HEADERBAR_APPEND ); void RemoveItem( sal_uInt16 nItemId ); void MoveItem( sal_uInt16 nItemId, sal_uInt16 nNewPos ); void Clear(); - void SetOffset( long nNewOffset ); - void SetDragSize( long nNewSize ) { mnDragSize = nNewSize; } + void SetOffset( tools::Long nNewOffset ); + void SetDragSize( tools::Long nNewSize ) { mnDragSize = nNewSize; } sal_uInt16 GetItemCount() const; sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const; @@ -289,8 +289,8 @@ public: sal_uInt16 GetCurItemId() const { return mnCurItemId; } bool IsItemMode() const { return mbItemMode; } - void SetItemSize( sal_uInt16 nItemId, long nNewSize ); - long GetItemSize( sal_uInt16 nItemId ) const; + void SetItemSize( sal_uInt16 nItemId, tools::Long nNewSize ); + tools::Long GetItemSize( sal_uInt16 nItemId ) const; void SetItemBits( sal_uInt16 nItemId, HeaderBarItemBits nNewBits ); HeaderBarItemBits GetItemBits( sal_uInt16 nItemId ) const; diff --git a/include/vcl/i18nhelp.hxx b/include/vcl/i18nhelp.hxx index 306440f61439..5be46d598a7e 100644 --- a/include/vcl/i18nhelp.hxx +++ b/include/vcl/i18nhelp.hxx @@ -24,6 +24,7 @@ #include <i18nlangtag/languagetag.hxx> #include <osl/mutex.hxx> #include <rtl/ustring.hxx> +#include <tools/long.hxx> #include <vcl/dllapi.h> #include <memory> @@ -64,7 +65,7 @@ public: bool MatchString( const OUString& rStr1, const OUString& rStr2 ) const; bool MatchMnemonic( const OUString& rString, sal_Unicode cMnemonicChar ) const; - OUString GetNum( long nNumber, sal_uInt16 nDecimals, bool bUseThousandSep = true, bool bTrailingZeros = true ) const; + OUString GetNum( tools::Long nNumber, sal_uInt16 nDecimals, bool bUseThousandSep = true, bool bTrailingZeros = true ) const; static OUString filterFormattingChars( const OUString& ); }; diff --git a/include/vcl/imap.hxx b/include/vcl/imap.hxx index 02d8f2ddf96b..5a71efdce90e 100644 --- a/include/vcl/imap.hxx +++ b/include/vcl/imap.hxx @@ -51,7 +51,7 @@ private: void ImpReadCERNLine( const OString& rLine ); static Point ImpReadCERNCoords( const char** ppStr ); - static long ImpReadCERNRadius( const char** ppStr ); + static tools::Long ImpReadCERNRadius( const char** ppStr ); static OUString ImpReadCERNURL( const char** ppStr ); void ImpReadNCSALine( const OString& rLine ); diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index e15f49b96d58..60a7f44825e4 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -107,12 +107,12 @@ protected: virtual Size calculateRequisition() const override; virtual void setAllocation(const Size &rAllocation) override; - virtual long getPrimaryDimension(const Size &rSize) const = 0; - virtual void setPrimaryDimension(Size &rSize, long) const = 0; - virtual long getPrimaryCoordinate(const Point &rPos) const = 0; - virtual void setPrimaryCoordinate(Point &rPos, long) const = 0; - virtual long getSecondaryDimension(const Size &rSize) const = 0; - virtual void setSecondaryDimension(Size &rSize, long) const = 0; + virtual tools::Long getPrimaryDimension(const Size &rSize) const = 0; + virtual void setPrimaryDimension(Size &rSize, tools::Long) const = 0; + virtual tools::Long getPrimaryCoordinate(const Point &rPos) const = 0; + virtual void setPrimaryCoordinate(Point &rPos, tools::Long) const = 0; + virtual tools::Long getSecondaryDimension(const Size &rSize) const = 0; + virtual void setSecondaryDimension(Size &rSize, tools::Long) const = 0; virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const = 0; }; @@ -126,27 +126,27 @@ public: m_bVerticalContainer = true; } protected: - virtual long getPrimaryDimension(const Size &rSize) const override + virtual tools::Long getPrimaryDimension(const Size &rSize) const override { return rSize.getHeight(); } - virtual void setPrimaryDimension(Size &rSize, long nHeight) const override + virtual void setPrimaryDimension(Size &rSize, tools::Long nHeight) const override { rSize.setHeight(nHeight); } - virtual long getPrimaryCoordinate(const Point &rPos) const override + virtual tools::Long getPrimaryCoordinate(const Point &rPos) const override { return rPos.getY(); } - virtual void setPrimaryCoordinate(Point &rPos, long nPos) const override + virtual void setPrimaryCoordinate(Point &rPos, tools::Long nPos) const override { rPos.setY(nPos); } - virtual long getSecondaryDimension(const Size &rSize) const override + virtual tools::Long getSecondaryDimension(const Size &rSize) const override { return rSize.getWidth(); } - virtual void setSecondaryDimension(Size &rSize, long nWidth) const override + virtual void setSecondaryDimension(Size &rSize, tools::Long nWidth) const override { rSize.setWidth(nWidth); } @@ -165,27 +165,27 @@ public: m_bVerticalContainer = false; } protected: - virtual long getPrimaryDimension(const Size &rSize) const override + virtual tools::Long getPrimaryDimension(const Size &rSize) const override { return rSize.getWidth(); } - virtual void setPrimaryDimension(Size &rSize, long nWidth) const override + virtual void setPrimaryDimension(Size &rSize, tools::Long nWidth) const override { rSize.setWidth(nWidth); } - virtual long getPrimaryCoordinate(const Point &rPos) const override + virtual tools::Long getPrimaryCoordinate(const Point &rPos) const override { return rPos.getX(); } - virtual void setPrimaryCoordinate(Point &rPos, long nPos) const override + virtual void setPrimaryCoordinate(Point &rPos, tools::Long nPos) const override { rPos.setX(nPos); } - virtual long getSecondaryDimension(const Size &rSize) const override + virtual tools::Long getSecondaryDimension(const Size &rSize) const override { return rSize.getHeight(); } - virtual void setSecondaryDimension(Size &rSize, long nHeight) const override + virtual void setSecondaryDimension(Size &rSize, tools::Long nHeight) const override { rSize.setHeight(nHeight); } @@ -240,27 +240,27 @@ public: m_bVerticalContainer = true; } protected: - virtual long getPrimaryDimension(const Size &rSize) const override + virtual tools::Long getPrimaryDimension(const Size &rSize) const override { return rSize.getHeight(); } - virtual void setPrimaryDimension(Size &rSize, long nHeight) const override + virtual void setPrimaryDimension(Size &rSize, tools::Long nHeight) const override { rSize.setHeight(nHeight); } - virtual long getPrimaryCoordinate(const Point &rPos) const override + virtual tools::Long getPrimaryCoordinate(const Point &rPos) const override { return rPos.getY(); } - virtual void setPrimaryCoordinate(Point &rPos, long nPos) const override + virtual void setPrimaryCoordinate(Point &rPos, tools::Long nPos) const override { rPos.setY(nPos); } - virtual long getSecondaryDimension(const Size &rSize) const override + virtual tools::Long getSecondaryDimension(const Size &rSize) const override { return rSize.getWidth(); } - virtual void setSecondaryDimension(Size &rSize, long nWidth) const override + virtual void setSecondaryDimension(Size &rSize, tools::Long nWidth) const override { rSize.setWidth(nWidth); } @@ -279,27 +279,27 @@ public: m_bVerticalContainer = false; } private: - virtual long getPrimaryDimension(const Size &rSize) const override + virtual tools::Long getPrimaryDimension(const Size &rSize) const override { return rSize.getWidth(); } - virtual void setPrimaryDimension(Size &rSize, long nWidth) const override + virtual void setPrimaryDimension(Size &rSize, tools::Long nWidth) const override { rSize.setWidth(nWidth); } - virtual long getPrimaryCoordinate(const Point &rPos) const override + virtual tools::Long getPrimaryCoordinate(const Point &rPos) const override { return rPos.getX(); } - virtual void setPrimaryCoordinate(Point &rPos, long nPos) const override + virtual void setPrimaryCoordinate(Point &rPos, tools::Long nPos) const override { rPos.setX(nPos); } - virtual long getSecondaryDimension(const Size &rSize) const override + virtual tools::Long getSecondaryDimension(const Size &rSize) const override { return rSize.getHeight(); } - virtual void setSecondaryDimension(Size &rSize, long nHeight) const override + virtual void setSecondaryDimension(Size &rSize, tools::Long nHeight) const override { rSize.setHeight(nHeight); } @@ -320,7 +320,7 @@ private: public: struct Value { - long m_nValue; + tools::Long m_nValue; bool m_bExpand; Value() : m_nValue(0), m_bExpand(false) {} }; @@ -381,42 +381,42 @@ class VclPaned : public VclContainer { protected: VclPtr<Splitter> m_pSplitter; - long m_nPosition; + tools::Long m_nPosition; VclPaned(vcl::Window *pParent, bool bVertical); public: virtual ~VclPaned() override; virtual void dispose() override; - long get_position() const { return m_nPosition; } - virtual void set_position(long nPosition) { m_nPosition = nPosition; } + tools::Long get_position() const { return m_nPosition; } + virtual void set_position(tools::Long nPosition) { m_nPosition = nPosition; } }; class VclVPaned final : public VclPaned { private: DECL_LINK(SplitHdl, Splitter*, void); - void arrange(const Size& rAllocation, long nFirstHeight, long nSecondHeight); + void arrange(const Size& rAllocation, tools::Long nFirstHeight, tools::Long nSecondHeight); public: VclVPaned(vcl::Window *pParent); virtual ~VclVPaned() override; virtual Size calculateRequisition() const override; virtual void setAllocation(const Size &rAllocation) override; - virtual void set_position(long nPosition) override; + virtual void set_position(tools::Long nPosition) override; }; class VclHPaned final : public VclPaned { private: DECL_LINK(SplitHdl, Splitter*, void); - void arrange(const Size& rAllocation, long nFirstHeight, long nSecondHeight); + void arrange(const Size& rAllocation, tools::Long nFirstHeight, tools::Long nSecondHeight); public: VclHPaned(vcl::Window *pParent); virtual ~VclHPaned() override; virtual Size calculateRequisition() const override; virtual void setAllocation(const Size &rAllocation) override; - virtual void set_position(long nPosition) override; + virtual void set_position(tools::Long nPosition) override; }; class VclFrame final : public VclBin diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 9522204de0b6..7613f14f157c 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -23,6 +23,7 @@ #include <memory> #include <vcl/vclenum.hxx> #include <tools/link.hxx> +#include <tools/long.hxx> #include <vcl/dllapi.h> #include <vcl/keycod.hxx> #include <vcl/vclreferencebase.hxx> @@ -170,7 +171,7 @@ protected: SAL_DLLPRIVATE sal_uInt16 ImplGetPrevVisible( sal_uInt16 nPos ) const; SAL_DLLPRIVATE sal_uInt16 ImplGetNextVisible( sal_uInt16 nPos ) const; SAL_DLLPRIVATE void ImplPaint(vcl::RenderContext& rRenderContext, Size const & rSize, - sal_uInt16 nBorder, long nOffY = 0, MenuItemData const * pThisDataOnly = nullptr, + sal_uInt16 nBorder, tools::Long nOffY = 0, MenuItemData const * pThisDataOnly = nullptr, bool bHighlighted = false, bool bLayout = false, bool bRollover = false ) const; SAL_DLLPRIVATE void ImplPaintMenuTitle(vcl::RenderContext&, const tools::Rectangle& rRect) const; SAL_DLLPRIVATE void ImplSelect(); @@ -184,11 +185,11 @@ protected: // returns native check and option menu symbol height in rCheckHeight and rRadioHeight // return value is maximum width and height of checkboxes and radiobuttons - SAL_DLLPRIVATE Size ImplGetNativeCheckAndRadioSize(vcl::RenderContext const & rRenderContext, long& rCheckHeight, long& rRadioHeight) const; + SAL_DLLPRIVATE Size ImplGetNativeCheckAndRadioSize(vcl::RenderContext const & rRenderContext, tools::Long& rCheckHeight, tools::Long& rRadioHeight) const; // returns native submenu arrow size and spacing from right border // return value is whether it's supported natively - SAL_DLLPRIVATE static bool ImplGetNativeSubmenuArrowSize(vcl::RenderContext const & rRenderContext, Size& rArrowSize, long& rArrowSpacing); + SAL_DLLPRIVATE static bool ImplGetNativeSubmenuArrowSize(vcl::RenderContext const & rRenderContext, Size& rArrowSize, tools::Long& rArrowSpacing); SAL_DLLPRIVATE void ImplAddDel( ImplMenuDelData &rDel ); SAL_DLLPRIVATE void ImplRemoveDel( ImplMenuDelData &rDel ); @@ -357,10 +358,10 @@ public: // returns the bounding box for the character at index nIndex // where nIndex is relative to the starting index of the item // with id nItemId (in coordinates of the displaying window) - tools::Rectangle GetCharacterBounds( sal_uInt16 nItemId, long nIndex ) const; + tools::Rectangle GetCharacterBounds( sal_uInt16 nItemId, tools::Long nIndex ) const; // -1 is returned if no character is at that point // if an index is found the corresponding item id is filled in (else 0) - long GetIndexForPoint( const Point& rPoint, sal_uInt16& rItemID ) const; + tools::Long GetIndexForPoint( const Point& rPoint, sal_uInt16& rItemID ) const; // returns the bounding rectangle for an item at pos nItemPos tools::Rectangle GetBoundingRectangle( sal_uInt16 nItemPos ) const; @@ -494,8 +495,8 @@ private: protected: SAL_DLLPRIVATE sal_uInt16 ImplExecute( const VclPtr<vcl::Window>& pW, const tools::Rectangle& rRect, FloatWinPopupFlags nPopupModeFlags, Menu* pSFrom, bool bPreSelectFirst ); SAL_DLLPRIVATE void ImplFlushPendingSelect(); - SAL_DLLPRIVATE long ImplCalcHeight( sal_uInt16 nEntries ) const; - SAL_DLLPRIVATE sal_uInt16 ImplCalcVisEntries( long nMaxHeight, sal_uInt16 nStartEntry, sal_uInt16* pLastVisible = nullptr ) const; + SAL_DLLPRIVATE tools::Long ImplCalcHeight( sal_uInt16 nEntries ) const; + SAL_DLLPRIVATE sal_uInt16 ImplCalcVisEntries( tools::Long nMaxHeight, sal_uInt16 nStartEntry, sal_uInt16* pLastVisible = nullptr ) const; public: PopupMenu(); diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index fad89ec4b838..52c1bf7d935d 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -81,7 +81,7 @@ public: virtual rtl::Reference<MetaAction> Clone(); - virtual void Move( long nHorzMove, long nVertMove ); + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ); virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ); @@ -119,7 +119,7 @@ public: MetaPixelAction( const Point& rPt, const Color& rColor ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const Point& GetPoint() const { return maPt; } @@ -147,7 +147,7 @@ public: explicit MetaPointAction( const Point& ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const Point& GetPoint() const { return maPt; } @@ -179,7 +179,7 @@ public: MetaLineAction( const Point& rStart, const Point& rEnd, const LineInfo& rLineInfo ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const Point& GetStartPoint() const { return maStartPt; } @@ -209,7 +209,7 @@ public: explicit MetaRectAction( const tools::Rectangle& ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const tools::Rectangle& GetRect() const { return maRect; } @@ -240,7 +240,7 @@ public: MetaRoundRectAction( const tools::Rectangle& rRect, sal_uInt32 nHorzRound, sal_uInt32 nVertRound ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const tools::Rectangle& GetRect() const { return maRect; } @@ -270,7 +270,7 @@ public: explicit MetaEllipseAction( const tools::Rectangle& ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const tools::Rectangle& GetRect() const { return maRect; } @@ -301,7 +301,7 @@ public: MetaArcAction( const tools::Rectangle& rRect, const Point& rStart, const Point& rEnd ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const tools::Rectangle& GetRect() const { return maRect; } @@ -334,7 +334,7 @@ public: MetaPieAction( const tools::Rectangle& rRect, const Point& rStart, const Point& rEnd ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const tools::Rectangle& GetRect() const { return maRect; } @@ -367,7 +367,7 @@ public: MetaChordAction( const tools::Rectangle& rRect, const Point& rStart, const Point& rEnd ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const tools::Rectangle& GetRect() const { return maRect; } @@ -399,7 +399,7 @@ public: explicit MetaPolyLineAction( const tools::Polygon& ); explicit MetaPolyLineAction( const tools::Polygon&, const LineInfo& ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const tools::Polygon& GetPolygon() const { return maPoly; } @@ -428,7 +428,7 @@ public: explicit MetaPolygonAction( const tools::Polygon& ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const tools::Polygon& GetPolygon() const { return maPoly; } @@ -456,7 +456,7 @@ public: explicit MetaPolyPolygonAction( const tools::PolyPolygon& ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const tools::PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } @@ -488,7 +488,7 @@ public: MetaTextAction( const Point& rPt, const OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const Point& GetPoint() const { return maPt; } @@ -514,14 +514,14 @@ public: MetaTextArrayAction(); MetaTextArrayAction( const MetaTextArrayAction& rAction ); MetaTextArrayAction( const Point& rStartPt, const OUString& rStr, - const long* pDXAry, sal_Int32 nIndex, + const tools::Long* pDXAry, sal_Int32 nIndex, sal_Int32 nLen ); virtual void Execute( OutputDevice* pOut ) override; virtual rtl::Reference<MetaAction> Clone() override; - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; @@ -531,7 +531,7 @@ public: const OUString& GetText() const { return maStr; } sal_Int32 GetIndex() const { return mnIndex; } sal_Int32 GetLen() const { return mnLen; } - long* GetDXArray() const { return mpDXAry.get(); } + tools::Long* GetDXArray() const { return mpDXAry.get(); } }; class SAL_DLLPUBLIC_RTTI MetaStretchTextAction final : public MetaAction @@ -562,7 +562,7 @@ public: const OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const Point& GetPoint() const { return maPt; } @@ -597,7 +597,7 @@ public: MetaTextRectAction( const tools::Rectangle& rRect, const OUString& rStr, DrawTextFlags nStyle ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const tools::Rectangle& GetRect() const { return maRect; } @@ -610,7 +610,7 @@ class SAL_DLLPUBLIC_RTTI MetaTextLineAction final : public MetaAction private: Point maPos; - long mnWidth; + tools::Long mnWidth; FontStrikeout meStrikeout; FontLineStyle meUnderline; FontLineStyle meOverline; @@ -629,15 +629,15 @@ public: virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; - MetaTextLineAction( const Point& rPos, long nWidth, + MetaTextLineAction( const Point& rPos, tools::Long nWidth, FontStrikeout eStrikeout, FontLineStyle eUnderline, FontLineStyle eOverline ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const Point& GetStartPoint() const { return maPos; } - long GetWidth() const { return mnWidth; } + tools::Long GetWidth() const { return mnWidth; } FontStrikeout GetStrikeout() const { return meStrikeout; } FontLineStyle GetUnderline() const { return meUnderline; } FontLineStyle GetOverline() const { return meOverline; } @@ -666,7 +666,7 @@ public: MetaBmpAction( const Point& rPt, const Bitmap& rBmp ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const Bitmap& GetBitmap() const { return maBmp; } @@ -698,7 +698,7 @@ public: MetaBmpScaleAction( const Point& rPt, const Size& rSz, const Bitmap& rBmp ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const Bitmap& GetBitmap() const { return maBmp; } @@ -734,7 +734,7 @@ public: const Point& rSrcPt, const Size& rSrcSz, const Bitmap& rBmp ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const Bitmap& GetBitmap() const { return maBmp; } @@ -767,7 +767,7 @@ public: MetaBmpExAction( const Point& rPt, const BitmapEx& rBmpEx ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const BitmapEx& GetBitmapEx() const { return maBmpEx; } @@ -800,7 +800,7 @@ public: MetaBmpExScaleAction( const Point& rPt, const Size& rSz, const BitmapEx& rBmpEx ) ; - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const BitmapEx& GetBitmapEx() const { return maBmpEx; } @@ -837,7 +837,7 @@ public: const Point& rSrcPt, const Size& rSrcSz, const BitmapEx& rBmpEx ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const BitmapEx& GetBitmapEx() const { return maBmpEx; } @@ -874,7 +874,7 @@ public: const Bitmap& rBmp, const Color& rColor ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const Bitmap& GetBitmap() const { return maBmp; } @@ -909,7 +909,7 @@ public: const Bitmap& rBmp, const Color& rColor ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const Bitmap& GetBitmap() const { return maBmp; } @@ -948,7 +948,7 @@ public: const Bitmap& rBmp, const Color& rColor ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const Bitmap& GetBitmap() const { return maBmp; } @@ -982,7 +982,7 @@ public: MetaGradientAction( const tools::Rectangle& rRect, const Gradient& rGradient ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const tools::Rectangle& GetRect() const { return maRect; } @@ -1012,7 +1012,7 @@ public: MetaGradientExAction( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const tools::PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } @@ -1042,7 +1042,7 @@ public: MetaHatchAction( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const tools::PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } @@ -1073,7 +1073,7 @@ public: MetaWallpaperAction( const tools::Rectangle& rRect, const Wallpaper& rPaper ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const tools::Rectangle& GetRect() const { return maRect; } @@ -1103,7 +1103,7 @@ public: MetaClipRegionAction( const vcl::Region& rRegion, bool bClip ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const vcl::Region& GetRegion() const { return maRegion; } @@ -1132,7 +1132,7 @@ public: explicit MetaISectRectClipRegionAction( const tools::Rectangle& ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const tools::Rectangle& GetRect() const { return maRect; } @@ -1160,7 +1160,7 @@ public: explicit MetaISectRegionClipRegionAction( const vcl::Region& ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const vcl::Region& GetRegion() const { return maRegion; } @@ -1170,8 +1170,8 @@ class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaMoveClipRegionAction final : public Me { private: - long mnHorzMove; - long mnVertMove; + tools::Long mnHorzMove; + tools::Long mnVertMove; public: MetaMoveClipRegionAction(); @@ -1187,12 +1187,12 @@ public: virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; - MetaMoveClipRegionAction( long nHorzMove, long nVertMove ); + MetaMoveClipRegionAction( tools::Long nHorzMove, tools::Long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ) override; - long GetHorzMove() const { return mnHorzMove; } - long GetVertMove() const { return mnVertMove; } + tools::Long GetHorzMove() const { return mnHorzMove; } + tools::Long GetVertMove() const { return mnVertMove; } }; class VCL_DLLPUBLIC MetaLineColorAction final : public MetaAction @@ -1525,7 +1525,7 @@ public: MetaTransparentAction( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransPercent ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const tools::PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } @@ -1560,7 +1560,7 @@ public: MetaFloatTransparentAction( const GDIMetaFile& rMtf, const Point& rPos, const Size& rSize, const Gradient& rGradient ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const GDIMetaFile& GetGDIMetaFile() const { return maMtf; } @@ -1596,7 +1596,7 @@ public: MetaEPSAction( const Point& rPoint, const Size& rSize, const GfxLink& rGfxLink, const GDIMetaFile& rSubst ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; const GfxLink& GetLink() const { return maGfxLink; } @@ -1652,7 +1652,7 @@ public: explicit MetaCommentAction( const MetaCommentAction& rAct ); explicit MetaCommentAction( const OString& rComment, sal_Int32 nValue = 0, const sal_uInt8* pData = nullptr, sal_uInt32 nDataSize = 0 ); - virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Move( tools::Long nHorzMove, tools::Long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; virtual void Execute( OutputDevice* pOut ) override; diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx index aa1e6943a10a..9de279fd222d 100644 --- a/include/vcl/metric.hxx +++ b/include/vcl/metric.hxx @@ -36,21 +36,21 @@ public: FontMetric( const FontMetric& ); // TODO make this explicit ~FontMetric() override; - long GetAscent() const { return mnAscent; } - long GetDescent() const { return mnDescent; } - long GetInternalLeading() const { return mnIntLeading; } - long GetExternalLeading() const { return mnExtLeading; } - long GetLineHeight() const { return mnLineHeight; } // TODO this is ascent + descnt - long GetSlant() const { return mnSlant; } - long GetBulletOffset() const { return mnBulletOffset; } + tools::Long GetAscent() const { return mnAscent; } + tools::Long GetDescent() const { return mnDescent; } + tools::Long GetInternalLeading() const { return mnIntLeading; } + tools::Long GetExternalLeading() const { return mnExtLeading; } + tools::Long GetLineHeight() const { return mnLineHeight; } // TODO this is ascent + descnt + tools::Long GetSlant() const { return mnSlant; } + tools::Long GetBulletOffset() const { return mnBulletOffset; } - void SetAscent( long nAscent ) { mnAscent = nAscent; } - void SetDescent( long nDescent ) { mnDescent = nDescent; } - void SetExternalLeading( long nExtLeading ) { mnExtLeading = nExtLeading; } - void SetInternalLeading( long nIntLeading ) { mnIntLeading = nIntLeading; } - void SetLineHeight( long nHeight ) { mnLineHeight = nHeight; } // TODO this is ascent + descent - void SetSlant( long nSlant ) { mnSlant = nSlant; } - void SetBulletOffset( long nOffset ) { mnBulletOffset = nOffset; } + void SetAscent( tools::Long nAscent ) { mnAscent = nAscent; } + void SetDescent( tools::Long nDescent ) { mnDescent = nDescent; } + void SetExternalLeading( tools::Long nExtLeading ) { mnExtLeading = nExtLeading; } + void SetInternalLeading( tools::Long nIntLeading ) { mnIntLeading = nIntLeading; } + void SetLineHeight( tools::Long nHeight ) { mnLineHeight = nHeight; } // TODO this is ascent + descent + void SetSlant( tools::Long nSlant ) { mnSlant = nSlant; } + void SetBulletOffset( tools::Long nOffset ) { mnBulletOffset = nOffset; } bool IsFullstopCentered() const { return mbFullstopCentered; } @@ -63,13 +63,13 @@ public: bool operator!=( const FontMetric& rMetric ) const { return !operator==( rMetric ); } private: - long mnAscent; // Ascent - long mnDescent; // Descent - long mnIntLeading; // Internal Leading - long mnExtLeading; // External Leading - long mnLineHeight; // Ascent+Descent+EmphasisMark - long mnSlant; // Slant - long mnBulletOffset; // Offset for non-printing character + tools::Long mnAscent; // Ascent + tools::Long mnDescent; // Descent + tools::Long mnIntLeading; // Internal Leading + tools::Long mnExtLeading; // External Leading + tools::Long mnLineHeight; // Ascent+Descent+EmphasisMark + tools::Long mnSlant; // Slant + tools::Long mnBulletOffset; // Offset for non-printing character bool mbFullstopCentered; }; diff --git a/include/vcl/notebookbar.hxx b/include/vcl/notebookbar.hxx index fa58dda4bbbf..759e0a143a09 100644 --- a/include/vcl/notebookbar.hxx +++ b/include/vcl/notebookbar.hxx @@ -36,7 +36,7 @@ public: virtual bool PreNotify( NotifyEvent& rNEvt ) override; virtual Size GetOptimalSize() const override; - virtual void setPosSizePixel(long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All) override; + virtual void setPosSizePixel(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, PosSizeFlags nFlags = PosSizeFlags::All) override; virtual void Resize() override; void SetSystemWindow(SystemWindow* pSystemWindow); diff --git a/include/vcl/opengl/OpenGLHelper.hxx b/include/vcl/opengl/OpenGLHelper.hxx index 493fd5d2e014..f4742d268b49 100644 --- a/include/vcl/opengl/OpenGLHelper.hxx +++ b/include/vcl/opengl/OpenGLHelper.hxx @@ -59,12 +59,12 @@ public: * this method. The buffer size is assumed to be 4*width*height and the format * to be OptimalBufferFormat(). **/ - static BitmapEx ConvertBufferToBitmapEx(const sal_uInt8* const pBuffer, long nWidth, long nHeight); + static BitmapEx ConvertBufferToBitmapEx(const sal_uInt8* const pBuffer, tools::Long nWidth, tools::Long nHeight); /** * Returns the optimal buffer format for OpenGL (GL_BGRA or GL_RGBA). **/ static GLenum OptimalBufferFormat(); - static void renderToFile(long nWidth, long nHeight, const OUString& rFileName); + static void renderToFile(tools::Long nWidth, tools::Long nHeight, const OUString& rFileName); static const char* GLErrorString(GLenum errorCode); @@ -80,7 +80,7 @@ public: * @param nRenderbufferDepthId RenderBuffer's depth ID * @param nRenderbufferColorId RenderBuffer's color ID */ - static void createFramebuffer(long nWidth, long nHeight, GLuint& nFramebufferId, + static void createFramebuffer(tools::Long nWidth, tools::Long nHeight, GLuint& nFramebufferId, GLuint& nRenderbufferDepthId, GLuint& nRenderbufferColorId); /// Get OpenGL version (needs a context) diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 18f91b205faf..e1f6b17c47a0 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -305,7 +305,7 @@ class SAL_WARN_UNUSED VCL_DLLPUBLIC OutputDevice : public virtual VclReferenceBa friend class VirtualDevice; friend class vcl::Window; friend class WorkWindow; - friend void ImplHandleResize( vcl::Window* pWindow, long nNewWidth, long nNewHeight ); + friend void ImplHandleResize( vcl::Window* pWindow, tools::Long nNewWidth, tools::Long nNewHeight ); private: OutputDevice(const OutputDevice&) = delete; @@ -329,27 +329,27 @@ private: VclPtr<VirtualDevice> mpAlphaVDev; /// Additional output pixel offset, applied in LogicToPixel (used by SetPixelOffset/GetPixelOffset) - long mnOutOffOrigX; + tools::Long mnOutOffOrigX; /// Additional output offset in _logical_ coordinates, applied in PixelToLogic (used by SetPixelOffset/GetPixelOffset) - long mnOutOffLogicX; + tools::Long mnOutOffLogicX; /// Additional output pixel offset, applied in LogicToPixel (used by SetPixelOffset/GetPixelOffset) - long mnOutOffOrigY; + tools::Long mnOutOffOrigY; /// Additional output offset in _logical_ coordinates, applied in PixelToLogic (used by SetPixelOffset/GetPixelOffset) - long mnOutOffLogicY; + tools::Long mnOutOffLogicY; /// Output offset for device output in pixel (pseudo window offset within window system's frames) - long mnOutOffX; + tools::Long mnOutOffX; /// Output offset for device output in pixel (pseudo window offset within window system's frames) - long mnOutOffY; - long mnOutWidth; - long mnOutHeight; + tools::Long mnOutOffY; + tools::Long mnOutWidth; + tools::Long mnOutHeight; sal_Int32 mnDPIX; sal_Int32 mnDPIY; sal_Int32 mnDPIScalePercentage; ///< For HiDPI displays, we want to draw elements for a percentage larger /// font specific text alignment offsets in pixel units - mutable long mnTextOffX; - mutable long mnTextOffY; - mutable long mnEmphasisAscent; - mutable long mnEmphasisDescent; + mutable tools::Long mnTextOffX; + mutable tools::Long mnTextOffY; + mutable tools::Long mnEmphasisAscent; + mutable tools::Long mnEmphasisDescent; DrawModeFlags mnDrawMode; ComplexTextLayoutFlags mnTextLayoutMode; ImplMapRes maMapRes; @@ -440,12 +440,12 @@ public: Size GetOutputSizePixel() const { return Size( mnOutWidth, mnOutHeight ); } - long GetOutputWidthPixel() const { return mnOutWidth; } - long GetOutputHeightPixel() const { return mnOutHeight; } - long GetOutOffXPixel() const { return mnOutOffX; } - long GetOutOffYPixel() const { return mnOutOffY; } - void SetOutOffXPixel(long nOutOffX); - void SetOutOffYPixel(long nOutOffY); + tools::Long GetOutputWidthPixel() const { return mnOutWidth; } + tools::Long GetOutputHeightPixel() const { return mnOutHeight; } + tools::Long GetOutOffXPixel() const { return mnOutOffX; } + tools::Long GetOutOffYPixel() const { return mnOutOffY; } + void SetOutOffXPixel(tools::Long nOutOffX); + void SetOutOffYPixel(tools::Long nOutOffY); Size GetOutputSize() const { return PixelToLogic( GetOutputSizePixel() ); } @@ -674,7 +674,7 @@ public: bool IsClipRegion() const { return mbClipRegion; } - void MoveClipRegion( long nHorzMove, long nVertMove ); + void MoveClipRegion( tools::Long nHorzMove, tools::Long nVertMove ); void IntersectClipRegion( const tools::Rectangle& rRect ); void IntersectClipRegion( const vcl::Region& rRegion ); @@ -919,7 +919,7 @@ protected: virtual bool UsePolyPolygonForComplexGradient() = 0; - virtual long GetGradientStepCount( long nMinRect ); + virtual tools::Long GetGradientStepCount( tools::Long nMinRect ); private: @@ -930,7 +930,7 @@ private: SAL_DLLPRIVATE void DrawLinearGradientToMetafile( const tools::Rectangle& rRect, const Gradient& rGradient ); SAL_DLLPRIVATE void DrawComplexGradientToMetafile( const tools::Rectangle& rRect, const Gradient& rGradient ); - SAL_DLLPRIVATE long GetGradientSteps( const Gradient& rGradient, const tools::Rectangle& rRect, bool bMtf, bool bComplex=false ); + SAL_DLLPRIVATE tools::Long GetGradientSteps( const Gradient& rGradient, const tools::Rectangle& rRect, bool bMtf, bool bComplex=false ); SAL_DLLPRIVATE Color GetSingleColorGradientFill(); SAL_DLLPRIVATE void SetGrayscaleColors( Gradient &rGradient ); @@ -959,7 +959,7 @@ public: private: - SAL_DLLPRIVATE void CalcHatchValues( const tools::Rectangle& rRect, long nDist, sal_uInt16 nAngle10, Point& rPt1, Point& rPt2, Size& rInc, Point& rEndPt1 ); + SAL_DLLPRIVATE void CalcHatchValues( const tools::Rectangle& rRect, tools::Long nDist, sal_uInt16 nAngle10, Point& rPt1, Point& rPt2, Size& rInc, Point& rEndPt1 ); SAL_DLLPRIVATE void DrawHatchLine( const tools::Line& rLine, const tools::PolyPolygon& rPolyPoly, Point* pPtBuffer, bool bMtf ); ///@} @@ -975,12 +975,12 @@ public: void Erase(const tools::Rectangle& rRect); protected: - void DrawGradientWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper ); + void DrawGradientWallpaper( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, const Wallpaper& rWallpaper ); private: - SAL_DLLPRIVATE void DrawWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper ); - SAL_DLLPRIVATE void DrawColorWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper ); - SAL_DLLPRIVATE void DrawBitmapWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper ); + SAL_DLLPRIVATE void DrawWallpaper( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, const Wallpaper& rWallpaper ); + SAL_DLLPRIVATE void DrawColorWallpaper( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, const Wallpaper& rWallpaper ); + SAL_DLLPRIVATE void DrawBitmapWallpaper( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, const Wallpaper& rWallpaper ); ///@} @@ -1013,20 +1013,20 @@ public: DrawTextFlags nStyle = DrawTextFlags::Mnemonic, MetricVector* pVector = nullptr, OUString* pDisplayText = nullptr, const SalLayoutGlyphs* pGlyphs = nullptr); - void DrawTextLine( const Point& rPos, long nWidth, + void DrawTextLine( const Point& rPos, tools::Long nWidth, FontStrikeout eStrikeout, FontLineStyle eUnderline, FontLineStyle eOverline, bool bUnderlineAbove = false ); - void ImplDrawTextLine( long nBaseX, long nX, long nY, DeviceCoordinate nWidth, + void ImplDrawTextLine( tools::Long nBaseX, tools::Long nX, tools::Long nY, DeviceCoordinate nWidth, FontStrikeout eStrikeout, FontLineStyle eUnderline, FontLineStyle eOverline, bool bUnderlineAbove ); void ImplDrawTextLines( SalLayout&, FontStrikeout eStrikeout, FontLineStyle eUnderline, FontLineStyle eOverline, bool bWordLine, bool bUnderlineAbove ); - void DrawWaveLine( const Point& rStartPos, const Point& rEndPos, long nLineWidth = 1 ); + void DrawWaveLine( const Point& rStartPos, const Point& rEndPos, tools::Long nLineWidth = 1 ); bool ImplDrawRotateText( SalLayout& ); @@ -1086,7 +1086,7 @@ public: */ bool GetTextBoundRect( tools::Rectangle& rRect, const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, - sal_uLong nLayoutWidth = 0, const long* pDXArray = nullptr, + sal_uLong nLayoutWidth = 0, const tools::Long* pDXArray = nullptr, const SalLayoutGlyphs* pGlyphs = nullptr ) const; tools::Rectangle ImplGetTextBoundRect( const SalLayout& ); @@ -1097,18 +1097,18 @@ public: bool GetTextOutlines( PolyPolyVector&, const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, - sal_uLong nLayoutWidth = 0, const long* pDXArray = nullptr ) const; + sal_uLong nLayoutWidth = 0, const tools::Long* pDXArray = nullptr ) const; bool GetTextOutlines( basegfx::B2DPolyPolygonVector &rVector, const OUString& rStr, sal_Int32 nBase, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, - sal_uLong nLayoutWidth = 0, const long* pDXArray = nullptr ) const; + sal_uLong nLayoutWidth = 0, const tools::Long* pDXArray = nullptr ) const; - OUString GetEllipsisString( const OUString& rStr, long nMaxWidth, + OUString GetEllipsisString( const OUString& rStr, tools::Long nMaxWidth, DrawTextFlags nStyle = DrawTextFlags::EndEllipsis ) const; - long GetCtrlTextWidth( const OUString& rStr, + tools::Long GetCtrlTextWidth( const OUString& rStr, const SalLayoutGlyphs* pLayoutCache = nullptr ) const; static OUString GetNonMnemonicString( const OUString& rStr, sal_Int32& rMnemonicPos ); @@ -1154,7 +1154,7 @@ public: See also GetTextBoundRect() for more explanation + code examples. */ - long GetTextWidth( const OUString& rStr, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, + tools::Long GetTextWidth( const OUString& rStr, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, vcl::TextLayoutCache const* = nullptr, SalLayoutGlyphs const*const pLayoutCache = nullptr) const; @@ -1162,35 +1162,35 @@ public: See also GetTextBoundRect() for more explanation + code examples. */ - long GetTextHeight() const; + tools::Long GetTextHeight() const; float approximate_digit_width() const; void DrawTextArray( const Point& rStartPt, const OUString& rStr, - const long* pDXAry, + const tools::Long* pDXAry, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, SalLayoutFlags flags = SalLayoutFlags::NONE, const SalLayoutGlyphs* pLayoutCache = nullptr); - long GetTextArray( const OUString& rStr, long* pDXAry, + tools::Long GetTextArray( const OUString& rStr, tools::Long* pDXAry, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, vcl::TextLayoutCache const* = nullptr, SalLayoutGlyphs const*const pLayoutCache = nullptr) const; - void GetCaretPositions( const OUString&, long* pCaretXArray, + void GetCaretPositions( const OUString&, tools::Long* pCaretXArray, sal_Int32 nIndex, sal_Int32 nLen, const SalLayoutGlyphs* pGlyphs = nullptr ) const; void DrawStretchText( const Point& rStartPt, sal_uLong nWidth, const OUString& rStr, sal_Int32 nIndex = 0, sal_Int32 nLen = -1); - sal_Int32 GetTextBreak( const OUString& rStr, long nTextWidth, + sal_Int32 GetTextBreak( const OUString& rStr, tools::Long nTextWidth, sal_Int32 nIndex, sal_Int32 nLen = -1, - long nCharExtra = 0, + tools::Long nCharExtra = 0, vcl::TextLayoutCache const* = nullptr, const SalLayoutGlyphs* pGlyphs = nullptr) const; - sal_Int32 GetTextBreak( const OUString& rStr, long nTextWidth, + sal_Int32 GetTextBreak( const OUString& rStr, tools::Long nTextWidth, sal_Unicode nExtraChar, sal_Int32& rExtraCharPos, sal_Int32 nIndex, sal_Int32 nLen, - long nCharExtra, + tools::Long nCharExtra, vcl::TextLayoutCache const* = nullptr) const; static std::shared_ptr<vcl::TextLayoutCache> CreateTextLayoutCache(OUString const&); @@ -1198,23 +1198,23 @@ protected: SAL_DLLPRIVATE void ImplInitTextLineSize(); SAL_DLLPRIVATE void ImplInitAboveTextLineSize(); static - SAL_DLLPRIVATE long ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, long nWidth, const OUString& rStr, DrawTextFlags nStyle, const vcl::ITextLayout& _rLayout ); + SAL_DLLPRIVATE tools::Long ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, tools::Long nWidth, const OUString& rStr, DrawTextFlags nStyle, const vcl::ITextLayout& _rLayout ); SAL_DLLPRIVATE float approximate_char_width() const; private: SAL_DLLPRIVATE void ImplInitTextColor(); SAL_DLLPRIVATE void ImplDrawTextDirect( SalLayout&, bool bTextLines); SAL_DLLPRIVATE void ImplDrawSpecialText( SalLayout& ); - SAL_DLLPRIVATE void ImplDrawTextRect( long nBaseX, long nBaseY, long nX, long nY, long nWidth, long nHeight ); + SAL_DLLPRIVATE void ImplDrawTextRect( tools::Long nBaseX, tools::Long nBaseY, tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ); - SAL_DLLPRIVATE static void ImplDrawWavePixel( long nOriginX, long nOriginY, long nCurX, long nCurY, short nOrientation, SalGraphics* pGraphics, OutputDevice const * pOutDev, - bool bDrawPixAsRect, long nPixWidth, long nPixHeight ); - SAL_DLLPRIVATE void ImplDrawWaveLine( long nBaseX, long nBaseY, long nStartX, long nStartY, long nWidth, long nHeight, long nLineWidth, short nOrientation, const Color& rColor ); - SAL_DLLPRIVATE void ImplDrawWaveTextLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontLineStyle eTextLine, Color aColor, bool bIsAbove ); - SAL_DLLPRIVATE void ImplDrawStraightTextLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontLineStyle eTextLine, Color aColor, bool bIsAbove ); - SAL_DLLPRIVATE void ImplDrawStrikeoutLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontStrikeout eStrikeout, Color aColor ); - SAL_DLLPRIVATE void ImplDrawStrikeoutChar( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontStrikeout eStrikeout, Color aColor ); - SAL_DLLPRIVATE void ImplDrawMnemonicLine( long nX, long nY, long nWidth ); + SAL_DLLPRIVATE static void ImplDrawWavePixel( tools::Long nOriginX, tools::Long nOriginY, tools::Long nCurX, tools::Long nCurY, short nOrientation, SalGraphics* pGraphics, OutputDevice const * pOutDev, + bool bDrawPixAsRect, tools::Long nPixWidth, tools::Long nPixHeight ); + SAL_DLLPRIVATE void ImplDrawWaveLine( tools::Long nBaseX, tools::Long nBaseY, tools::Long nStartX, tools::Long nStartY, tools::Long nWidth, tools::Long nHeight, tools::Long nLineWidth, short nOrientation, const Color& rColor ); + SAL_DLLPRIVATE void ImplDrawWaveTextLine( tools::Long nBaseX, tools::Long nBaseY, tools::Long nX, tools::Long nY, tools::Long nWidth, FontLineStyle eTextLine, Color aColor, bool bIsAbove ); + SAL_DLLPRIVATE void ImplDrawStraightTextLine( tools::Long nBaseX, tools::Long nBaseY, tools::Long nX, tools::Long nY, tools::Long nWidth, FontLineStyle eTextLine, Color aColor, bool bIsAbove ); + SAL_DLLPRIVATE void ImplDrawStrikeoutLine( tools::Long nBaseX, tools::Long nBaseY, tools::Long nX, tools::Long nY, tools::Long nWidth, FontStrikeout eStrikeout, Color aColor ); + SAL_DLLPRIVATE void ImplDrawStrikeoutChar( tools::Long nBaseX, tools::Long nBaseY, tools::Long nX, tools::Long nY, tools::Long nWidth, FontStrikeout eStrikeout, Color aColor ); + SAL_DLLPRIVATE void ImplDrawMnemonicLine( tools::Long nX, tools::Long nY, tools::Long nWidth ); ///@} @@ -1246,7 +1246,7 @@ public: bool GetFontFeatures(std::vector<vcl::font::Feature>& rFontFeatures) const; SAL_DLLPRIVATE void ImplGetEmphasisMark( tools::PolyPolygon& rPolyPoly, bool& rPolyLine, tools::Rectangle& rRect1, tools::Rectangle& rRect2, - long& rYOff, long& rWidth, FontEmphasisMark eEmphasis, long nHeight ); + tools::Long& rYOff, tools::Long& rWidth, FontEmphasisMark eEmphasis, tools::Long nHeight ); SAL_DLLPRIVATE static FontEmphasisMark ImplGetEmphasisMarkStyle( const vcl::Font& rFont ); @@ -1256,7 +1256,7 @@ public: sal_Int32 HasGlyphs( const vcl::Font& rFont, const OUString& rStr, sal_Int32 nIndex = 0, sal_Int32 nLen = -1 ) const; - long GetMinKashida() const; + tools::Long GetMinKashida() const; // i60594 // validate kashida positions against the current font @@ -1297,12 +1297,12 @@ public: protected: SAL_DLLPRIVATE const LogicalFontInstance* GetFontInstance() const; - SAL_DLLPRIVATE long GetEmphasisAscent() const { return mnEmphasisAscent; } - SAL_DLLPRIVATE long GetEmphasisDescent() const { return mnEmphasisDescent; } + SAL_DLLPRIVATE tools::Long GetEmphasisAscent() const { return mnEmphasisAscent; } + SAL_DLLPRIVATE tools::Long GetEmphasisDescent() const { return mnEmphasisDescent; } SAL_DLLPRIVATE bool InitFont() const; virtual void SetFontOrientation( LogicalFontInstance* const pFontInstance ) const; - virtual long GetFontExtLeading() const; + virtual tools::Long GetFontExtLeading() const; virtual void ImplClearFontData(bool bNewFontLists); virtual void ImplRefreshFontData(bool bNewFontLists); @@ -1321,9 +1321,9 @@ private: static SAL_DLLPRIVATE OUString ImplGetEllipsisString( const OutputDevice& rTargetDevice, const OUString& rStr, - long nMaxWidth, DrawTextFlags nStyle, const vcl::ITextLayout& _rLayout ); + tools::Long nMaxWidth, DrawTextFlags nStyle, const vcl::ITextLayout& _rLayout ); - SAL_DLLPRIVATE void ImplDrawEmphasisMark( long nBaseX, long nX, long nY, const tools::PolyPolygon& rPolyPoly, bool bPolyLine, const tools::Rectangle& rRect1, const tools::Rectangle& rRect2 ); + SAL_DLLPRIVATE void ImplDrawEmphasisMark( tools::Long nBaseX, tools::Long nX, tools::Long nY, const tools::PolyPolygon& rPolyPoly, bool bPolyLine, const tools::Rectangle& rRect1, const tools::Rectangle& rRect2 ); SAL_DLLPRIVATE void ImplDrawEmphasisMarks( SalLayout& ); ///@} @@ -1343,8 +1343,8 @@ public: virtual bool HasMirroredGraphics() const; std::unique_ptr<SalLayout> ImplLayout( const OUString&, sal_Int32 nIndex, sal_Int32 nLen, - const Point& rLogicPos = Point(0,0), long nLogicWidth=0, - const long* pLogicDXArray=nullptr, SalLayoutFlags flags = SalLayoutFlags::NONE, + const Point& rLogicPos = Point(0,0), tools::Long nLogicWidth=0, + const tools::Long* pLogicDXArray=nullptr, SalLayoutFlags flags = SalLayoutFlags::NONE, vcl::TextLayoutCache const* = nullptr, const SalLayoutGlyphs* pGlyphs = nullptr) const; SAL_DLLPRIVATE ImplLayoutArgs ImplPrepareLayoutArgs( OUString&, const sal_Int32 nIndex, const sal_Int32 nLen, @@ -1556,8 +1556,8 @@ private: const Size& aOutSz, const bool bHMirr, const bool bVMirr, - const long* pMapX, - const long* pMapY ); + const tools::Long* pMapX, + const tools::Long* pMapY ); SAL_DLLPRIVATE Bitmap BlendBitmapWithAlpha( Bitmap& aBmp, @@ -1568,8 +1568,8 @@ private: const sal_Int32 nDstHeight, const sal_Int32 nOffX, const sal_Int32 nDstWidth, - const long* pMapX, - const long* pMapY ); + const tools::Long* pMapX, + const tools::Long* pMapY ); /** Retrieve downsampled and cropped bitmap @@ -1581,8 +1581,8 @@ private: const Point& rSrcPt, const Size& rSrcSz, const Bitmap& rBmp, - long nMaxBmpDPIX, - long nMaxBmpDPIY ); + tools::Long nMaxBmpDPIX, + tools::Long nMaxBmpDPIY ); ///@} @@ -1605,7 +1605,7 @@ public: */ bool RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, GDIMetaFile& rOutMtf, - long nMaxBmpDPIX, long nMaxBmpDPIY, + tools::Long nMaxBmpDPIX, tools::Long nMaxBmpDPIY, bool bReduceTransparency, bool bTransparencyAutoMode, bool bDownsampleBitmaps, @@ -1784,7 +1784,7 @@ public: static tools::Rectangle LogicToLogic( const tools::Rectangle& rRectSource, const MapMode& rMapModeSource, const MapMode& rMapModeDest ); - static long LogicToLogic( long nLongSource, + static tools::Long LogicToLogic( tools::Long nLongSource, MapUnit eUnitSource, MapUnit eUnitDest ); @@ -1822,9 +1822,9 @@ public: @returns Width in units of device pixels. */ - SAL_DLLPRIVATE long ImplLogicWidthToDevicePixel( long nWidth ) const; + SAL_DLLPRIVATE tools::Long ImplLogicWidthToDevicePixel( tools::Long nWidth ) const; - SAL_DLLPRIVATE DeviceCoordinate LogicWidthToDeviceCoordinate( long nWidth ) const; + SAL_DLLPRIVATE DeviceCoordinate LogicWidthToDeviceCoordinate( tools::Long nWidth ) const; /** Convert a logical X coordinate to a device pixel's X coordinate. @@ -1837,7 +1837,7 @@ public: @returns Device's X pixel coordinate */ - SAL_DLLPRIVATE long ImplLogicXToDevicePixel( long nX ) const; + SAL_DLLPRIVATE tools::Long ImplLogicXToDevicePixel( tools::Long nX ) const; /** Convert a logical Y coordinate to a device pixel's Y coordinate. @@ -1850,7 +1850,7 @@ public: @returns Device's Y pixel coordinate */ - SAL_DLLPRIVATE long ImplLogicYToDevicePixel( long nY ) const; + SAL_DLLPRIVATE tools::Long ImplLogicYToDevicePixel( tools::Long nY ) const; /** Convert a logical height to a height in units of device pixels. @@ -1862,7 +1862,7 @@ public: @returns Height in units of device pixels. */ - SAL_DLLPRIVATE long ImplLogicHeightToDevicePixel( long nHeight ) const; + SAL_DLLPRIVATE tools::Long ImplLogicHeightToDevicePixel( tools::Long nHeight ) const; /** Convert device pixels to a width in logical units. @@ -1873,7 +1873,7 @@ public: @returns Width in logical units. */ - SAL_DLLPRIVATE long ImplDevicePixelToLogicWidth( long nWidth ) const; + SAL_DLLPRIVATE tools::Long ImplDevicePixelToLogicWidth( tools::Long nWidth ) const; /** Convert device pixels to a height in logical units. @@ -1884,7 +1884,7 @@ public: @returns Height in logical units. */ - SAL_DLLPRIVATE long ImplDevicePixelToLogicHeight( long nHeight ) const; + SAL_DLLPRIVATE tools::Long ImplDevicePixelToLogicHeight( tools::Long nHeight ) const; /** Convert logical height to device pixels, with exact sub-pixel value. diff --git a/include/vcl/outdevmap.hxx b/include/vcl/outdevmap.hxx index c6494f0650a0..e195753892c7 100644 --- a/include/vcl/outdevmap.hxx +++ b/include/vcl/outdevmap.hxx @@ -22,20 +22,20 @@ struct ImplMapRes { - long mnMapOfsX; // Offset in X direction - long mnMapOfsY; // Offset in Y direction - long mnMapScNumX; // Scaling factor - numerator in X direction - long mnMapScNumY; // Scaling factor - numerator in Y direction - long mnMapScDenomX; // Scaling factor - denominator in X direction - long mnMapScDenomY; // Scaling factor - denominator in Y direction + tools::Long mnMapOfsX; // Offset in X direction + tools::Long mnMapOfsY; // Offset in Y direction + tools::Long mnMapScNumX; // Scaling factor - numerator in X direction + tools::Long mnMapScNumY; // Scaling factor - numerator in Y direction + tools::Long mnMapScDenomX; // Scaling factor - denominator in X direction + tools::Long mnMapScDenomY; // Scaling factor - denominator in Y direction }; struct ImplThresholdRes { - long mnThresLogToPixX; // Thresholds for calculation - long mnThresLogToPixY; // with BigInts - long mnThresPixToLogX; // "" - long mnThresPixToLogY; // "" + tools::Long mnThresLogToPixX; // Thresholds for calculation + tools::Long mnThresLogToPixY; // with BigInts + tools::Long mnThresPixToLogX; // "" + tools::Long mnThresPixToLogY; // "" }; #endif // INCLUDED_VCL_OUTDEVMAP_HXX diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx index f635a924507b..f7010910299a 100644 --- a/include/vcl/pdfwriter.hxx +++ b/include/vcl/pdfwriter.hxx @@ -712,7 +712,7 @@ The following structure describes the permissions used in PDF security void SetClipRegion(); void SetClipRegion( const basegfx::B2DPolyPolygon& rRegion ); - void MoveClipRegion( long nHorzMove, long nVertMove ); + void MoveClipRegion( tools::Long nHorzMove, tools::Long nVertMove ); void IntersectClipRegion( const tools::Rectangle& rRect ); void IntersectClipRegion( const basegfx::B2DPolyPolygon& rRegion ); @@ -742,12 +742,12 @@ The following structure describes the permissions used in PDF security /* actual drawing functions */ void DrawText( const Point& rPos, const OUString& rText ); - void DrawTextLine( const Point& rPos, long nWidth, + void DrawTextLine( const Point& rPos, tools::Long nWidth, FontStrikeout eStrikeout, FontLineStyle eUnderline, FontLineStyle eOverline ); void DrawTextArray( const Point& rStartPt, const OUString& rStr, - const long* pDXAry, + const tools::Long* pDXAry, sal_Int32 nIndex, sal_Int32 nLen ); void DrawStretchText( const Point& rStartPt, sal_uLong nWidth, diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index eed2722f824f..6d3adf0e00d7 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -197,7 +197,7 @@ protected: virtual void ReleaseGraphics( bool bRelease = true ) override; virtual void ImplReleaseFonts() override; - virtual long GetGradientStepCount( long nMinRect ) override; + virtual tools::Long GetGradientStepCount( tools::Long nMinRect ) override; virtual bool UsePolyPolygonForComplexGradient() override; virtual void ClipAndDrawGradientMetafile ( const Gradient &rGradient, const tools::PolyPolygon &rPolyPoly ) override; @@ -385,12 +385,12 @@ public: int nRows; int nColumns; Size aPaperSize; - long nLeftMargin; - long nTopMargin; - long nRightMargin; - long nBottomMargin; - long nHorizontalSpacing; - long nVerticalSpacing; + tools::Long nLeftMargin; + tools::Long nTopMargin; + tools::Long nRightMargin; + tools::Long nBottomMargin; + tools::Long nHorizontalSpacing; + tools::Long nVerticalSpacing; bool bDrawBorder; NupOrderType nOrder; diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx index 0c8fad891cc0..92dd9deb12df 100644 --- a/include/vcl/region.hxx +++ b/include/vcl/region.hxx @@ -87,7 +87,7 @@ public: const RegionBand* GetAsRegionBand() const; // manipulators - void Move( long nHorzMove, long nVertMove ); + void Move( tools::Long nHorzMove, tools::Long nVertMove ); void Scale( double fScaleX, double fScaleY ); void Union( const tools::Rectangle& rRegion ); void Intersect( const tools::Rectangle& rRegion ); diff --git a/include/vcl/salgtype.hxx b/include/vcl/salgtype.hxx index 3c1f59512586..720c4c1d8255 100644 --- a/include/vcl/salgtype.hxx +++ b/include/vcl/salgtype.hxx @@ -39,25 +39,25 @@ constexpr ::Color SALCOLOR_NONE ( 0xFF, 0xFF, 0xFF, 0xFF ); // must equal to class Point struct SalPoint { - long mnX; - long mnY; + tools::Long mnX; + tools::Long mnY; }; typedef const SalPoint* PCONSTSALPOINT; struct SalTwoRect { - long mnSrcX; - long mnSrcY; - long mnSrcWidth; - long mnSrcHeight; - long mnDestX; - long mnDestY; - long mnDestWidth; - long mnDestHeight; + tools::Long mnSrcX; + tools::Long mnSrcY; + tools::Long mnSrcWidth; + tools::Long mnSrcHeight; + tools::Long mnDestX; + tools::Long mnDestY; + tools::Long mnDestWidth; + tools::Long mnDestHeight; - SalTwoRect(long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, - long nDestX, long nDestY, long nDestWidth, long nDestHeight) + SalTwoRect(tools::Long nSrcX, tools::Long nSrcY, tools::Long nSrcWidth, tools::Long nSrcHeight, + tools::Long nDestX, tools::Long nDestY, tools::Long nDestWidth, tools::Long nDestHeight) : mnSrcX(nSrcX), mnSrcY(nSrcY), mnSrcWidth(nSrcWidth), mnSrcHeight(nSrcHeight) , mnDestX(nDestX), mnDestY(nDestY), mnDestWidth(nDestWidth), mnDestHeight(nDestHeight) { diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx index b53331484e96..faa273b3f571 100644 --- a/include/vcl/salnativewidgets.hxx +++ b/include/vcl/salnativewidgets.hxx @@ -251,9 +251,9 @@ class VCL_DLLPUBLIC ImplControlValue private: ControlType mType; ButtonValue mTristate; // Tristate value: on, off, mixed - long mNumber; // numeric value + tools::Long mNumber; // numeric value protected: - ImplControlValue( ControlType i_eType, long i_nNumber ) + ImplControlValue( ControlType i_eType, tools::Long i_nNumber ) : mType( i_eType ) , mTristate( ButtonValue::DontKnow ) , mNumber( i_nNumber ) @@ -262,7 +262,7 @@ class VCL_DLLPUBLIC ImplControlValue public: explicit ImplControlValue( ButtonValue nTristate ) : mType( ControlType::Generic ), mTristate(nTristate), mNumber(0) {} - explicit ImplControlValue( long nNumeric ) + explicit ImplControlValue( tools::Long nNumeric ) : mType( ControlType::Generic ), mTristate(ButtonValue::DontKnow), mNumber( nNumeric) {} ImplControlValue() : mType( ControlType::Generic ), mTristate(ButtonValue::DontKnow), mNumber(0) {} @@ -281,8 +281,8 @@ class VCL_DLLPUBLIC ImplControlValue ButtonValue getTristateVal() const { return mTristate; } void setTristateVal( ButtonValue nTristate ) { mTristate = nTristate; } - long getNumericVal() const { return mNumber; } - void setNumericVal( long nNumeric ) { mNumber = nNumeric; } + tools::Long getNumericVal() const { return mNumber; } + void setNumericVal( tools::Long nNumeric ) { mNumber = nNumeric; } }; /* ScrollbarValue: @@ -292,10 +292,10 @@ class VCL_DLLPUBLIC ImplControlValue class SAL_DLLPUBLIC_RTTI ScrollbarValue final : public ImplControlValue { public: - long mnMin; - long mnMax; - long mnCur; - long mnVisibleSize; + tools::Long mnMin; + tools::Long mnMax; + tools::Long mnCur; + tools::Long mnVisibleSize; tools::Rectangle maThumbRect; tools::Rectangle maButton1Rect; tools::Rectangle maButton2Rect; @@ -322,9 +322,9 @@ class SAL_DLLPUBLIC_RTTI ScrollbarValue final : public ImplControlValue class SAL_DLLPUBLIC_RTTI SliderValue final : public ImplControlValue { public: - long mnMin; - long mnMax; - long mnCur; + tools::Long mnMin; + tools::Long mnMax; + tools::Long mnCur; tools::Rectangle maThumbRect; ControlState mnThumbState; @@ -494,7 +494,7 @@ public: class SAL_DLLPUBLIC_RTTI MenupopupValue final : public ImplControlValue { public: - MenupopupValue( long i_nGutterWidth, const tools::Rectangle& i_rItemRect ) + MenupopupValue( tools::Long i_nGutterWidth, const tools::Rectangle& i_rItemRect ) : ImplControlValue( ControlType::MenuPopup, i_nGutterWidth ) , maItemRect( i_rItemRect ) {} diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index e3474ee0ac84..47bcded8697b 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -46,18 +46,18 @@ private: tools::Rectangle maThumbRect; tools::Rectangle maTrackRect; std::unique_ptr<ImplScrollBarData> mpData; - long mnStartPos; - long mnMouseOff; - long mnThumbPixRange; - long mnThumbPixPos; - long mnThumbPixSize; - long mnMinRange; - long mnMaxRange; - long mnThumbPos; - long mnVisibleSize; - long mnLineSize; - long mnPageSize; - long mnDelta; + tools::Long mnStartPos; + tools::Long mnMouseOff; + tools::Long mnThumbPixRange; + tools::Long mnThumbPixPos; + tools::Long mnThumbPixSize; + tools::Long mnMinRange; + tools::Long mnMaxRange; + tools::Long mnThumbPos; + tools::Long mnVisibleSize; + tools::Long mnLineSize; + tools::Long mnPageSize; + tools::Long mnDelta; sal_uInt16 mnStateFlags; ScrollType meScrollType; bool mbCalcSize; @@ -70,13 +70,13 @@ private: SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplUpdateRects( bool bUpdate = true ); - SAL_DLLPRIVATE long ImplCalcThumbPos( long nPixPos ); - SAL_DLLPRIVATE long ImplCalcThumbPosPix( long nPos ); + SAL_DLLPRIVATE tools::Long ImplCalcThumbPos( tools::Long nPixPos ); + SAL_DLLPRIVATE tools::Long ImplCalcThumbPosPix( tools::Long nPos ); SAL_DLLPRIVATE void ImplCalc( bool bUpdate = true ); SAL_DLLPRIVATE void ImplDraw(vcl::RenderContext& rRenderContext); using Window::ImplScroll; - SAL_DLLPRIVATE long ImplScroll( long nNewPos, bool bCallEndScroll ); - SAL_DLLPRIVATE long ImplDoAction( bool bCallEndScroll ); + SAL_DLLPRIVATE tools::Long ImplScroll( tools::Long nNewPos, bool bCallEndScroll ); + SAL_DLLPRIVATE tools::Long ImplDoAction( bool bCallEndScroll ); SAL_DLLPRIVATE void ImplDoMouseAction( const Point& rPos, bool bCallAction = true ); SAL_DLLPRIVATE void ImplInvert(); SAL_DLLPRIVATE bool ImplDrawNative(vcl::RenderContext& rRenderContext, sal_uInt16 nDrawFlags); @@ -107,27 +107,27 @@ public: void Scroll(); virtual void EndScroll(); - long DoScroll( long nNewPos ); - long DoScrollAction( ScrollType eScrollType ); + tools::Long DoScroll( tools::Long nNewPos ); + tools::Long DoScrollAction( ScrollType eScrollType ); void EnableDrag() { mbFullDrag = true; } - void SetRangeMin( long nNewRange ); - long GetRangeMin() const { return mnMinRange; } - void SetRangeMax( long nNewRange ); - long GetRangeMax() const { return mnMaxRange; } + void SetRangeMin( tools::Long nNewRange ); + tools::Long GetRangeMin() const { return mnMinRange; } + void SetRangeMax( tools::Long nNewRange ); + tools::Long GetRangeMax() const { return mnMaxRange; } void SetRange( const Range& rRange ); Range GetRange() const { return Range( GetRangeMin(), GetRangeMax() ); } - void SetThumbPos( long nThumbPos ); - long GetThumbPos() const { return mnThumbPos; } - void SetLineSize( long nNewSize ) { mnLineSize = nNewSize; } - long GetLineSize() const { return mnLineSize; } - void SetPageSize( long nNewSize ) { mnPageSize = nNewSize; } - long GetPageSize() const { return mnPageSize; } - void SetVisibleSize( long nNewSize ); - long GetVisibleSize() const { return mnVisibleSize; } - - long GetDelta() const { return mnDelta; } + void SetThumbPos( tools::Long nThumbPos ); + tools::Long GetThumbPos() const { return mnThumbPos; } + void SetLineSize( tools::Long nNewSize ) { mnLineSize = nNewSize; } + tools::Long GetLineSize() const { return mnLineSize; } + void SetPageSize( tools::Long nNewSize ) { mnPageSize = nNewSize; } + tools::Long GetPageSize() const { return mnPageSize; } + void SetVisibleSize( tools::Long nNewSize ); + tools::Long GetVisibleSize() const { return mnVisibleSize; } + + tools::Long GetDelta() const { return mnDelta; } ScrollType GetType() const { return meScrollType; } void SetScrollHdl( const Link<ScrollBar*,void>& rLink ) { maScrollHdl = rLink; } diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index d6c365565e9c..30023a601ab9 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -97,17 +97,17 @@ public: void SetDoubleClickTime( sal_uInt64 nDoubleClkTime ); sal_uInt64 GetDoubleClickTime() const; - void SetDoubleClickWidth( long nDoubleClkWidth ); - long GetDoubleClickWidth() const; + void SetDoubleClickWidth( tools::Long nDoubleClkWidth ); + tools::Long GetDoubleClickWidth() const; - void SetDoubleClickHeight( long nDoubleClkHeight ); - long GetDoubleClickHeight() const; + void SetDoubleClickHeight( tools::Long nDoubleClkHeight ); + tools::Long GetDoubleClickHeight() const; - void SetStartDragWidth( long nDragWidth ); - long GetStartDragWidth() const; + void SetStartDragWidth( tools::Long nDragWidth ); + tools::Long GetStartDragWidth() const; - void SetStartDragHeight( long nDragHeight ); - long GetStartDragHeight() const; + void SetStartDragHeight( tools::Long nDragHeight ); + tools::Long GetStartDragHeight() const; static sal_uInt16 GetStartDragCode(); @@ -492,27 +492,27 @@ public: void SetTabFont( const vcl::Font& rFont ); const vcl::Font& GetTabFont() const; - static long GetBorderSize(); + static tools::Long GetBorderSize(); - void SetTitleHeight( long nSize ); - long GetTitleHeight() const; + void SetTitleHeight( tools::Long nSize ); + tools::Long GetTitleHeight() const; - void SetFloatTitleHeight( long nSize ); - long GetFloatTitleHeight() const; + void SetFloatTitleHeight( tools::Long nSize ); + tools::Long GetFloatTitleHeight() const; - void SetScrollBarSize( long nSize ); - long GetScrollBarSize() const; + void SetScrollBarSize( tools::Long nSize ); + tools::Long GetScrollBarSize() const; - void SetMinThumbSize( long nSize ); - long GetMinThumbSize() const; + void SetMinThumbSize( tools::Long nSize ); + tools::Long GetMinThumbSize() const; - void SetSpinSize( long nSize ); - long GetSpinSize() const; + void SetSpinSize( tools::Long nSize ); + tools::Long GetSpinSize() const; - static long GetSplitSize(); + static tools::Long GetSplitSize(); - void SetCursorSize( long nSize ); - long GetCursorSize() const; + void SetCursorSize( tools::Long nSize ); + tools::Long GetCursorSize() const; void SetCursorBlinkTime( sal_uInt64 nBlinkTime ); sal_uInt64 GetCursorBlinkTime() const; @@ -526,7 +526,7 @@ public: void SetDisplayOptions( DisplayOptions nOptions ); DisplayOptions GetDisplayOptions() const; - void SetAntialiasingMinPixelHeight( long nMinPixel ); + void SetAntialiasingMinPixelHeight( tools::Long nMinPixel ); sal_uLong GetAntialiasingMinPixelHeight() const; void SetOptions( StyleSettingsOptions nOptions ); diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx index fcc2fb182532..4d8624c49b2e 100644 --- a/include/vcl/split.hxx +++ b/include/vcl/split.hxx @@ -30,16 +30,16 @@ class VCL_DLLPUBLIC Splitter : public vcl::Window { private: VclPtr<vcl::Window> mpRefWin; - long mnSplitPos; - long mnLastSplitPos; - long mnStartSplitPos; + tools::Long mnSplitPos; + tools::Long mnLastSplitPos; + tools::Long mnStartSplitPos; Point maDragPos; tools::Rectangle maDragRect; bool mbHorzSplit; bool mbDragFull; bool mbKbdSplitting; bool mbInKeyEvent; - long mnKeyboardStepSize; + tools::Long mnKeyboardStepSize; Link<Splitter*,void> maStartSplitHdl; Link<Splitter*,void> maSplitHdl; Link<Splitter*,void> maEndSplitHdl; @@ -85,15 +85,15 @@ public: void SetDragRectPixel( const tools::Rectangle& rDragRect, vcl::Window* pRefWin = nullptr ); - void SetSplitPosPixel( long nPos ); - long GetSplitPosPixel() const { return mnSplitPos; } + void SetSplitPosPixel( tools::Long nPos ); + tools::Long GetSplitPosPixel() const { return mnSplitPos; } bool IsHorizontal() const { return mbHorzSplit; } void SetHorizontal(bool bNew); // set the stepsize of the splitter for cursor movement // the default is 10% of the reference window's width/height - void SetKeyboardStepSize( long nStepSize ); + void SetKeyboardStepSize( tools::Long nStepSize ); void SetStartSplitHdl( const Link<Splitter*,void>& rLink ) { maStartSplitHdl = rLink; } void SetSplitHdl( const Link<Splitter*,void>& rLink ) { maSplitHdl = rLink; } diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx index fcec64ef7892..c88f015a9471 100644 --- a/include/vcl/splitwin.hxx +++ b/include/vcl/splitwin.hxx @@ -48,18 +48,18 @@ private: std::unique_ptr<ImplSplitSet> mpMainSet; ImplSplitSet* mpBaseSet; ImplSplitSet* mpSplitSet; - long* mpLastSizes; + tools::Long* mpLastSizes; tools::Rectangle maDragRect; - long mnDX; - long mnDY; - long mnLeftBorder; - long mnTopBorder; - long mnRightBorder; - long mnBottomBorder; - long mnMaxSize; - long mnMouseOff; - long mnMStartPos; - long mnMSplitPos; + tools::Long mnDX; + tools::Long mnDY; + tools::Long mnLeftBorder; + tools::Long mnTopBorder; + tools::Long mnRightBorder; + tools::Long mnBottomBorder; + tools::Long mnMaxSize; + tools::Long mnMouseOff; + tools::Long mnMStartPos; + tools::Long mnMSplitPos; WinBits mnWinStyle; WindowAlign meAlign; sal_uInt16 mnSplitTest; @@ -85,7 +85,7 @@ private: SAL_DLLPRIVATE void ImplInitSettings(); SAL_DLLPRIVATE void ImplCalcLayout(); SAL_DLLPRIVATE void ImplUpdate(); - SAL_DLLPRIVATE void ImplSetWindowSize( long nDelta ); + SAL_DLLPRIVATE void ImplSetWindowSize( tools::Long nDelta ); SAL_DLLPRIVATE void ImplSplitMousePos( Point& rMousePos ); SAL_DLLPRIVATE void ImplGetButtonRect( tools::Rectangle& rRect, bool bTest ) const; SAL_DLLPRIVATE void ImplGetFadeInRect( tools::Rectangle& rRect, bool bTest = false ) const; @@ -101,10 +101,10 @@ private: static SAL_DLLPRIVATE void ImplCalcSet2( SplitWindow* pWindow, ImplSplitSet* pSet, bool bHide, bool bRows ); static SAL_DLLPRIVATE sal_uInt16 ImplTestSplit( ImplSplitSet* pSet, const Point& rPos, - long& rMouseOff, ImplSplitSet** ppFoundSet, sal_uInt16& rFoundPos, + tools::Long& rMouseOff, ImplSplitSet** ppFoundSet, sal_uInt16& rFoundPos, bool bRows ); static SAL_DLLPRIVATE sal_uInt16 ImplTestSplit( const SplitWindow* pWindow, const Point& rPos, - long& rMouseOff, ImplSplitSet** ppFoundSet, sal_uInt16& rFoundPos ); + tools::Long& rMouseOff, ImplSplitSet** ppFoundSet, sal_uInt16& rFoundPos ); SAL_DLLPRIVATE void ImplDrawSplitTracking(const Point& rPos); SplitWindow (const SplitWindow &) = delete; @@ -130,19 +130,19 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; - void InsertItem( sal_uInt16 nId, vcl::Window* pWindow, long nSize, + void InsertItem( sal_uInt16 nId, vcl::Window* pWindow, tools::Long nSize, sal_uInt16 nPos, sal_uInt16 nIntoSetId, SplitWindowItemFlags nBits ); - void InsertItem( sal_uInt16 nId, long nSize, + void InsertItem( sal_uInt16 nId, tools::Long nSize, sal_uInt16 nPos, sal_uInt16 nIntoSetId, SplitWindowItemFlags nBits ); void RemoveItem( sal_uInt16 nId ); - void SplitItem( sal_uInt16 nId, long nNewSize, + void SplitItem( sal_uInt16 nId, tools::Long nNewSize, bool bPropSmall, bool bPropGreat ); - void SetItemSize( sal_uInt16 nId, long nNewSize ); - long GetItemSize( sal_uInt16 nId ) const; + void SetItemSize( sal_uInt16 nId, tools::Long nNewSize ); + tools::Long GetItemSize( sal_uInt16 nId ) const; /** Set a range that limits the (variable part of the) size with an upper and a lower bound (both are valid values themselves.) @param nId @@ -154,7 +154,7 @@ public: void SetItemSizeRange (sal_uInt16 nId, const Range& rRange); /** Return the current size limits for the specified item. */ - long GetItemSize( sal_uInt16 nId, SplitWindowItemFlags nBits ) const; + tools::Long GetItemSize( sal_uInt16 nId, SplitWindowItemFlags nBits ) const; sal_uInt16 GetSet( sal_uInt16 nId ) const; sal_uInt16 GetItemId( vcl::Window* pWindow ) const; sal_uInt16 GetItemId( const Point& rPos ) const; @@ -167,13 +167,13 @@ public: WindowAlign GetAlign() const { return meAlign; } bool IsHorizontal() const { return mbHorz; } - void SetMaxSizePixel( long nNewMaxSize ) { mnMaxSize = nNewMaxSize; } + void SetMaxSizePixel( tools::Long nNewMaxSize ) { mnMaxSize = nNewMaxSize; } Size CalcLayoutSizePixel( const Size& aNewSize ); void ShowFadeInHideButton(); void ShowFadeOutButton(); - long GetFadeInSize() const; + tools::Long GetFadeInSize() const; bool IsFadeNoButtonMode() const { return mbFadeNoButtonMode; } void SetSplitHdl( const Link<SplitWindow*,void>& rLink ) { maSplitHdl = rLink; } diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index 2700e2a8e145..834fbe4bd7ba 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -34,7 +34,7 @@ class UserDrawEvent; struct ImplStatusItem; void DrawProgress(vcl::Window* pWindow, vcl::RenderContext& rRenderContext, const Point& rPos, - long nOffset, long nPrgsWidth, long nPrgsHeight, + tools::Long nOffset, tools::Long nPrgsWidth, tools::Long nPrgsHeight, sal_uInt16 nPercent1, sal_uInt16 nPercent2, sal_uInt16 nPercentCount, const tools::Rectangle& rFramePosSize); @@ -58,7 +58,7 @@ namespace o3tl #define STATUSBAR_APPEND (sal_uInt16(0xFFFF)) #define STATUSBAR_ITEM_NOTFOUND (sal_uInt16(0xFFFF)) -#define STATUSBAR_OFFSET (long(5)) +#define STATUSBAR_OFFSET (tools::Long(5)) class VCL_DLLPUBLIC StatusBar : public vcl::Window @@ -70,12 +70,12 @@ private: OUString maPrgsTxt; Point maPrgsTxtPos; tools::Rectangle maPrgsFrameRect; - long mnPrgsSize; - long mnItemsWidth; - long mnDX; - long mnDY; - long mnCalcHeight; - long mnTextY; + tools::Long mnPrgsSize; + tools::Long mnItemsWidth; + tools::Long mnDX; + tools::Long mnDY; + tools::Long mnCalcHeight; + tools::Long mnTextY; sal_uInt16 mnCurItemId; sal_uInt16 mnPercent; sal_uInt16 mnPercentCount; @@ -125,7 +125,7 @@ public: void InsertItem( sal_uInt16 nItemId, sal_uLong nWidth, StatusBarItemBits nBits = StatusBarItemBits::Center | StatusBarItemBits::In, - long nOffset = STATUSBAR_OFFSET, + tools::Long nOffset = STATUSBAR_OFFSET, sal_uInt16 nPos = STATUSBAR_APPEND ); void RemoveItem( sal_uInt16 nItemId ); @@ -148,7 +148,7 @@ public: sal_uLong GetItemWidth( sal_uInt16 nItemId ) const; StatusBarItemBits GetItemBits( sal_uInt16 nItemId ) const; - long GetItemOffset( sal_uInt16 nItemId ) const; + tools::Long GetItemOffset( sal_uInt16 nItemId ) const; /// @param nCharsWidth, if not -1, overrides the normal width calculation void SetItemText( sal_uInt16 nItemId, const OUString& rText, int nCharsWidth = -1 ); diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 16356c8b93e7..e5ecc5cb499d 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -845,7 +845,7 @@ public: GetActiveTopWindow */ - static long GetTopWindowCount(); + static tools::Long GetTopWindowCount(); /** Get the nth top window. @@ -859,7 +859,7 @@ public: @see GetFirstTopLevelWindow, GetNextTopLevelWindow, GetTopWindowCount, GetActiveTopWindow */ - static vcl::Window* GetTopWindow( long nIndex ); + static vcl::Window* GetTopWindow( tools::Long nIndex ); /** Get the "active" top window. diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx index c4fae1adb8bc..14685c3b9d61 100644 --- a/include/vcl/sysdata.hxx +++ b/include/vcl/sysdata.hxx @@ -21,6 +21,7 @@ #define INCLUDED_VCL_SYSDATA_HXX #include <sal/types.h> +#include <tools/long.hxx> #ifdef MACOSX // predeclare the native classes to avoid header/include problems @@ -108,7 +109,7 @@ struct SystemParentData #elif defined( IOS ) // Nothing #elif defined( UNX ) - long aWindow; // the window of the object + tools::Long aWindow; // the window of the object bool bXEmbedSupport:1; // decides whether the object in question // should support the XEmbed protocol #endif @@ -137,7 +138,7 @@ struct SystemGraphicsData CGContextRef rCGContext; // CoreGraphics graphic context #elif defined( UNX ) void* pDisplay; // the relevant display connection - long hDrawable; // a drawable + tools::Long hDrawable; // a drawable void* pVisual; // the visual in use int nScreen; // the current screen of the drawable void* pXRenderFormat; // render format for drawable diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index f694c4d64c8e..da7620a55ce6 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -87,7 +87,7 @@ public: SAL_DLLPRIVATE bool isDeferredInit() const { return mbIsDeferredInit; } private: - SAL_DLLPRIVATE void ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, vcl::Window const * i_pConfigureWin ); + SAL_DLLPRIVATE void ImplMoveToScreen( tools::Long& io_rX, tools::Long& io_rY, tools::Long i_nWidth, tools::Long i_nHeight, vcl::Window const * i_pConfigureWin ); SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, Window &rBox); DECL_DLLPRIVATE_LINK( ImplHandleLayoutTimerHdl, Timer*, void ); diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index edfa86cf37f0..9369086b043b 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -52,8 +52,8 @@ class VCL_DLLPUBLIC TabControl : public Control { protected: std::unique_ptr<ImplTabCtrlData> mpTabCtrlData; - long mnLastWidth; - long mnLastHeight; + tools::Long mnLastWidth; + tools::Long mnLastHeight; sal_uInt16 mnActPageId; sal_uInt16 mnCurPageId; bool mbFormat; @@ -67,9 +67,9 @@ protected: SAL_DLLPRIVATE void ImplInitSettings( bool bBackground ); SAL_DLLPRIVATE ImplTabItem* ImplGetItem( sal_uInt16 nId ) const; SAL_DLLPRIVATE ImplTabItem* ImplGetItem(const Point& rPt) const; - SAL_DLLPRIVATE Size ImplGetItemSize( ImplTabItem* pItem, long nMaxWidth ); - SAL_DLLPRIVATE tools::Rectangle ImplGetTabRect( sal_uInt16 nPos, long nWidth = -1, long nHeight = -1 ); - SAL_DLLPRIVATE tools::Rectangle ImplGetTabRect(const ImplTabItem*, long nWidth = -1, long nHeight = -1); + SAL_DLLPRIVATE Size ImplGetItemSize( ImplTabItem* pItem, tools::Long nMaxWidth ); + SAL_DLLPRIVATE tools::Rectangle ImplGetTabRect( sal_uInt16 nPos, tools::Long nWidth = -1, tools::Long nHeight = -1 ); + SAL_DLLPRIVATE tools::Rectangle ImplGetTabRect(const ImplTabItem*, tools::Long nWidth = -1, tools::Long nHeight = -1); SAL_DLLPRIVATE void ImplChangeTabPage( sal_uInt16 nId, sal_uInt16 nOldId ); SAL_DLLPRIVATE bool ImplPosCurTabPage(); virtual void ImplActivateTabPage( bool bNext ); @@ -89,7 +89,7 @@ protected: virtual void FillLayoutData() const override; virtual const vcl::Font& GetCanonicalFont( const StyleSettings& _rStyle ) const override; virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const override; - virtual bool ImplPlaceTabs( long nWidth ); + virtual bool ImplPlaceTabs( tools::Long nWidth ); SAL_DLLPRIVATE Size ImplCalculateRequisition(sal_uInt16& nHeaderHeight) const; public: @@ -169,12 +169,12 @@ public: // returns (control relative) bounding rectangle for the // character at index nIndex relative to the text of page nPageId using Control::GetCharacterBounds; - tools::Rectangle GetCharacterBounds( sal_uInt16 nPageId, long nIndex ) const; + tools::Rectangle GetCharacterBounds( sal_uInt16 nPageId, tools::Long nIndex ) const; // returns the index relative to the text of page nPageId (also returned) // at position rPoint (control relative) using Control::GetIndexForPoint; - long GetIndexForPoint( const Point& rPoint, sal_uInt16& rPageId ) const; + tools::Long GetIndexForPoint( const Point& rPoint, sal_uInt16& rPageId ) const; // returns the rectangle of the tab for page nPageId tools::Rectangle GetTabBounds( sal_uInt16 nPageId ) const; @@ -215,7 +215,7 @@ public: static sal_uInt16 GetHeaderHeight(); protected: - virtual bool ImplPlaceTabs( long nWidth ) override; + virtual bool ImplPlaceTabs( tools::Long nWidth ) override; virtual void ImplActivateTabPage( bool bNext ) override; private: diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx index a7042407dcbf..7ad2a7e85b91 100644 --- a/include/vcl/texteng.hxx +++ b/include/vcl/texteng.hxx @@ -105,11 +105,11 @@ class VCL_DLLPUBLIC TextEngine : public SfxBroadcaster Color maTextColor; sal_Int32 mnMaxTextLen; - long mnMaxTextWidth; - long mnCharHeight; - long mnCurTextWidth; - long mnCurTextHeight; - long mnDefTab; + tools::Long mnMaxTextWidth; + tools::Long mnCharHeight; + tools::Long mnCurTextWidth; + tools::Long mnCurTextHeight; + tools::Long mnDefTab; TxtAlign meAlign; @@ -159,7 +159,7 @@ class VCL_DLLPUBLIC TextEngine : public SfxBroadcaster bool CreateLines( sal_uInt32 nPara ); void CreateAndInsertEmptyLine( sal_uInt32 nPara ); - void ImpBreakLine( sal_uInt32 nPara, TextLine* pLine, sal_Int32 nPortionStart, long nRemainingWidth ); + void ImpBreakLine( sal_uInt32 nPara, TextLine* pLine, sal_Int32 nPortionStart, tools::Long nRemainingWidth ); std::size_t SplitTextPortion( sal_uInt32 nPara, sal_Int32 nPos ); void CreateTextPortions( sal_uInt32 nPara, sal_Int32 nStartPos ); void RecalcTextPortion( sal_uInt32 nPara, sal_Int32 nStartPos, sal_Int32 nNewChars ); @@ -175,20 +175,20 @@ class VCL_DLLPUBLIC TextEngine : public SfxBroadcaster bool IsFormatted() const { return mbFormatted; } - sal_Int32 GetCharPos( sal_uInt32 nPara, std::vector<TextLine>::size_type nLine, long nDocPosX ); + sal_Int32 GetCharPos( sal_uInt32 nPara, std::vector<TextLine>::size_type nLine, tools::Long nDocPosX ); tools::Rectangle GetEditCursor( const TextPaM& rPaM, bool bSpecial, bool bPreferPortionStart = false ); sal_Int32 ImpFindIndex( sal_uInt32 nPortion, const Point& rPosInPara ); - long ImpGetPortionXOffset( sal_uInt32 nPara, TextLine const * pLine, std::size_t nTextPortion ); - long ImpGetXPos( sal_uInt32 nPara, TextLine* pLine, sal_Int32 nIndex, bool bPreferPortionStart = false ); - long ImpGetOutputOffset( sal_uInt32 nPara, TextLine* pLine, sal_Int32 nIndex, sal_Int32 nIndex2 ); + tools::Long ImpGetPortionXOffset( sal_uInt32 nPara, TextLine const * pLine, std::size_t nTextPortion ); + tools::Long ImpGetXPos( sal_uInt32 nPara, TextLine* pLine, sal_Int32 nIndex, bool bPreferPortionStart = false ); + tools::Long ImpGetOutputOffset( sal_uInt32 nPara, TextLine* pLine, sal_Int32 nIndex, sal_Int32 nIndex2 ); bool ImpGetRightToLeft( sal_uInt32 nPara, sal_Int32 nPos ); static void ImpInitLayoutMode( OutputDevice* pOutDev ); TxtAlign ImpGetAlign() const; - long CalcTextHeight(); - long CalcParaHeight( sal_uInt32 nParagraph ) const; - long CalcTextWidth( sal_uInt32 nPara ); - long CalcTextWidth( sal_uInt32 nPara, sal_Int32 nPortionStart, sal_Int32 nPortionLen); + tools::Long CalcTextHeight(); + tools::Long CalcParaHeight( sal_uInt32 nParagraph ) const; + tools::Long CalcTextWidth( sal_uInt32 nPara ); + tools::Long CalcTextWidth( sal_uInt32 nPara, sal_Int32 nPortionStart, sal_Int32 nPortionLen); Range GetInvalidYOffsets( sal_uInt32 nPortion ); // for Undo/Redo @@ -233,17 +233,17 @@ public: void SetMaxTextLen( sal_Int32 nLen ); sal_Int32 GetMaxTextLen() const { return mnMaxTextLen; } - void SetMaxTextWidth( long nWidth ); - long GetMaxTextWidth() const { return mnMaxTextWidth; } + void SetMaxTextWidth( tools::Long nWidth ); + tools::Long GetMaxTextWidth() const { return mnMaxTextWidth; } - long GetTextHeight() const; - long CalcTextWidth(); - long GetCharHeight() const { return mnCharHeight; } + tools::Long GetTextHeight() const; + tools::Long CalcTextWidth(); + tools::Long GetCharHeight() const { return mnCharHeight; } sal_uInt32 GetParagraphCount() const; OUString GetText( sal_uInt32 nParagraph ) const; sal_Int32 GetTextLen( sal_uInt32 nParagraph ) const; - long GetTextHeight( sal_uInt32 nParagraph ) const; + tools::Long GetTextHeight( sal_uInt32 nParagraph ) const; void GetTextPortionRange(const TextPaM& rPaM, sal_Int32& nStart, sal_Int32& nEnd); diff --git a/include/vcl/textrectinfo.hxx b/include/vcl/textrectinfo.hxx index c13d65e80362..3802187b5e35 100644 --- a/include/vcl/textrectinfo.hxx +++ b/include/vcl/textrectinfo.hxx @@ -28,14 +28,14 @@ class VCL_DLLPUBLIC TextRectInfo friend class ::OutputDevice; private: - long mnMaxWidth; + tools::Long mnMaxWidth; sal_uInt16 mnLineCount; bool mbEllipsis; public: TextRectInfo(); - long GetMaxLineWidth() const { return mnMaxWidth; } + tools::Long GetMaxLineWidth() const { return mnMaxWidth; } bool IsEllipses() const { return mbEllipsis; } bool operator ==( const TextRectInfo& rInfo ) const diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx index bf0ea21ec1f4..d913dfd99c0a 100644 --- a/include/vcl/textview.hxx +++ b/include/vcl/textview.hxx @@ -128,7 +128,7 @@ public: vcl::Window* GetWindow() const; void Invalidate(); - void Scroll( long nHorzScroll, long nVertScroll ); + void Scroll( tools::Long nHorzScroll, tools::Long nVertScroll ); void ShowCursor( bool bGotoCursor = true, bool bForceVisCursor = true ); void HideCursor(); diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 8383662129f8..8a5b9d2f502b 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -91,8 +91,8 @@ public: private: struct ImplToolSize { - long mnWidth; - long mnHeight; + tools::Long mnWidth; + tools::Long mnHeight; ImplToolItems::size_type mnLines; }; @@ -103,18 +103,18 @@ private: tools::Rectangle maLowerRect; tools::Rectangle maPaintRect; VclPtr<FloatingWindow> mpFloatWin; - long mnDX; - long mnDY; - long mnMaxItemWidth; // max item width - long mnMaxItemHeight; // max item height (for standard items) - long mnWinHeight; // max window height (for window items) - long mnLeftBorder; // inner border - long mnTopBorder; - long mnRightBorder; - long mnBottomBorder; - long mnLastResizeDY; - long mnActivateCount; - long mnImagesRotationAngle; + tools::Long mnDX; + tools::Long mnDY; + tools::Long mnMaxItemWidth; // max item width + tools::Long mnMaxItemHeight; // max item height (for standard items) + tools::Long mnWinHeight; // max window height (for window items) + tools::Long mnLeftBorder; // inner border + tools::Long mnTopBorder; + tools::Long mnRightBorder; + tools::Long mnBottomBorder; + tools::Long mnLastResizeDY; + tools::Long mnActivateCount; + tools::Long mnImagesRotationAngle; sal_uInt16 mnLastFocusItemId; sal_uInt16 mnOutStyle; sal_uInt16 mnHighItemId; @@ -177,7 +177,7 @@ private: SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE ImplToolItem* ImplGetItem( sal_uInt16 nId ) const; SAL_DLLPRIVATE bool ImplCalcItem(); - SAL_DLLPRIVATE ImplToolItems::size_type ImplCalcBreaks( long nWidth, long* pMaxLineWidth, bool bCalcHorz ) const; + SAL_DLLPRIVATE ImplToolItems::size_type ImplCalcBreaks( tools::Long nWidth, tools::Long* pMaxLineWidth, bool bCalcHorz ) const; SAL_DLLPRIVATE void ImplFormat( bool bResize = false ); SAL_DLLPRIVATE void ImplDrawSpin(vcl::RenderContext& rRenderContext); SAL_DLLPRIVATE void ImplDrawSeparator(vcl::RenderContext& rRenderContext, ImplToolItems::size_type nPos, const tools::Rectangle& rRect); @@ -221,8 +221,8 @@ public: static SAL_DLLPRIVATE int ImplGetDragWidth( const vcl::RenderContext& rRenderContext, bool bHorz ); SAL_DLLPRIVATE void ImplUpdateDragArea() const; - SAL_DLLPRIVATE void ImplCalcBorder( WindowAlign eAlign, long& rLeft, long& rTop, - long& rRight, long& rBottom ) const; + SAL_DLLPRIVATE void ImplCalcBorder( WindowAlign eAlign, tools::Long& rLeft, tools::Long& rTop, + tools::Long& rRight, tools::Long& rBottom ) const; SAL_DLLPRIVATE void ImplCheckUpdate(); static SAL_DLLPRIVATE void ImplDrawGrip(vcl::RenderContext& rRenderContext, const tools::Rectangle &aDragArea, int nDragWidth, @@ -244,7 +244,7 @@ public: SAL_DLLPRIVATE Size ImplCalcFloatSize( ImplToolItems::size_type& rLines ); SAL_DLLPRIVATE void ImplCalcMinMaxFloatSize( Size& rMinSize, Size& rMaxSize ); SAL_DLLPRIVATE void ImplSetMinMaxFloatSize(); - SAL_DLLPRIVATE ImplToolItems::size_type ImplCalcLines( long nToolSize ) const; + SAL_DLLPRIVATE ImplToolItems::size_type ImplCalcLines( tools::Long nToolSize ) const; SAL_DLLPRIVATE sal_uInt16 ImplTestLineSize( const Point& rPos ) const; SAL_DLLPRIVATE void ImplLineSizing( const Point& rPos, tools::Rectangle& rRect, sal_uInt16 nLineMode ); SAL_DLLPRIVATE static ImplToolItems::size_type ImplFindItemPos( const ImplToolItem* pItem, const ImplToolItems& rList ); @@ -369,7 +369,7 @@ public: void* GetItemData( sal_uInt16 nItemId ) const; void SetItemImage( sal_uInt16 nItemId, const Image& rImage ); Image GetItemImage( sal_uInt16 nItemId ) const; - void SetItemImageAngle( sal_uInt16 nItemId, long nAngle10 ); + void SetItemImageAngle( sal_uInt16 nItemId, tools::Long nAngle10 ); void SetItemImageMirrorMode( sal_uInt16 nItemId, bool bMirror ); void SetItemText( sal_uInt16 nItemId, const OUString& rText ); const OUString& GetItemText( sal_uInt16 nItemId ) const; @@ -493,10 +493,10 @@ public: // returns the bounding box for the character at index nIndex // where nIndex is relative to the starting index of the item // with id nItemId (in coordinates of the displaying window) - tools::Rectangle GetCharacterBounds( sal_uInt16 nItemId, long nIndex ); + tools::Rectangle GetCharacterBounds( sal_uInt16 nItemId, tools::Long nIndex ); // -1 is returned if no character is at that point // if an index is found the corresponding item id is filled in (else 0) - long GetIndexForPoint( const Point& rPoint, sal_uInt16& rItemID ); + tools::Long GetIndexForPoint( const Point& rPoint, sal_uInt16& rItemID ); static Size GetDefaultImageSize(ToolBoxButtonSize eToolBoxButtonSize); Size GetDefaultImageSize() const; diff --git a/include/vcl/toolkit/button.hxx b/include/vcl/toolkit/button.hxx index 49748cdc73d9..4e0149ac0845 100644 --- a/include/vcl/toolkit/button.hxx +++ b/include/vcl/toolkit/button.hxx @@ -95,7 +95,7 @@ private: const Size& rImageSize, tools::Rectangle& rStateRect, tools::Rectangle& rMouseRect ); SAL_DLLPRIVATE void ImplDrawCheckBox(vcl::RenderContext& rRenderContext ); - SAL_DLLPRIVATE long ImplGetImageToTextDistance() const; + SAL_DLLPRIVATE tools::Long ImplGetImageToTextDistance() const; SAL_DLLPRIVATE Size ImplGetCheckImageSize() const; CheckBox(const CheckBox &) = delete; @@ -152,7 +152,7 @@ public: static Image GetCheckImage( const AllSettings& rSettings, DrawButtonFlags nFlags ); - Size CalcMinimumSize( long nMaxWidth = 0 ) const; + Size CalcMinimumSize( tools::Long nMaxWidth = 0 ) const; virtual Size GetOptimalSize() const override; void SetToggleHdl( const Link<CheckBox&,void>& rLink ) { maToggleHdl = rLink; } diff --git a/include/vcl/toolkit/combobox.hxx b/include/vcl/toolkit/combobox.hxx index 172963beb33b..dc21395d7f68 100644 --- a/include/vcl/toolkit/combobox.hxx +++ b/include/vcl/toolkit/combobox.hxx @@ -46,7 +46,7 @@ protected: SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplCalcEditHeight(); - SAL_DLLPRIVATE long getMaxWidthScrollBarAndDownButton() const; + SAL_DLLPRIVATE tools::Long getMaxWidthScrollBarAndDownButton() const; protected: bool IsDropDownBox() const; @@ -71,7 +71,7 @@ public: virtual const Wallpaper& GetDisplayBackground() const override; - virtual void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All ) override; + virtual void setPosSizePixel( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, PosSizeFlags nFlags = PosSizeFlags::All ) override; tools::Rectangle GetDropDownPosSizePixel() const; @@ -176,13 +176,13 @@ public: if no item is at that point. */ using Control::GetIndexForPoint; - long GetIndexForPoint( const Point& rPoint, sal_Int32 & rPos ) const; + tools::Long GetIndexForPoint( const Point& rPoint, sal_Int32 & rPos ) const; void setMaxWidthChars(sal_Int32 nWidth); void SetWidthInChars(sal_Int32 nWidthInChars); - long GetDropDownEntryHeight() const; + tools::Long GetDropDownEntryHeight() const; virtual bool set_property(const OString &rKey, const OUString &rValue) override; diff --git a/include/vcl/toolkit/controllayout.hxx b/include/vcl/toolkit/controllayout.hxx index ffd643f640ee..53ffeab4b32c 100644 --- a/include/vcl/toolkit/controllayout.hxx +++ b/include/vcl/toolkit/controllayout.hxx @@ -50,15 +50,15 @@ struct VCL_DLLPUBLIC ControlLayoutData ControlLayoutData(); ~ControlLayoutData(); - tools::Rectangle GetCharacterBounds( long nIndex ) const; + tools::Rectangle GetCharacterBounds( tools::Long nIndex ) const; // returns the character index for corresponding to rPoint (in control coordinates) // -1 is returned if no character is at that point - long GetIndexForPoint( const Point& rPoint ) const; + tools::Long GetIndexForPoint( const Point& rPoint ) const; // returns the number of lines in the result of GetDisplayText() - long GetLineCount() const; + tools::Long GetLineCount() const; // returns the interval [start,end] of line nLine // returns [-1,-1] for an invalid line - ::Pair GetLineStartEnd( long nLine ) const; + ::Pair GetLineStartEnd( tools::Long nLine ) const; /** ToRelativeLineIndex changes a layout data index to a count relative to its line. This is equivalent to getting the line start/end pairs with @@ -71,7 +71,7 @@ struct VCL_DLLPUBLIC ControlLayoutData the relative index inside the displayed line or -1 if the absolute index does not match any line */ - long ToRelativeLineIndex( long nIndex ) const; + tools::Long ToRelativeLineIndex( tools::Long nIndex ) const; }; } // namespace vcl diff --git a/include/vcl/toolkit/dialog.hxx b/include/vcl/toolkit/dialog.hxx index c663f21a2e03..3c519d0a5004 100644 --- a/include/vcl/toolkit/dialog.hxx +++ b/include/vcl/toolkit/dialog.hxx @@ -49,7 +49,7 @@ public: private: std::unique_ptr<DialogImpl> mpDialogImpl; - long mnMousePositioned; + tools::Long mnMousePositioned; bool mbInExecute; bool mbInSyncExecute; bool mbInClose; @@ -134,7 +134,7 @@ public: // Dialog::Execute replacement API - void EndDialog( long nResult = RET_CANCEL ); + void EndDialog( tools::Long nResult = RET_CANCEL ); void GetDrawWindowBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const; diff --git a/include/vcl/toolkit/edit.hxx b/include/vcl/toolkit/edit.hxx index c2a6f305fb2a..99631d3a3dea 100644 --- a/include/vcl/toolkit/edit.hxx +++ b/include/vcl/toolkit/edit.hxx @@ -63,7 +63,7 @@ private: OUString maPlaceholderText; OUString maSaveValue; OUString maUndoText; - long mnXOffset; + tools::Long mnXOffset; Selection maSelection; sal_uInt16 mnAlign; sal_Int32 mnMaxTextLen; @@ -95,7 +95,7 @@ private: SAL_DLLPRIVATE void ImplSetText( const OUString& rStr, const Selection* pNewSelection ); SAL_DLLPRIVATE void ImplInsertText( const OUString& rStr, const Selection* pNewSelection = nullptr, bool bIsUserInput = false ); SAL_DLLPRIVATE static OUString ImplGetValidString( const OUString& rString ); - SAL_DLLPRIVATE void ImplClearBackground(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRectangle, long nXStart, long nXEnd); + SAL_DLLPRIVATE void ImplClearBackground(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRectangle, tools::Long nXStart, tools::Long nXEnd); SAL_DLLPRIVATE void ImplPaintBorder(vcl::RenderContext const & rRenderContext); SAL_DLLPRIVATE void ImplShowCursor( bool bOnlyIfVisible = true ); SAL_DLLPRIVATE void ImplAlign(); @@ -108,7 +108,7 @@ private: SAL_DLLPRIVATE void ImplCopyToSelectionClipboard(); SAL_DLLPRIVATE void ImplCopy(css::uno::Reference<css::datatransfer::clipboard::XClipboard> const & rxClipboard); SAL_DLLPRIVATE void ImplPaste(css::uno::Reference<css::datatransfer::clipboard::XClipboard> const & rxClipboard); - SAL_DLLPRIVATE long ImplGetTextYPosition() const; + SAL_DLLPRIVATE tools::Long ImplGetTextYPosition() const; SAL_DLLPRIVATE css::uno::Reference<css::i18n::XExtendedInputSequenceChecker> const& ImplGetInputSequenceChecker(); SAL_DLLPRIVATE css::uno::Reference<css::i18n::XBreakIterator> const& ImplGetBreakIterator(); SAL_DLLPRIVATE void filterText(); @@ -120,8 +120,8 @@ protected: SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplSetSelection( const Selection& rSelection, bool bPaint = true ); SAL_DLLPRIVATE ControlType ImplGetNativeControlType() const; - SAL_DLLPRIVATE long ImplGetExtraXOffset() const; - SAL_DLLPRIVATE long ImplGetExtraYOffset() const; + SAL_DLLPRIVATE tools::Long ImplGetExtraXOffset() const; + SAL_DLLPRIVATE tools::Long ImplGetExtraYOffset() const; static SAL_DLLPRIVATE void ImplInvalidateOutermostBorder( vcl::Window* pWin ); css::uno::Reference<css::datatransfer::dnd::XDragSourceListener > mxDnDListener; diff --git a/include/vcl/toolkit/fixedhyper.hxx b/include/vcl/toolkit/fixedhyper.hxx index cb4e6bae2957..75516984bce0 100644 --- a/include/vcl/toolkit/fixedhyper.hxx +++ b/include/vcl/toolkit/fixedhyper.hxx @@ -31,7 +31,7 @@ class UNLESS_MERGELIBS(VCL_DLLPUBLIC) FixedHyperlink final : public FixedText { private: - long m_nTextLen; + tools::Long m_nTextLen; PointerStyle m_aOldPointer; Link<FixedHyperlink&,void> m_aClickHdl; OUString m_sURL; diff --git a/include/vcl/toolkit/ivctrl.hxx b/include/vcl/toolkit/ivctrl.hxx index 67efcf09da34..f4c50b48c84d 100644 --- a/include/vcl/toolkit/ivctrl.hxx +++ b/include/vcl/toolkit/ivctrl.hxx @@ -126,15 +126,15 @@ public: class SvxIconChoiceCtrlColumnInfo { - long nWidth; + tools::Long nWidth; public: SvxIconChoiceCtrlColumnInfo() : nWidth( 100 ) {} SvxIconChoiceCtrlColumnInfo( const SvxIconChoiceCtrlColumnInfo& ); - void SetWidth( long nWd ) { nWidth = nWd; } - long GetWidth() const { return nWidth; } + void SetWidth( tools::Long nWd ) { nWidth = nWd; } + tools::Long GetWidth() const { return nWidth; } }; diff --git a/include/vcl/toolkit/lstbox.hxx b/include/vcl/toolkit/lstbox.hxx index 01f76b58a3bd..fe67d90569cf 100644 --- a/include/vcl/toolkit/lstbox.hxx +++ b/include/vcl/toolkit/lstbox.hxx @@ -138,8 +138,8 @@ public: virtual const Wallpaper& GetDisplayBackground() const override; - virtual void setPosSizePixel( long nX, long nY, - long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All ) override; + virtual void setPosSizePixel( tools::Long nX, tools::Long nY, + tools::Long nWidth, tools::Long nHeight, PosSizeFlags nFlags = PosSizeFlags::All ) override; tools::Rectangle GetDropDownPosSizePixel() const; @@ -246,7 +246,7 @@ public: if no item is at that point. */ using Control::GetIndexForPoint; - long GetIndexForPoint( const Point& rPoint, sal_Int32 & rPos ) const; + tools::Long GetIndexForPoint( const Point& rPoint, sal_Int32 & rPos ) const; void setMaxWidthChars(sal_Int32 nWidth); diff --git a/include/vcl/toolkit/prgsbar.hxx b/include/vcl/toolkit/prgsbar.hxx index 7f248b19a210..3c0e121b0b0e 100644 --- a/include/vcl/toolkit/prgsbar.hxx +++ b/include/vcl/toolkit/prgsbar.hxx @@ -55,8 +55,8 @@ class UNLESS_MERGELIBS(VCL_DLLPUBLIC) ProgressBar final : public vcl::Window { private: Point maPos; - long mnPrgsWidth; - long mnPrgsHeight; + tools::Long mnPrgsWidth; + tools::Long mnPrgsHeight; sal_uInt16 mnPercent; sal_uInt16 mnPercentCount; bool mbCalcNew; diff --git a/include/vcl/toolkit/spin.hxx b/include/vcl/toolkit/spin.hxx index cc68f9d87e4c..6b152bbc16f8 100644 --- a/include/vcl/toolkit/spin.hxx +++ b/include/vcl/toolkit/spin.hxx @@ -43,10 +43,10 @@ private: bool mbInitialDown : 1; bool mbHorz : 1; bool mbUpperIsFocused : 1; - long mnMinRange; - long mnMaxRange; - long mnValue; - long mnValueStep; + tools::Long mnMinRange; + tools::Long mnMaxRange; + tools::Long mnValue; + tools::Long mnValueStep; SAL_DLLPRIVATE tools::Rectangle* ImplFindPartRect( const Point& rPt ); using Window::ImplInit; @@ -70,15 +70,15 @@ public: virtual void GetFocus() override; virtual void LoseFocus() override; - void SetRangeMin( long nNewRange ); - long GetRangeMin() const { return mnMinRange; } - void SetRangeMax( long nNewRange ); - long GetRangeMax() const { return mnMaxRange; } + void SetRangeMin( tools::Long nNewRange ); + tools::Long GetRangeMin() const { return mnMinRange; } + void SetRangeMax( tools::Long nNewRange ); + tools::Long GetRangeMax() const { return mnMaxRange; } void SetRange( const Range& rRange ); - void SetValue( long nValue ); - long GetValue() const { return mnValue; } - void SetValueStep( long nNewStep ) { mnValueStep = nNewStep; } - long GetValueStep() const { return mnValueStep; } + void SetValue( tools::Long nValue ); + tools::Long GetValue() const { return mnValue; } + void SetValueStep( tools::Long nNewStep ) { mnValueStep = nNewStep; } + tools::Long GetValueStep() const { return mnValueStep; } virtual bool PreNotify( NotifyEvent& rNEvt ) override; private: diff --git a/include/vcl/toolkit/svlbitm.hxx b/include/vcl/toolkit/svlbitm.hxx index fa36fe88f9f6..ccb0f64301e5 100644 --- a/include/vcl/toolkit/svlbitm.hxx +++ b/include/vcl/toolkit/svlbitm.hxx @@ -63,8 +63,8 @@ class VCL_DLLPUBLIC SvLBoxButtonData { private: Link<SvLBoxButtonData*,void> aLink; - long nWidth; - long nHeight; + tools::Long nWidth; + tools::Long nHeight; std::unique_ptr<SvLBoxButtonData_Impl> pImpl; bool bDataOk; std::vector<Image> aBmps; // indices s. constants BMP_... @@ -78,8 +78,8 @@ public: ~SvLBoxButtonData(); static SvBmp GetIndex( SvItemStateFlags nItemState ); - long Width(); - long Height(); + tools::Long Width(); + tools::Long Height(); void SetLink( const Link<SvLBoxButtonData*,void>& rLink) { aLink=rLink; } bool IsRadio() const; // as buttons are not derived from LinkHdl diff --git a/include/vcl/toolkit/svtabbx.hxx b/include/vcl/toolkit/svtabbx.hxx index e73cbc47c1e2..c1545c3a7c60 100644 --- a/include/vcl/toolkit/svtabbx.hxx +++ b/include/vcl/toolkit/svtabbx.hxx @@ -58,9 +58,9 @@ public: SvTabListBox( vcl::Window* pParent, WinBits ); virtual ~SvTabListBox() override; virtual void dispose() override; - void SetTabs(sal_uInt16 nTabs, long const pTabPositions[], MapUnit = MapUnit::MapAppFont); + void SetTabs(sal_uInt16 nTabs, tools::Long const pTabPositions[], MapUnit = MapUnit::MapAppFont); using SvTreeListBox::GetTab; - long GetLogicTab( sal_uInt16 nTab ); + tools::Long GetLogicTab( sal_uInt16 nTab ); virtual SvTreeListEntry* InsertEntry( const OUString& rText, SvTreeListEntry* pParent = nullptr, bool bChildrenOnDemand = false, @@ -133,10 +133,10 @@ public: // Accessible ------------------------------------------------------------- - bool IsCellCheckBox( long _nRow, sal_uInt16 _nColumn, TriState& _rState ); + bool IsCellCheckBox( tools::Long _nRow, sal_uInt16 _nColumn, TriState& _rState ); /** @return The count of the rows. */ - virtual long GetRowCount() const override; + virtual tools::Long GetRowCount() const override; /** @return The count of the columns. */ virtual sal_uInt16 GetColumnCount() const override; @@ -160,19 +160,19 @@ public: virtual void SetNoSelection() override; using SvTabListBox::SelectAll; virtual void SelectAll() override; - virtual void SelectRow( long _nRow, bool _bSelect = true, bool bExpand = true ) override; + virtual void SelectRow( tools::Long _nRow, bool _bSelect = true, bool bExpand = true ) override; virtual void SelectColumn( sal_uInt16 _nColumn, bool _bSelect = true ) override; virtual sal_Int32 GetSelectedRowCount() const override; virtual sal_Int32 GetSelectedColumnCount() const override; /** @return <TRUE/>, if the row is selected. */ - virtual bool IsRowSelected( long _nRow ) const override; - virtual bool IsColumnSelected( long _nColumn ) const override; + virtual bool IsRowSelected( tools::Long _nRow ) const override; + virtual bool IsColumnSelected( tools::Long _nColumn ) const override; virtual void GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const override; virtual void GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const override; /** @return <TRUE/>, if the cell is visible. */ virtual bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const override; - virtual OUString GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const override; + virtual OUString GetAccessibleCellText( tools::Long _nRow, sal_uInt16 _nColumnPos ) const override; virtual tools::Rectangle calcHeaderRect( bool _bIsColumnBar, bool _bOnScreen = true ) override; virtual tools::Rectangle calcTableRect( bool _bOnScreen = true ) override; diff --git a/include/vcl/toolkit/treelistbox.hxx b/include/vcl/toolkit/treelistbox.hxx index 3ef56b39d67c..379401ac7ea5 100644 --- a/include/vcl/toolkit/treelistbox.hxx +++ b/include/vcl/toolkit/treelistbox.hxx @@ -102,19 +102,19 @@ enum class SvLBoxItemType {String, Button, ContextBmp}; class SvLBoxTab { - long nPos; + tools::Long nPos; public: SvLBoxTab(); - SvLBoxTab( long nPos, SvLBoxTabFlags nFlags ); + SvLBoxTab( tools::Long nPos, SvLBoxTabFlags nFlags ); SvLBoxTab( const SvLBoxTab& ); ~SvLBoxTab(); SvLBoxTabFlags nFlags; bool IsDynamic() const { return bool(nFlags & SvLBoxTabFlags::DYNAMIC); } - void SetPos( long nNewPos) { nPos = nNewPos; } - long GetPos() const { return nPos; } - long CalcOffset( long nItemLength, long nTabWidth ); + void SetPos( tools::Long nNewPos) { nPos = nNewPos; } + tools::Long GetPos() const { return nPos; } + tools::Long CalcOffset( tools::Long nItemLength, tools::Long nTabWidth ); bool IsEditable() const { return bool(nFlags & SvLBoxTabFlags::EDITABLE); } }; @@ -214,7 +214,7 @@ class VCL_DLLPUBLIC SvTreeListBox short nFocusWidth; sal_uInt16 nFirstSelTab; sal_uInt16 nLastSelTab; - long mnCheckboxItemWidth; + tools::Long mnCheckboxItemWidth; bool mbContextBmpExpanded; bool mbAlternatingRowColors; bool mbUpdateAlternatingRows; @@ -475,10 +475,10 @@ protected: VCL_DLLPRIVATE void AdjustEntryHeight(); VCL_DLLPRIVATE void ImpEntryInserted( SvTreeListEntry* pEntry ); - VCL_DLLPRIVATE void PaintEntry1( SvTreeListEntry&, long nLine, vcl::RenderContext& rRenderContext ); + VCL_DLLPRIVATE void PaintEntry1( SvTreeListEntry&, tools::Long nLine, vcl::RenderContext& rRenderContext ); VCL_DLLPRIVATE void InitTreeView(); - VCL_DLLPRIVATE SvLBoxItem* GetItem_Impl( SvTreeListEntry*, long nX, SvLBoxTab** ppTab ); + VCL_DLLPRIVATE SvLBoxItem* GetItem_Impl( SvTreeListEntry*, tools::Long nX, SvLBoxTab** ppTab ); VCL_DLLPRIVATE void ImplInitStyle(); void SetupDragOrigin(); @@ -489,7 +489,7 @@ protected: // Recalculate all tabs depending on TreeListStyle and Bitmap sizes // Is called automatically when inserting/changing Bitmaps, changing the Model etc. virtual void SetTabs(); - void AddTab( long nPos, SvLBoxTabFlags nFlags ); + void AddTab( tools::Long nPos, SvLBoxTabFlags nFlags ); sal_uInt16 TabCount() const { return aTabs.size(); } SvLBoxTab* GetFirstDynamicTab() const; SvLBoxTab* GetFirstDynamicTab( sal_uInt16& rTabPos ) const; @@ -502,7 +502,7 @@ protected: void NotifyScrolled(); void SetScrolledHdl( const Link<SvTreeListBox*,void>& rLink ) { aScrolledHdl = rLink; } - long GetXOffset() const { return GetMapMode().GetOrigin().X(); } + tools::Long GetXOffset() const { return GetMapMode().GetOrigin().X(); } virtual void Command( const CommandEvent& rCEvt ) override; @@ -629,12 +629,12 @@ public: SvTreeListEntry* GetEntry( const Point& rPos, bool bHit = false ) const; - virtual tools::Rectangle GetFocusRect(const SvTreeListEntry*, long nLine ); + virtual tools::Rectangle GetFocusRect(const SvTreeListEntry*, tools::Long nLine ); // Respects indentation sal_IntPtr GetTabPos(const SvTreeListEntry*, const SvLBoxTab*); void InvalidateEntry( SvTreeListEntry* ); - SvLBoxItem* GetItem( SvTreeListEntry*, long nX, SvLBoxTab** ppTab); - SvLBoxItem* GetItem( SvTreeListEntry*, long nX ); + SvLBoxItem* GetItem( SvTreeListEntry*, tools::Long nX, SvLBoxTab** ppTab); + SvLBoxItem* GetItem( SvTreeListEntry*, tools::Long nX ); void SetDragDropMode( DragDropMode ); void SetSelectionMode( SelectionMode ); @@ -662,9 +662,9 @@ public: SvTreeListEntry* GetFirstEntryInView() const; SvTreeListEntry* GetNextEntryInView(SvTreeListEntry*) const; - void ScrollToAbsPos( long nPos ); + void ScrollToAbsPos( tools::Long nPos ); - long getPreferredDimensions(std::vector<long> &rWidths) const; + tools::Long getPreferredDimensions(std::vector<long> &rWidths) const; virtual Size GetOptimalSize() const override; diff --git a/include/vcl/toolkit/vclmedit.hxx b/include/vcl/toolkit/vclmedit.hxx index 8a0088ab156d..e5e32244c32b 100644 --- a/include/vcl/toolkit/vclmedit.hxx +++ b/include/vcl/toolkit/vclmedit.hxx @@ -118,7 +118,7 @@ public: virtual void SetMaxTextLen(sal_Int32 nMaxLen) override; virtual sal_Int32 GetMaxTextLen() const override; - void SetMaxTextWidth(long nMaxWidth); + void SetMaxTextWidth(tools::Long nMaxWidth); virtual void SetSelection( const Selection& rSelection ) override; virtual const Selection& GetSelection() const override; diff --git a/include/vcl/vcllayout.hxx b/include/vcl/vcllayout.hxx index 1d6aa9f174f5..ea8da12b7a9d 100644 --- a/include/vcl/vcllayout.hxx +++ b/include/vcl/vcllayout.hxx @@ -84,7 +84,7 @@ public: virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra, int nFactor) const = 0; virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const = 0; virtual DeviceCoordinate GetTextWidth() const { return FillDXArray( nullptr ); } - virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const = 0; + virtual void GetCaretPositions( int nArraySize, tools::Long* pCaretXArray ) const = 0; virtual bool IsKashidaPosValid ( int /*nCharPos*/ ) const { return true; } // i60594 // methods using glyph indexing diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx index 0268e49a1b1e..b13a2a0d9ef8 100644 --- a/include/vcl/virdev.hxx +++ b/include/vcl/virdev.hxx @@ -55,7 +55,7 @@ private: RefDevMode meRefDevMode; bool mbForceZeroExtleadBug; - SAL_DLLPRIVATE void ImplInitVirDev( const OutputDevice* pOutDev, long nDX, long nDY, const SystemGraphicsData *pData = nullptr ); + SAL_DLLPRIVATE void ImplInitVirDev( const OutputDevice* pOutDev, tools::Long nDX, tools::Long nDY, const SystemGraphicsData *pData = nullptr ); SAL_DLLPRIVATE bool InnerImplSetOutputSizePixel( const Size& rNewSize, bool bErase, sal_uInt8* pBuffer ); SAL_DLLPRIVATE bool ImplSetOutputSizePixel( const Size& rNewSize, bool bErase, @@ -185,7 +185,7 @@ private: protected: virtual bool UsePolyPolygonForComplexGradient() override; - virtual long GetFontExtLeading() const override; + virtual tools::Long GetFontExtLeading() const override; }; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index bb2d7355b0d8..48b7f1137f69 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -473,7 +473,7 @@ public: static void DrawSelectionBackground(vcl::RenderContext& rRenderContext, vcl::Window const & rWindow, const tools::Rectangle& rRect, sal_uInt16 nHighlight, bool bChecked, bool bDrawBorder, bool bDrawExtBorderOnly, - Color* pSelectionTextColor = nullptr, long nCornerRadius = 0, + Color* pSelectionTextColor = nullptr, tools::Long nCornerRadius = 0, Color const * pPaintColor = nullptr); }; @@ -581,7 +581,7 @@ public: SAL_DLLPRIVATE void ImplMirrorFramePos( Point &pt ) const; - SAL_DLLPRIVATE void ImplPosSizeWindow( long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags ); + SAL_DLLPRIVATE void ImplPosSizeWindow( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, PosSizeFlags nFlags ); SAL_DLLPRIVATE void ImplCallResize(); SAL_DLLPRIVATE void ImplCallMove(); @@ -603,8 +603,8 @@ protected: SAL_DLLPRIVATE void ImplInvalidateParentFrameRegion( vcl::Region& rRegion ); SAL_DLLPRIVATE void ImplValidateFrameRegion( const vcl::Region* rRegion, ValidateFlags nFlags ); SAL_DLLPRIVATE void ImplValidate(); - SAL_DLLPRIVATE void ImplMoveInvalidateRegion( const tools::Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren ); - SAL_DLLPRIVATE void ImplMoveAllInvalidateRegions( const tools::Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren ); + SAL_DLLPRIVATE void ImplMoveInvalidateRegion( const tools::Rectangle& rRect, tools::Long nHorzScroll, tools::Long nVertScroll, bool bChildren ); + SAL_DLLPRIVATE void ImplMoveAllInvalidateRegions( const tools::Rectangle& rRect, tools::Long nHorzScroll, tools::Long nVertScroll, bool bChildren ); SAL_DLLPRIVATE vcl::Window* ImplGetBorderWindow() const; @@ -614,7 +614,7 @@ protected: SAL_DLLPRIVATE void ImplSetMouseTransparent( bool bTransparent ); - SAL_DLLPRIVATE void ImplScroll( const tools::Rectangle& rRect, long nHorzScroll, long nVertScroll, ScrollFlags nFlags ); + SAL_DLLPRIVATE void ImplScroll( const tools::Rectangle& rRect, tools::Long nHorzScroll, tools::Long nVertScroll, ScrollFlags nFlags ); SAL_DLLPRIVATE bool ImplSetClipFlagChildren( bool bSysObjOnlySmaller ); SAL_DLLPRIVATE bool ImplSetClipFlagOverlapWindows( bool bSysObjOnlySmaller = false ); @@ -718,7 +718,7 @@ private: SAL_DLLPRIVATE static void ImplHandleScroll(ScrollBar* pHScrl, double nX, ScrollBar* pVScrl, double nY); SAL_DLLPRIVATE tools::Rectangle ImplOutputToUnmirroredAbsoluteScreenPixel( const tools::Rectangle& rRect ) const; - SAL_DLLPRIVATE long ImplGetUnmirroredOutOffX(); + SAL_DLLPRIVATE tools::Long ImplGetUnmirroredOutOffX(); // retrieves the list of owner draw decorated windows for this window hierarchy SAL_DLLPRIVATE ::std::vector<VclPtr<vcl::Window> >& ImplGetOwnerDrawList(); @@ -858,7 +858,7 @@ public: sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const; Size CalcWindowSize( const Size& rOutSz ) const; Size CalcOutputSize( const Size& rWinSz ) const; - long CalcTitleWidth() const; + tools::Long CalcTitleWidth() const; void EnableClipSiblings( bool bClipSiblings = true ); @@ -886,11 +886,11 @@ public: const InputContext& GetInputContext() const; void PostExtTextInputEvent(VclEventId nType, const OUString& rText); void EndExtTextInput(); - void SetCursorRect( const tools::Rectangle* pRect = nullptr, long nExtTextInputWidth = 0 ); + void SetCursorRect( const tools::Rectangle* pRect = nullptr, tools::Long nExtTextInputWidth = 0 ); const tools::Rectangle* GetCursorRect() const; - long GetCursorExtTextInputWidth() const; + tools::Long GetCursorExtTextInputWidth() const; - void SetCompositionCharRect( const tools::Rectangle* pRect, long nCompositionLength, bool bVertical = false ); + void SetCompositionCharRect( const tools::Rectangle* pRect, tools::Long nCompositionLength, bool bVertical = false ); using ::OutputDevice::SetSettings; virtual void SetSettings( const AllSettings& rSettings ) override; @@ -901,7 +901,7 @@ public: void SetPointFont(vcl::RenderContext& rRenderContext, const vcl::Font& rFont); vcl::Font GetPointFont(vcl::RenderContext const & rRenderContext) const; void SetZoomedPointFont(vcl::RenderContext& rRenderContext, const vcl::Font& rFont); - long GetDrawPixel( ::OutputDevice const * pDev, long nPixels ) const; + tools::Long GetDrawPixel( ::OutputDevice const * pDev, tools::Long nPixels ) const; vcl::Font GetDrawPixelFont( ::OutputDevice const * pDev ) const; void SetControlFont(); @@ -988,8 +988,8 @@ public: void EnableAlwaysOnTop( bool bEnable = true ); bool IsAlwaysOnTopEnabled() const; - virtual void setPosSizePixel( long nX, long nY, - long nWidth, long nHeight, + virtual void setPosSizePixel( tools::Long nX, tools::Long nY, + tools::Long nWidth, tools::Long nHeight, PosSizeFlags nFlags = PosSizeFlags::All ); virtual void SetPosPixel( const Point& rNewPos ); virtual Point GetPosPixel() const; @@ -1015,9 +1015,9 @@ public: tools::Rectangle GetWindowExtentsRelative(const vcl::Window *pRelativeWindow) const; bool IsScrollable() const; - virtual void Scroll( long nHorzScroll, long nVertScroll, + virtual void Scroll( tools::Long nHorzScroll, tools::Long nVertScroll, ScrollFlags nFlags = ScrollFlags::NONE ); - void Scroll( long nHorzScroll, long nVertScroll, + void Scroll( tools::Long nHorzScroll, tools::Long nVertScroll, const tools::Rectangle& rRect, ScrollFlags nFlags = ScrollFlags::NONE ); virtual void Invalidate( InvalidateFlags nFlags = InvalidateFlags::NONE ); virtual void Invalidate( const tools::Rectangle& rRect, InvalidateFlags nFlags = InvalidateFlags::NONE ); @@ -1097,7 +1097,7 @@ public: void SetZoom( const Fraction& rZoom ); const Fraction& GetZoom() const; bool IsZoom() const; - long CalcZoom( long n ) const; + tools::Long CalcZoom( tools::Long n ) const; virtual void SetText( const OUString& rStr ); virtual OUString GetText() const; |