diff options
Diffstat (limited to 'vcl/inc')
71 files changed, 665 insertions, 628 deletions
diff --git a/vcl/inc/FileDefinitionWidgetDraw.hxx b/vcl/inc/FileDefinitionWidgetDraw.hxx index 68f5d348901d..fc99471ba336 100644 --- a/vcl/inc/FileDefinitionWidgetDraw.hxx +++ b/vcl/inc/FileDefinitionWidgetDraw.hxx @@ -26,8 +26,8 @@ private: std::shared_ptr<WidgetDefinition> m_pWidgetDefinition; bool resolveDefinition(ControlType eType, ControlPart ePart, ControlState eState, - const ImplControlValue& rValue, long nX, long nY, long nWidth, - long nHeight); + const ImplControlValue& rValue, tools::Long nX, tools::Long nY, + tools::Long nWidth, tools::Long nHeight); public: FileDefinitionWidgetDraw(SalGraphics& rGraphics); diff --git a/vcl/inc/PhysicalFontFace.hxx b/vcl/inc/PhysicalFontFace.hxx index b6c0be37d99c..4ecc751b5445 100644 --- a/vcl/inc/PhysicalFontFace.hxx +++ b/vcl/inc/PhysicalFontFace.hxx @@ -22,6 +22,7 @@ #include <salhelper/simplereferenceobject.hxx> #include <rtl/ref.hxx> +#include <tools/long.hxx> #include <vcl/dllapi.h> #include <vcl/fontcharmap.hxx> @@ -76,8 +77,8 @@ protected: explicit PhysicalFontFace(const FontAttributes&); void SetBitmapSize( int nW, int nH ) { mnWidth=nW; mnHeight=nH; } - long mnWidth; // Width (in pixels) - long mnHeight; // Height (in pixels) + tools::Long mnWidth; // Width (in pixels) + tools::Long mnHeight; // Height (in pixels) }; #endif // INCLUDED_VCL_INC_PHYSICALFONTFACE_HXX diff --git a/vcl/inc/WidgetThemeLibrary.hxx b/vcl/inc/WidgetThemeLibrary.hxx index ace74a49a965..9a593e6dc6a2 100644 --- a/vcl/inc/WidgetThemeLibrary.hxx +++ b/vcl/inc/WidgetThemeLibrary.hxx @@ -110,8 +110,8 @@ typedef struct WidgetThemeLibrary_t WidgetThemeLibrary; typedef struct _rectangle { - long x, y; - long width, height; + tools::Long x, y; + tools::Long width, height; } rectangle_t; struct WidgetThemeLibrary_t @@ -123,29 +123,50 @@ struct WidgetThemeLibrary_t const rectangle_t& rBoundingControlRegion, rectangle_t& rNativeBoundingRegion, rectangle_t& rNativeContentRegion); - bool (*drawPushButton)(ControlDrawParameters const& rParameters, long nWidth, long nHeight); - bool (*drawRadiobutton)(ControlDrawParameters const& rParameters, long nWidth, long nHeight); - bool (*drawCheckbox)(ControlDrawParameters const& rParameters, long nWidth, long nHeight); - bool (*drawCombobox)(ControlDrawParameters const& rParameters, long nWidth, long nHeight); - bool (*drawEditbox)(ControlDrawParameters const& rParameters, long nWidth, long nHeight); - bool (*drawScrollbar)(ControlDrawParameters const& rParameters, long nWidth, long nHeight); - bool (*drawSpinButtons)(ControlDrawParameters const& rParameters, long nWidth, long nHeight); - bool (*drawSpinbox)(ControlDrawParameters const& rParameters, long nWidth, long nHeight); - bool (*drawTabItem)(ControlDrawParameters const& rParameters, long nWidth, long nHeight); - bool (*drawTabPane)(ControlDrawParameters const& rParameters, long nWidth, long nHeight); - bool (*drawTabHeader)(ControlDrawParameters const& rParameters, long nWidth, long nHeight); - bool (*drawTabBody)(ControlDrawParameters const& rParameters, long nWidth, long nHeight); - bool (*drawSlider)(ControlDrawParameters const& rParameters, long nWidth, long nHeight); - bool (*drawFixedline)(ControlDrawParameters const& rParameters, long nWidth, long nHeight); - bool (*drawToolbar)(ControlDrawParameters const& rParameters, long nWidth, long nHeight); - bool (*drawProgress)(ControlDrawParameters const& rParameters, long nWidth, long nHeight); - bool (*drawWindowsBackground)(ControlDrawParameters const& rParameters, long nWidth, - long nHeight); - bool (*drawListbox)(ControlDrawParameters const& rParameters, long nWidth, long nHeight); - bool (*drawFrame)(ControlDrawParameters const& rParameters, long nWidth, long nHeight); - bool (*drawListNode)(ControlDrawParameters const& rParameters, long nWidth, long nHeight); - bool (*drawListNet)(ControlDrawParameters const& rParameters, long nWidth, long nHeight); - bool (*drawListHeader)(ControlDrawParameters const& rParameters, long nWidth, long nHeight); + bool (*drawPushButton)(ControlDrawParameters const& rParameters, tools::Long nWidth, + tools::Long nHeight); + bool (*drawRadiobutton)(ControlDrawParameters const& rParameters, tools::Long nWidth, + tools::Long nHeight); + bool (*drawCheckbox)(ControlDrawParameters const& rParameters, tools::Long nWidth, + tools::Long nHeight); + bool (*drawCombobox)(ControlDrawParameters const& rParameters, tools::Long nWidth, + tools::Long nHeight); + bool (*drawEditbox)(ControlDrawParameters const& rParameters, tools::Long nWidth, + tools::Long nHeight); + bool (*drawScrollbar)(ControlDrawParameters const& rParameters, tools::Long nWidth, + tools::Long nHeight); + bool (*drawSpinButtons)(ControlDrawParameters const& rParameters, tools::Long nWidth, + tools::Long nHeight); + bool (*drawSpinbox)(ControlDrawParameters const& rParameters, tools::Long nWidth, + tools::Long nHeight); + bool (*drawTabItem)(ControlDrawParameters const& rParameters, tools::Long nWidth, + tools::Long nHeight); + bool (*drawTabPane)(ControlDrawParameters const& rParameters, tools::Long nWidth, + tools::Long nHeight); + bool (*drawTabHeader)(ControlDrawParameters const& rParameters, tools::Long nWidth, + tools::Long nHeight); + bool (*drawTabBody)(ControlDrawParameters const& rParameters, tools::Long nWidth, + tools::Long nHeight); + bool (*drawSlider)(ControlDrawParameters const& rParameters, tools::Long nWidth, + tools::Long nHeight); + bool (*drawFixedline)(ControlDrawParameters const& rParameters, tools::Long nWidth, + tools::Long nHeight); + bool (*drawToolbar)(ControlDrawParameters const& rParameters, tools::Long nWidth, + tools::Long nHeight); + bool (*drawProgress)(ControlDrawParameters const& rParameters, tools::Long nWidth, + tools::Long nHeight); + bool (*drawWindowsBackground)(ControlDrawParameters const& rParameters, tools::Long nWidth, + tools::Long nHeight); + bool (*drawListbox)(ControlDrawParameters const& rParameters, tools::Long nWidth, + tools::Long nHeight); + bool (*drawFrame)(ControlDrawParameters const& rParameters, tools::Long nWidth, + tools::Long nHeight); + bool (*drawListNode)(ControlDrawParameters const& rParameters, tools::Long nWidth, + tools::Long nHeight); + bool (*drawListNet)(ControlDrawParameters const& rParameters, tools::Long nWidth, + tools::Long nHeight); + bool (*drawListHeader)(ControlDrawParameters const& rParameters, tools::Long nWidth, + tools::Long nHeight); bool (*updateSettings)(WidgetDrawStyle& rStyle); }; diff --git a/vcl/inc/bitmap/impoctree.hxx b/vcl/inc/bitmap/impoctree.hxx index 06fbd69249d0..6b242a2a367c 100644 --- a/vcl/inc/bitmap/impoctree.hxx +++ b/vcl/inc/bitmap/impoctree.hxx @@ -24,9 +24,9 @@ class ImpErrorQuad { - long nRed; - long nGreen; - long nBlue; + tools::Long nRed; + tools::Long nGreen; + tools::Long nBlue; public: ImpErrorQuad() @@ -37,9 +37,9 @@ public: } ImpErrorQuad(const BitmapColor& rColor) - : nRed(long(rColor.GetRed()) << 5) - , nGreen(long(rColor.GetGreen()) << 5) - , nBlue(long(rColor.GetBlue()) << 5) + : nRed(tools::Long(rColor.GetRed()) << 5) + , nGreen(tools::Long(rColor.GetGreen()) << 5) + , nBlue(tools::Long(rColor.GetBlue()) << 5) { } @@ -56,16 +56,16 @@ public: inline void ImpErrorQuad::operator=(const BitmapColor& rColor) { - nRed = long(rColor.GetRed()) << 5; - nGreen = long(rColor.GetGreen()) << 5; - nBlue = long(rColor.GetBlue()) << 5; + nRed = tools::Long(rColor.GetRed()) << 5; + nGreen = tools::Long(rColor.GetGreen()) << 5; + nBlue = tools::Long(rColor.GetBlue()) << 5; } inline ImpErrorQuad& ImpErrorQuad::operator-=(const BitmapColor& rColor) { - nRed -= long(rColor.GetRed()) << 5; - nGreen -= long(rColor.GetGreen()) << 5; - nBlue -= long(rColor.GetBlue()) << 5; + nRed -= tools::Long(rColor.GetRed()) << 5; + nGreen -= tools::Long(rColor.GetGreen()) << 5; + nBlue -= tools::Long(rColor.GetBlue()) << 5; return *this; } diff --git a/vcl/inc/bitmapwriteaccess.hxx b/vcl/inc/bitmapwriteaccess.hxx index f747223ec3fd..f8916d800cc2 100644 --- a/vcl/inc/bitmapwriteaccess.hxx +++ b/vcl/inc/bitmapwriteaccess.hxx @@ -28,8 +28,8 @@ public: BitmapWriteAccess(Bitmap& rBitmap); virtual ~BitmapWriteAccess() override; - void CopyScanline(long nY, const BitmapReadAccess& rReadAcc); - void CopyScanline(long nY, ConstScanline aSrcScanline, ScanlineFormat nSrcScanlineFormat, + void CopyScanline(tools::Long nY, const BitmapReadAccess& rReadAcc); + void CopyScanline(tools::Long nY, ConstScanline aSrcScanline, ScanlineFormat nSrcScanlineFormat, sal_uInt32 nSrcScanlineSize); void SetPalette(const BitmapPalette& rPalette) @@ -54,7 +54,7 @@ public: mpBuffer->maPalette[nColor] = rBitmapColor; } - void SetPixel(long nY, long nX, const BitmapColor& rBitmapColor) + void SetPixel(tools::Long nY, tools::Long nX, const BitmapColor& rBitmapColor) { assert(mpBuffer && "Access is not valid!"); assert(nX < mpBuffer->mnWidth && "x-coordinate out of range!"); @@ -63,7 +63,7 @@ public: mFncSetPixel(GetScanline(nY), nX, rBitmapColor, maColorMask); } - void SetPixelIndex(long nY, long nX, sal_uInt8 cIndex) + void SetPixelIndex(tools::Long nY, tools::Long nX, sal_uInt8 cIndex) { SetPixel(nY, nX, BitmapColor(cIndex)); } diff --git a/vcl/inc/bmpfast.hxx b/vcl/inc/bmpfast.hxx index ebdb431fc941..3234f7a840c1 100644 --- a/vcl/inc/bmpfast.hxx +++ b/vcl/inc/bmpfast.hxx @@ -22,6 +22,7 @@ #include <vcl/dllapi.h> #include <vcl/Scanline.hxx> +#include <tools/long.hxx> class BitmapWriteAccess; class BitmapReadAccess; @@ -35,8 +36,8 @@ struct SalTwoRect; VCL_DLLPUBLIC bool ImplFastBitmapConversion( BitmapBuffer& rDst, const BitmapBuffer& rSrc, const SalTwoRect& rTwoRect ); -bool ImplFastCopyScanline( long nY, BitmapBuffer& rDst, const BitmapBuffer& rSrc); -bool ImplFastCopyScanline( long nY, BitmapBuffer& rDst, ConstScanline aSrcScanline, +bool ImplFastCopyScanline( tools::Long nY, BitmapBuffer& rDst, const BitmapBuffer& rSrc); +bool ImplFastCopyScanline( tools::Long nY, BitmapBuffer& rDst, ConstScanline aSrcScanline, ScanlineFormat nSrcScanlineFormat, sal_uInt32 nSrcScanlineSize); bool ImplFastBitmapBlending( BitmapWriteAccess const & rDst, diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx index 1dedce0e2ff2..b32fd963fb57 100644 --- a/vcl/inc/brdwin.hxx +++ b/vcl/inc/brdwin.hxx @@ -85,11 +85,11 @@ private: std::unique_ptr<ImplBorderWindowView> mpBorderView; VclPtr<vcl::Window> mpMenuBarWindow; VclPtr<NotebookBar> mpNotebookBar; - long mnMinWidth; - long mnMinHeight; - long mnMaxWidth; - long mnMaxHeight; - long mnOrgMenuHeight; + tools::Long mnMinWidth; + tools::Long mnMinHeight; + tools::Long mnMaxWidth; + tools::Long mnMaxHeight; + tools::Long mnOrgMenuHeight; BorderWindowTitleType mnTitleType; WindowBorderStyle mnBorderStyle; bool mbFloatWindow; @@ -159,14 +159,14 @@ public: void CloseNotebookBar(); const VclPtr<NotebookBar>& GetNotebookBar() const { return mpNotebookBar; } - void SetMinOutputSize( long nWidth, long nHeight ) + void SetMinOutputSize( tools::Long nWidth, tools::Long nHeight ) { mnMinWidth = nWidth; mnMinHeight = nHeight; } - void SetMaxOutputSize( long nWidth, long nHeight ) + void SetMaxOutputSize( tools::Long nWidth, tools::Long nHeight ) { mnMaxWidth = nWidth; mnMaxHeight = nHeight; } void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const; - long CalcTitleWidth() const; + tools::Long CalcTitleWidth() const; tools::Rectangle GetMenuRect() const; @@ -185,19 +185,19 @@ struct ImplBorderFrameData tools::Rectangle maHideRect; tools::Rectangle maHelpRect; Point maMouseOff; - long mnWidth; - long mnHeight; - long mnTrackX; - long mnTrackY; - long mnTrackWidth; - long mnTrackHeight; + tools::Long mnWidth; + tools::Long mnHeight; + tools::Long mnTrackX; + tools::Long mnTrackY; + tools::Long mnTrackWidth; + tools::Long mnTrackHeight; sal_Int32 mnLeftBorder; sal_Int32 mnTopBorder; sal_Int32 mnRightBorder; sal_Int32 mnBottomBorder; - long mnNoTitleTop; - long mnBorderSize; - long mnTitleHeight; + tools::Long mnNoTitleTop; + tools::Long mnBorderSize; + tools::Long mnTitleHeight; BorderWindowHitTest mnHitTest; DrawButtonFlags mnCloseState; DrawButtonFlags mnRollState; @@ -220,10 +220,10 @@ public: virtual bool Tracking( const TrackingEvent& rTEvt ); virtual OUString RequestHelp( const Point& rPos, tools::Rectangle& rHelpRect ); - virtual void Init( OutputDevice* pDev, long nWidth, long nHeight ) = 0; + virtual void Init( OutputDevice* pDev, tools::Long nWidth, tools::Long nHeight ) = 0; virtual void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const = 0; - virtual long CalcTitleWidth() const = 0; + virtual tools::Long CalcTitleWidth() const = 0; virtual void DrawWindow(vcl::RenderContext& rRenderContext, const Point* pOffset = nullptr) = 0; virtual tools::Rectangle GetMenuRect() const; @@ -231,7 +231,7 @@ public: static BorderWindowHitTest ImplHitTest( ImplBorderFrameData const * pData, const Point& rPos ); static void ImplMouseMove( ImplBorderFrameData* pData, const MouseEvent& rMEvt ); static OUString ImplRequestHelp( ImplBorderFrameData const * pData, const Point& rPos, tools::Rectangle& rHelpRect ); - static long ImplCalcTitleWidth( const ImplBorderFrameData* pData ); + static tools::Long ImplCalcTitleWidth( const ImplBorderFrameData* pData ); }; class ImplNoBorderWindowView final : public ImplBorderWindowView @@ -239,10 +239,10 @@ class ImplNoBorderWindowView final : public ImplBorderWindowView public: ImplNoBorderWindowView(); - virtual void Init( OutputDevice* pDev, long nWidth, long nHeight ) override; + virtual void Init( OutputDevice* pDev, tools::Long nWidth, tools::Long nHeight ) override; virtual void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const override; - virtual long CalcTitleWidth() const override; + virtual tools::Long CalcTitleWidth() const override; virtual void DrawWindow(vcl::RenderContext& rRenderContext, const Point* pOffset = nullptr) override; }; @@ -250,8 +250,8 @@ class ImplSmallBorderWindowView : public ImplBorderWindowView { VclPtr<ImplBorderWindow> mpBorderWindow; VclPtr<OutputDevice> mpOutDev; - long mnWidth; - long mnHeight; + tools::Long mnWidth; + tools::Long mnHeight; sal_Int32 mnLeftBorder; sal_Int32 mnTopBorder; sal_Int32 mnRightBorder; @@ -261,10 +261,10 @@ class ImplSmallBorderWindowView : public ImplBorderWindowView public: ImplSmallBorderWindowView( ImplBorderWindow* pBorderWindow ); - virtual void Init( OutputDevice* pOutDev, long nWidth, long nHeight ) override; + virtual void Init( OutputDevice* pOutDev, tools::Long nWidth, tools::Long nHeight ) override; virtual void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const override; - virtual long CalcTitleWidth() const override; + virtual tools::Long CalcTitleWidth() const override; virtual void DrawWindow(vcl::RenderContext& rRenderContext, const Point* pOffset = nullptr) override; }; @@ -282,10 +282,10 @@ public: virtual OUString RequestHelp( const Point& rPos, tools::Rectangle& rHelpRect ) override; virtual tools::Rectangle GetMenuRect() const override; - virtual void Init( OutputDevice* pDev, long nWidth, long nHeight ) override; + virtual void Init( OutputDevice* pDev, tools::Long nWidth, tools::Long nHeight ) override; virtual void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const override; - virtual long CalcTitleWidth() const override; + virtual tools::Long CalcTitleWidth() const override; virtual void DrawWindow(vcl::RenderContext& rRenderContext, const Point* pOffset = nullptr) override; }; diff --git a/vcl/inc/calendar.hxx b/vcl/inc/calendar.hxx index 46aea4c63c1f..fe49ec69b0d0 100644 --- a/vcl/inc/calendar.hxx +++ b/vcl/inc/calendar.hxx @@ -126,7 +126,7 @@ class Calendar final : public Control tools::Rectangle maPrevRect; tools::Rectangle maNextRect; OUString maDayOfWeekText; - long mnDayOfWeekAry[7]; + tools::Long mnDayOfWeekAry[7]; Date maOldFormatFirstDate; Date maOldFormatLastDate; Date maFirstDate; @@ -136,15 +136,15 @@ class Calendar final : public Control Color maSelColor; Color maOtherColor; sal_Int32 mnDayCount; - long mnDaysOffX; - long mnWeekDayOffY; - long mnDaysOffY; - long mnMonthHeight; - long mnMonthWidth; - long mnMonthPerLine; - long mnLines; - long mnDayWidth; - long mnDayHeight; + tools::Long mnDaysOffX; + tools::Long mnWeekDayOffY; + tools::Long mnDaysOffY; + tools::Long mnMonthHeight; + tools::Long mnMonthWidth; + tools::Long mnMonthPerLine; + tools::Long mnLines; + tools::Long mnDayWidth; + tools::Long mnDayHeight; WinBits mnWinStyle; sal_Int16 mnFirstYear; sal_Int16 mnLastYear; @@ -169,7 +169,7 @@ class Calendar final : public Control using Window::ImplHitTest; sal_uInt16 ImplHitTest( const Point& rPos, Date& rDate ) const; void ImplDrawSpin(vcl::RenderContext& rRenderContext); - void ImplDrawDate(vcl::RenderContext& rRenderContext, long nX, long nY, + void ImplDrawDate(vcl::RenderContext& rRenderContext, tools::Long nX, tools::Long nY, sal_uInt16 nDay, sal_uInt16 nMonth, sal_Int16 nYear, bool bOther, sal_Int32 nToday); void ImplDraw(vcl::RenderContext& rRenderContext); diff --git a/vcl/inc/fontinstance.hxx b/vcl/inc/fontinstance.hxx index 4aff50c9577e..f20c0abbdfe7 100644 --- a/vcl/inc/fontinstance.hxx +++ b/vcl/inc/fontinstance.hxx @@ -55,7 +55,7 @@ public: // TODO: make data members private ImplFontMetricDataRef mxFontMetric; // Font attributes const ConvertChar* mpConversion; // used e.g. for StarBats->StarSymbol - long mnLineHeight; + tools::Long mnLineHeight; short mnOwnOrientation; // text angle if lower layers don't rotate text themselves short mnOrientation; // text angle in 3600 system bool mbInit; // true if maFontMetric member is valid diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx index 51007916b43b..cdcdcc0b1a73 100644 --- a/vcl/inc/headless/svpdummies.hxx +++ b/vcl/inc/headless/svpdummies.hxx @@ -36,10 +36,10 @@ public: // override all pure virtual methods virtual void ResetClipRegion() override; virtual void BeginSetClipRegion( sal_uInt32 nRects ) override; - virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override; + virtual void UnionClipRegion( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override; virtual void EndSetClipRegion() override; - virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) override; + virtual void SetPosSize( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override; virtual void Show( bool bVisible ) override; virtual const SystemEnvData* GetSystemData() const override; diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx index 9faf8b8230f4..6d003d545398 100644 --- a/vcl/inc/headless/svpframe.hxx +++ b/vcl/inc/headless/svpframe.hxx @@ -44,10 +44,10 @@ class SvpSalFrame : public SalFrame #ifndef IOS cairo_surface_t* m_pSurface; #endif - long m_nMinWidth; - long m_nMinHeight; - long m_nMaxWidth; - long m_nMaxHeight; + tools::Long m_nMinWidth; + tools::Long m_nMinHeight; + tools::Long m_nMaxWidth; + tools::Long m_nMaxHeight; SystemEnvData m_aSystemChildData; @@ -77,10 +77,10 @@ public: virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ) override; virtual void Show( bool bVisible, bool bNoActivate = false ) override; - virtual void SetMinClientSize( long nWidth, long nHeight ) override; - virtual void SetMaxClientSize( long nWidth, long nHeight ) override; - virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) override; - virtual void GetClientSize( long& rWidth, long& rHeight ) override; + virtual void SetMinClientSize( tools::Long nWidth, tools::Long nHeight ) override; + virtual void SetMaxClientSize( tools::Long nWidth, tools::Long nHeight ) override; + virtual void SetPosSize( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, sal_uInt16 nFlags ) override; + virtual void GetClientSize( tools::Long& rWidth, tools::Long& rHeight ) override; virtual void GetWorkArea( tools::Rectangle& rRect ) override; virtual SalFrame* GetParent() const override; virtual void SetWindowState( const SalFrameState* pState ) override; @@ -91,7 +91,7 @@ public: virtual void ToTop( SalFrameToTop nFlags ) override; virtual void SetPointer( PointerStyle ePointerStyle ) override; virtual void CaptureMouse( bool bMouse ) override; - virtual void SetPointerPos( long nX, long nY ) override; + virtual void SetPointerPos( tools::Long nX, tools::Long nY ) override; using SalFrame::Flush; virtual void Flush() override; virtual void SetInputContext( SalInputContext* pContext ) override; @@ -109,7 +109,7 @@ public: virtual bool SetPluginParent( SystemParentData* pNewParent ) override; virtual void ResetClipRegion() override; virtual void BeginSetClipRegion( sal_uInt32 nRects ) override; - virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override; + virtual void UnionClipRegion( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override; virtual void EndSetClipRegion() override; /*TODO: functional implementation */ diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index c88c136f5066..0ce14b3a5274 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -145,7 +145,7 @@ protected: const basegfx::B2DPoint& rY, const SalBitmap& rSourceBitmap, const SalBitmap* pAlphaBitmap) override; - virtual bool drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ) override; + virtual bool drawAlphaRect( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, sal_uInt8 nTransparency ) override; cairo_t* createTmpCompatibleCairoContext() const; @@ -156,7 +156,7 @@ public: virtual SalGraphicsImpl* GetImpl() const override { return nullptr; }; virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) override; virtual sal_uInt16 GetBitCount() const override; - virtual long GetGraphicsWidth() const override; + virtual tools::Long GetGraphicsWidth() const override; virtual void ResetClipRegion() override; virtual bool setClipRegion( const vcl::Region& ) override; @@ -187,8 +187,8 @@ public: int nGlyphs, FontSubsetInfo& rInfo ) override; - virtual const void* GetEmbedFontData(const PhysicalFontFace*, long* pDataLen) override; - virtual void FreeEmbedFontData( const void* pData, long nDataLen ) override; + virtual const void* GetEmbedFontData(const PhysicalFontFace*, tools::Long* pDataLen) override; + virtual void FreeEmbedFontData( const void* pData, tools::Long nDataLen ) override; virtual void GetGlyphWidths( const PhysicalFontFace*, bool bVertical, std::vector< sal_Int32 >& rWidths, @@ -197,10 +197,10 @@ public: GetTextLayout(int nFallbackLevel) override; virtual void DrawTextLayout( const GenericSalLayout& ) override; virtual bool supportsOperation( OutDevSupportType ) const override; - virtual void drawPixel( long nX, long nY ) override; - virtual void drawPixel( long nX, long nY, Color nColor ) override; - virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ) override; - virtual void drawRect( long nX, long nY, long nWidth, long nHeight ) override; + virtual void drawPixel( tools::Long nX, tools::Long nY ) override; + virtual void drawPixel( tools::Long nX, tools::Long nY, Color nColor ) override; + virtual void drawLine( tools::Long nX1, tools::Long nY1, tools::Long nX2, tools::Long nY2 ) override; + virtual void drawRect( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override; virtual bool drawPolyPolygon( const basegfx::B2DHomMatrix& rObjectToDevice, @@ -237,12 +237,12 @@ public: virtual bool implDrawGradient(basegfx::B2DPolyPolygon const & rPolyPolygon, SalGradient const & rGradient) override; - virtual void copyArea( long nDestX, - long nDestY, - long nSrcX, - long nSrcY, - long nSrcWidth, - long nSrcHeight, + virtual void copyArea( tools::Long nDestX, + tools::Long nDestY, + tools::Long nSrcX, + tools::Long nSrcY, + tools::Long nSrcWidth, + tools::Long nSrcHeight, bool bWindowInvalidate) override; virtual void copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) override; @@ -257,12 +257,12 @@ public: virtual void drawMask( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, Color nMaskColor ) override; - virtual std::shared_ptr<SalBitmap> getBitmap( long nX, long nY, long nWidth, long nHeight ) override; - virtual Color getPixel( long nX, long nY ) override; - virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ) override; + virtual std::shared_ptr<SalBitmap> getBitmap( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override; + virtual Color getPixel( tools::Long nX, tools::Long nY ) override; + virtual void invert( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, SalInvert nFlags ) override; virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) override; - virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uInt32 nSize ) override; + virtual bool drawEPS( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, void* pPtr, sal_uInt32 nSize ) override; virtual SystemGraphicsData GetGraphicsData() const override; diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx index ae1290729b4c..e95353a0c227 100644 --- a/vcl/inc/headless/svpinst.hxx +++ b/vcl/inc/headless/svpinst.hxx @@ -135,7 +135,7 @@ public: // pData allows for using a system dependent graphics or device context virtual std::unique_ptr<SalVirtualDevice> CreateVirtualDevice( SalGraphics* pGraphics, - long &nDX, long &nDY, + tools::Long &nDX, tools::Long &nDY, DeviceFormat eFormat, const SystemGraphicsData *pData = nullptr ) override; // Printer diff --git a/vcl/inc/headless/svpvd.hxx b/vcl/inc/headless/svpvd.hxx index 7ec66670957e..f7270a3ee0e6 100644 --- a/vcl/inc/headless/svpvd.hxx +++ b/vcl/inc/headless/svpvd.hxx @@ -38,7 +38,7 @@ class VCL_DLLPUBLIC SvpSalVirtualDevice : public SalVirtualDevice basegfx::B2IVector m_aFrameSize; std::vector< SvpSalGraphics* > m_aGraphics; - void CreateSurface(long nNewDX, long nNewDY, sal_uInt8 *const pBuffer); + void CreateSurface(tools::Long nNewDX, tools::Long nNewDY, sal_uInt8 *const pBuffer); protected: SvpSalGraphics* AddGraphics(SvpSalGraphics* aGraphics); @@ -51,16 +51,16 @@ public: virtual SalGraphics* AcquireGraphics() override; virtual void ReleaseGraphics( SalGraphics* pGraphics ) override; - virtual bool SetSize( long nNewDX, long nNewDY ) override; - virtual bool SetSizeUsingBuffer( long nNewDX, long nNewDY, + virtual bool SetSize( tools::Long nNewDX, tools::Long nNewDY ) override; + virtual bool SetSizeUsingBuffer( tools::Long nNewDX, tools::Long nNewDY, sal_uInt8 * pBuffer ) override; cairo_surface_t* GetSurface() const { return m_pSurface; } // SalGeometryProvider - virtual long GetWidth() const override; - virtual long GetHeight() const override; + virtual tools::Long GetWidth() const override; + virtual tools::Long GetHeight() const override; }; #endif // INCLUDED_VCL_INC_HEADLESS_SVPVD_HXX diff --git a/vcl/inc/hyperlabel.hxx b/vcl/inc/hyperlabel.hxx index 20076a89b253..5ff87d878465 100644 --- a/vcl/inc/hyperlabel.hxx +++ b/vcl/inc/hyperlabel.hxx @@ -62,7 +62,7 @@ namespace vcl void SetClickHdl( const Link<HyperLabel*,void>& rLink ) { maClickHdl = rLink; } - Size const & CalcMinimumSize( long nMaxWidth ) const; + Size const & CalcMinimumSize( tools::Long nMaxWidth ) const; }; } diff --git a/vcl/inc/iconview.hxx b/vcl/inc/iconview.hxx index f9b623688621..091f08fb2d3b 100644 --- a/vcl/inc/iconview.hxx +++ b/vcl/inc/iconview.hxx @@ -29,9 +29,9 @@ public: virtual void Resize() override; - virtual tools::Rectangle GetFocusRect(const SvTreeListEntry*, long nEntryPos) override; + virtual tools::Rectangle GetFocusRect(const SvTreeListEntry*, tools::Long nEntryPos) override; - void PaintEntry( SvTreeListEntry&, long nX, long nY, vcl::RenderContext& rRenderContext); + void PaintEntry( SvTreeListEntry&, tools::Long nX, tools::Long nY, vcl::RenderContext& rRenderContext); }; #endif diff --git a/vcl/inc/impanmvw.hxx b/vcl/inc/impanmvw.hxx index b4e634071279..99bd7cd5dff2 100644 --- a/vcl/inc/impanmvw.hxx +++ b/vcl/inc/impanmvw.hxx @@ -34,7 +34,7 @@ struct AInfo Size aStartSize; VclPtr<OutputDevice> pOutDev; void* pViewData; - long nExtraData; + tools::Long nExtraData; bool bPause; AInfo(); @@ -49,7 +49,7 @@ private: Animation* mpParent; VclPtr<OutputDevice> mpRenderContext; - long mnExtraData; + tools::Long mnExtraData; Point maPt; Point maDispPt; Point maRestPt; @@ -74,7 +74,7 @@ private: const Point& rPt, const Size& rSz, sal_uLong nExtraData, OutputDevice* pFirstFrameOutDev = nullptr ); - bool matches(const OutputDevice* pOut, long nExtraData) const; + bool matches(const OutputDevice* pOut, tools::Long nExtraData) const; void drawToPos( sal_uLong nPos ); void draw( sal_uLong nPos, VirtualDevice* pVDev=nullptr ); void repaint(); diff --git a/vcl/inc/impfontmetricdata.hxx b/vcl/inc/impfontmetricdata.hxx index d801b9e41c13..ec1d98ccba41 100644 --- a/vcl/inc/impfontmetricdata.hxx +++ b/vcl/inc/impfontmetricdata.hxx @@ -21,6 +21,7 @@ #define INCLUDED_VCL_INC_IMPFONTMETRICDATA_HXX #include <vcl/dllapi.h> +#include <tools/long.hxx> #include <tools/ref.hxx> #include "fontattributes.hxx" #include "sft.hxx" @@ -40,55 +41,55 @@ public: explicit ImplFontMetricData( const FontSelectPattern& ); // font instance attributes from the font request - long GetWidth() const { return mnWidth; } + tools::Long GetWidth() const { return mnWidth; } short GetOrientation() const { return mnOrientation; } - void SetWidth(long nWidth) { mnWidth=nWidth; } + void SetWidth(tools::Long nWidth) { mnWidth=nWidth; } void SetOrientation(short nOrientation) { mnOrientation=nOrientation; } // font metrics measured for the font instance - long GetAscent() const { return mnAscent; } - long GetDescent() const { return mnDescent; } - long GetInternalLeading() const { return mnIntLeading; } - long GetExternalLeading() const { return mnExtLeading; } + tools::Long GetAscent() const { return mnAscent; } + tools::Long GetDescent() const { return mnDescent; } + tools::Long GetInternalLeading() const { return mnIntLeading; } + tools::Long GetExternalLeading() const { return mnExtLeading; } int GetSlant() const { return mnSlant; } - long GetMinKashida() const { return mnMinKashida; } + tools::Long GetMinKashida() const { return mnMinKashida; } void SetSlant(int nSlant) { mnSlant=nSlant; } - void SetMinKashida( long nMinKashida ) { mnMinKashida=nMinKashida; } + void SetMinKashida( tools::Long nMinKashida ) { mnMinKashida=nMinKashida; } // font attributes queried from the font instance bool IsFullstopCentered() const { return mbFullstopCentered; } - long GetBulletOffset() const { return mnBulletOffset; } + tools::Long GetBulletOffset() const { return mnBulletOffset; } void SetFullstopCenteredFlag(bool bFullstopCentered) { mbFullstopCentered = bFullstopCentered; } // font metrics that are usually derived from the measurements - long GetUnderlineSize() const { return mnUnderlineSize; } - long GetUnderlineOffset() const { return mnUnderlineOffset; } - long GetBoldUnderlineSize() const { return mnBUnderlineSize; } - long GetBoldUnderlineOffset() const { return mnBUnderlineOffset; } - long GetDoubleUnderlineSize() const { return mnDUnderlineSize; } - long GetDoubleUnderlineOffset1() const { return mnDUnderlineOffset1; } - long GetDoubleUnderlineOffset2() const { return mnDUnderlineOffset2; } - long GetWavelineUnderlineSize() const { return mnWUnderlineSize; } - long GetWavelineUnderlineOffset() const { return mnWUnderlineOffset; } - long GetAboveUnderlineSize() const { return mnAboveUnderlineSize; } - long GetAboveUnderlineOffset() const { return mnAboveUnderlineOffset; } - long GetAboveBoldUnderlineSize() const { return mnAboveBUnderlineSize; } - long GetAboveBoldUnderlineOffset() const { return mnAboveBUnderlineOffset; } - long GetAboveDoubleUnderlineSize() const { return mnAboveDUnderlineSize; } - long GetAboveDoubleUnderlineOffset1() const { return mnAboveDUnderlineOffset1; } - long GetAboveDoubleUnderlineOffset2() const { return mnAboveDUnderlineOffset2; } - long GetAboveWavelineUnderlineSize() const { return mnAboveWUnderlineSize; } - long GetAboveWavelineUnderlineOffset() const { return mnAboveWUnderlineOffset; } - long GetStrikeoutSize() const { return mnStrikeoutSize; } - long GetStrikeoutOffset() const { return mnStrikeoutOffset; } - long GetBoldStrikeoutSize() const { return mnBStrikeoutSize; } - long GetBoldStrikeoutOffset() const { return mnBStrikeoutOffset; } - long GetDoubleStrikeoutSize() const { return mnDStrikeoutSize; } - long GetDoubleStrikeoutOffset1() const { return mnDStrikeoutOffset1; } - long GetDoubleStrikeoutOffset2() const { return mnDStrikeoutOffset2; } + tools::Long GetUnderlineSize() const { return mnUnderlineSize; } + tools::Long GetUnderlineOffset() const { return mnUnderlineOffset; } + tools::Long GetBoldUnderlineSize() const { return mnBUnderlineSize; } + tools::Long GetBoldUnderlineOffset() const { return mnBUnderlineOffset; } + tools::Long GetDoubleUnderlineSize() const { return mnDUnderlineSize; } + tools::Long GetDoubleUnderlineOffset1() const { return mnDUnderlineOffset1; } + tools::Long GetDoubleUnderlineOffset2() const { return mnDUnderlineOffset2; } + tools::Long GetWavelineUnderlineSize() const { return mnWUnderlineSize; } + tools::Long GetWavelineUnderlineOffset() const { return mnWUnderlineOffset; } + tools::Long GetAboveUnderlineSize() const { return mnAboveUnderlineSize; } + tools::Long GetAboveUnderlineOffset() const { return mnAboveUnderlineOffset; } + tools::Long GetAboveBoldUnderlineSize() const { return mnAboveBUnderlineSize; } + tools::Long GetAboveBoldUnderlineOffset() const { return mnAboveBUnderlineOffset; } + tools::Long GetAboveDoubleUnderlineSize() const { return mnAboveDUnderlineSize; } + tools::Long GetAboveDoubleUnderlineOffset1() const { return mnAboveDUnderlineOffset1; } + tools::Long GetAboveDoubleUnderlineOffset2() const { return mnAboveDUnderlineOffset2; } + tools::Long GetAboveWavelineUnderlineSize() const { return mnAboveWUnderlineSize; } + tools::Long GetAboveWavelineUnderlineOffset() const { return mnAboveWUnderlineOffset; } + tools::Long GetStrikeoutSize() const { return mnStrikeoutSize; } + tools::Long GetStrikeoutOffset() const { return mnStrikeoutOffset; } + tools::Long GetBoldStrikeoutSize() const { return mnBStrikeoutSize; } + tools::Long GetBoldStrikeoutOffset() const { return mnBStrikeoutOffset; } + tools::Long GetDoubleStrikeoutSize() const { return mnDStrikeoutSize; } + tools::Long GetDoubleStrikeoutOffset1() const { return mnDStrikeoutOffset1; } + tools::Long GetDoubleStrikeoutOffset2() const { return mnDStrikeoutOffset2; } void ImplInitTextLineSize( const OutputDevice* pDev ); void ImplInitAboveTextLineSize(); @@ -99,48 +100,48 @@ private: bool ShouldUseWinMetrics(const vcl::TTGlobalFontInfo& rInfo); // font instance attributes from the font request - long mnHeight; // Font size - long mnWidth; // Reference Width + tools::Long mnHeight; // Font size + tools::Long mnWidth; // Reference Width short mnOrientation; // Rotation in 1/10 degrees // font metrics measured for the font instance - long mnAscent; // Ascent - long mnDescent; // Descent - long mnIntLeading; // Internal Leading - long mnExtLeading; // External Leading + tools::Long mnAscent; // Ascent + tools::Long mnDescent; // Descent + tools::Long mnIntLeading; // Internal Leading + tools::Long mnExtLeading; // External Leading int mnSlant; // Slant (Italic/Oblique) - long mnMinKashida; // Minimal width of kashida (Arabic) + tools::Long mnMinKashida; // Minimal width of kashida (Arabic) // font attributes queried from the font instance bool mbFullstopCentered; - long mnBulletOffset; // Offset to position non-print character + tools::Long mnBulletOffset; // Offset to position non-print character // font metrics that are usually derived from the measurements - long mnUnderlineSize; // Lineheight of Underline - long mnUnderlineOffset; // Offset from Underline to Baseline - long mnBUnderlineSize; // Height of bold underline - long mnBUnderlineOffset; // Offset from bold underline to baseline - long mnDUnderlineSize; // Height of double underline - long mnDUnderlineOffset1; // Offset from double underline to baseline - long mnDUnderlineOffset2; // Offset from double underline to baseline - long mnWUnderlineSize; // Height of WaveLine underline - long mnWUnderlineOffset; // Offset from WaveLine underline to baseline, but centrered to WaveLine - long mnAboveUnderlineSize; // Height of single underline (for Vertical Right) - long mnAboveUnderlineOffset; // Offset from single underline to baseline (for Vertical Right) - long mnAboveBUnderlineSize; // Height of bold underline (for Vertical Right) - long mnAboveBUnderlineOffset; // Offset from bold underline to baseline (for Vertical Right) - long mnAboveDUnderlineSize; // Height of double underline (for Vertical Right) - long mnAboveDUnderlineOffset1; // Offset from double underline to baseline (for Vertical Right) - long mnAboveDUnderlineOffset2; // Offset from double underline to baseline (for Vertical Right) - long mnAboveWUnderlineSize; // Height of WaveLine-strike-out (for Vertical Right) - long mnAboveWUnderlineOffset; // Offset from WaveLine-strike-out to baseline, but centrered to the WaveLine (for Vertical Right) - long mnStrikeoutSize; // Height of single strike-out - long mnStrikeoutOffset; // Offset from single strike-out to baseline - long mnBStrikeoutSize; // Height of bold strike-out - long mnBStrikeoutOffset; // Offset of bold strike-out to baseline - long mnDStrikeoutSize; // Height of double strike-out - long mnDStrikeoutOffset1; // Offset of double strike-out to baseline - long mnDStrikeoutOffset2; // Offset of double strike-out to baseline + tools::Long mnUnderlineSize; // Lineheight of Underline + tools::Long mnUnderlineOffset; // Offset from Underline to Baseline + tools::Long mnBUnderlineSize; // Height of bold underline + tools::Long mnBUnderlineOffset; // Offset from bold underline to baseline + tools::Long mnDUnderlineSize; // Height of double underline + tools::Long mnDUnderlineOffset1; // Offset from double underline to baseline + tools::Long mnDUnderlineOffset2; // Offset from double underline to baseline + tools::Long mnWUnderlineSize; // Height of WaveLine underline + tools::Long mnWUnderlineOffset; // Offset from WaveLine underline to baseline, but centrered to WaveLine + tools::Long mnAboveUnderlineSize; // Height of single underline (for Vertical Right) + tools::Long mnAboveUnderlineOffset; // Offset from single underline to baseline (for Vertical Right) + tools::Long mnAboveBUnderlineSize; // Height of bold underline (for Vertical Right) + tools::Long mnAboveBUnderlineOffset; // Offset from bold underline to baseline (for Vertical Right) + tools::Long mnAboveDUnderlineSize; // Height of double underline (for Vertical Right) + tools::Long mnAboveDUnderlineOffset1; // Offset from double underline to baseline (for Vertical Right) + tools::Long mnAboveDUnderlineOffset2; // Offset from double underline to baseline (for Vertical Right) + tools::Long mnAboveWUnderlineSize; // Height of WaveLine-strike-out (for Vertical Right) + tools::Long mnAboveWUnderlineOffset; // Offset from WaveLine-strike-out to baseline, but centrered to the WaveLine (for Vertical Right) + tools::Long mnStrikeoutSize; // Height of single strike-out + tools::Long mnStrikeoutOffset; // Offset from single strike-out to baseline + tools::Long mnBStrikeoutSize; // Height of bold strike-out + tools::Long mnBStrikeoutOffset; // Offset of bold strike-out to baseline + tools::Long mnDStrikeoutSize; // Height of double strike-out + tools::Long mnDStrikeoutOffset1; // Offset of double strike-out to baseline + tools::Long mnDStrikeoutOffset2; // Offset of double strike-out to baseline }; diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx index 211a2ecd56ea..9ad34e6f57b1 100644 --- a/vcl/inc/impgraph.hxx +++ b/vcl/inc/impgraph.hxx @@ -157,10 +157,10 @@ private: void ImplStartAnimation( OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSize, - long nExtraData, + tools::Long nExtraData, OutputDevice* pFirstFrameOutDev ); void ImplStopAnimation( const OutputDevice* pOutputDevice, - long nExtraData ); + tools::Long nExtraData ); void ImplSetAnimationNotifyHdl( const Link<Animation*,void>& rLink ); Link<Animation*,void> ImplGetAnimationNotifyHdl() const; diff --git a/vcl/inc/jobset.h b/vcl/inc/jobset.h index ce53c0541284..e3f154254e35 100644 --- a/vcl/inc/jobset.h +++ b/vcl/inc/jobset.h @@ -41,8 +41,8 @@ private: DuplexMode meDuplexMode; //< Duplex sal_uInt16 mnPaperBin; //< paper bin / in tray Paper mePaperFormat; //< paper format - long mnPaperWidth; //< paper width (100th mm) - long mnPaperHeight; //< paper height (100th mm) + tools::Long mnPaperWidth; //< paper width (100th mm) + tools::Long mnPaperHeight; //< paper height (100th mm) sal_uInt32 mnDriverDataLen; //< length of system specific data sal_uInt8* mpDriverData; //< system specific data (will be streamed a byte block) bool mbPapersizeFromSetup; @@ -79,11 +79,11 @@ public: Paper GetPaperFormat() const { return mePaperFormat; } void SetPaperFormat(Paper ePaperFormat); - long GetPaperWidth() const { return mnPaperWidth; } - void SetPaperWidth(long nWidth); + tools::Long GetPaperWidth() const { return mnPaperWidth; } + void SetPaperWidth(tools::Long nWidth); - long GetPaperHeight() const { return mnPaperHeight; } - void SetPaperHeight(long nHeight); + tools::Long GetPaperHeight() const { return mnPaperHeight; } + void SetPaperHeight(tools::Long nHeight); sal_uInt32 GetDriverDataLen() const { return mnDriverDataLen; } void SetDriverDataLen(sal_uInt32 nDriverDataLen); diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx index 4d714e418d81..f18233574e7f 100644 --- a/vcl/inc/listbox.hxx +++ b/vcl/inc/listbox.hxx @@ -55,9 +55,9 @@ struct ImplEntryType void* mpUserData; bool mbIsSelected; ListBoxEntryFlags mnFlags; - long mnHeight; + tools::Long mnHeight; - long getHeightWithMargin() const; + tools::Long getHeightWithMargin() const; ImplEntryType( const OUString& rStr, const Image& rImage ) : maStr( rStr ), @@ -121,8 +121,8 @@ public: /// GetAddedHeight( 0 ) @return 0 /// GetAddedHeight( LISTBOX_ENTRY_NOTFOUND ) @return 0 /// GetAddedHeight( i, k ) with k > i is equivalent -GetAddedHeight( k, i ) - long GetAddedHeight( sal_Int32 nEndIndex, sal_Int32 nBeginIndex ) const; - long GetEntryHeight( sal_Int32 nPos ) const; + tools::Long GetAddedHeight( sal_Int32 nEndIndex, sal_Int32 nBeginIndex ) const; + tools::Long GetEntryHeight( sal_Int32 nPos ) const; sal_Int32 GetEntryCount() const { return static_cast<sal_Int32>(maEntries.size()); } bool HasImages() const { return mnImages != 0; } @@ -179,15 +179,15 @@ private: Size maUserItemSize; - long mnMaxTxtHeight; ///< Maximum height of a text item - long mnMaxTxtWidth; ///< Maximum width of a text item + tools::Long mnMaxTxtHeight; ///< Maximum height of a text item + tools::Long mnMaxTxtWidth; ///< Maximum width of a text item ///< Entry without Image - long mnMaxImgTxtWidth;///< Maximum width of a text item + tools::Long mnMaxImgTxtWidth;///< Maximum width of a text item ///< Entry AND Image - long mnMaxImgWidth; ///< Maximum width of an image item - long mnMaxImgHeight; ///< Maximum height of an image item - long mnMaxWidth; ///< Maximum width of an entry - long mnMaxHeight; ///< Maximum height of an entry + tools::Long mnMaxImgWidth; ///< Maximum width of an image item + tools::Long mnMaxImgHeight; ///< Maximum height of an image item + tools::Long mnMaxWidth; ///< Maximum width of an entry + tools::Long mnMaxHeight; ///< Maximum height of an entry sal_Int32 mnCurrentPos; ///< Position (Focus) sal_Int32 mnTrackingSaveSelection; ///< Selection before Tracking(); @@ -197,8 +197,8 @@ private: sal_Int32 mnUserDrawEntry; sal_Int32 mnTop; ///< output from line on - long mnLeft; ///< output from column on - long mnTextHeight; ///< text height + tools::Long mnLeft; ///< output from column on + tools::Long mnTextHeight; ///< text height sal_uInt16 mnSelectModifier; ///< Modifiers @@ -290,9 +290,9 @@ public: using Window::IsVisible; bool IsVisible( sal_Int32 nEntry ) const; - long GetLeftIndent() const { return mnLeft; } - void SetLeftIndent( long n ); - void ScrollHorz( long nDiff ); + tools::Long GetLeftIndent() const { return mnLeft; } + void SetLeftIndent( tools::Long n ); + void ScrollHorz( tools::Long nDiff ); void AllowGrabFocus( bool b ) { mbGrabFocus = b; } bool IsGrabFocusAllowed() const { return mbGrabFocus; } @@ -337,9 +337,9 @@ public: Size CalcSize(sal_Int32 nMaxLines) const; tools::Rectangle GetBoundingRectangle( sal_Int32 nItem ) const; - long GetEntryHeight() const { return mnMaxHeight; } - long GetEntryHeightWithMargin() const; - long GetMaxEntryWidth() const { return mnMaxWidth; } + tools::Long GetEntryHeight() const { return mnMaxHeight; } + tools::Long GetEntryHeightWithMargin() const; + tools::Long GetMaxEntryWidth() const { return mnMaxWidth; } void SetScrollHdl( const Link<ImplListBoxWindow*,void>& rLink ) { maScrollHdl = rLink; } void SetSelectHdl( const Link<LinkParamNone*,void>& rLink ) { maSelectHdl = rLink; } @@ -451,7 +451,7 @@ public: using Window::IsVisible; bool IsVisible( sal_Int32 nEntry ) const { return maLBWindow->IsVisible( nEntry ); } - long GetLeftIndent() const { return maLBWindow->GetLeftIndent(); } + tools::Long GetLeftIndent() const { return maLBWindow->GetLeftIndent(); } void SetLeftIndent( sal_uInt16 n ) { maLBWindow->SetLeftIndent( n ); } void SetTravelSelect( bool bTravelSelect ) { maLBWindow->SetTravelSelect( bTravelSelect ); } @@ -467,9 +467,9 @@ public: bool IsReadOnly() const { return maLBWindow->IsReadOnly(); } Size CalcSize( sal_Int32 nMaxLines ) const { return maLBWindow->CalcSize( nMaxLines ); } - long GetEntryHeight() const { return maLBWindow->GetEntryHeight(); } - long GetEntryHeightWithMargin() const{ return maLBWindow->GetEntryHeightWithMargin(); } - long GetMaxEntryWidth() const { return maLBWindow->GetMaxEntryWidth(); } + tools::Long GetEntryHeight() const { return maLBWindow->GetEntryHeight(); } + tools::Long GetEntryHeightWithMargin() const{ return maLBWindow->GetEntryHeightWithMargin(); } + tools::Long GetMaxEntryWidth() const { return maLBWindow->GetMaxEntryWidth(); } void SetScrollHdl( const Link<ImplListBox*,void>& rLink ) { maScrollHdl = rLink; } void SetSelectHdl( const Link<LinkParamNone*,void>& rLink ) { maLBWindow->SetSelectHdl( rLink ); } @@ -520,8 +520,8 @@ public: Size CalcFloatSize(); void StartFloat( bool bStartTracking ); - 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; void SetDropDownLineCount( sal_uInt16 n ) { mnDDLineCount = n; } sal_uInt16 GetDropDownLineCount() const { return mnDDLineCount; } diff --git a/vcl/inc/opengl/RenderList.hxx b/vcl/inc/opengl/RenderList.hxx index 213a2f43b554..236fa570aec1 100644 --- a/vcl/inc/opengl/RenderList.hxx +++ b/vcl/inc/opengl/RenderList.hxx @@ -152,12 +152,12 @@ public: VCL_DLLPUBLIC void addDrawTextureWithMaskColor(OpenGLTexture const & rTexture, Color nColor, const SalTwoRect& r2Rect); - void addDrawPixel(long nX, long nY, Color nColor); + void addDrawPixel(tools::Long nX, tools::Long nY, Color nColor); - void addDrawRectangle(long nX, long nY, long nWidth, long nHeight, double fTransparency, + void addDrawRectangle(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, double fTransparency, Color nLineColor, Color nFillColor); - void addDrawLine(long nX1, long nY1, long nX2, long nY2, Color nLineColor, bool bUseAA); + void addDrawLine(tools::Long nX1, tools::Long nY1, tools::Long nX2, tools::Long nY2, Color nLineColor, bool bUseAA); void addDrawPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPolygon, double fTransparency, Color nLineColor, Color nFillColor, bool bUseAA); diff --git a/vcl/inc/opengl/gdiimpl.hxx b/vcl/inc/opengl/gdiimpl.hxx index da6ce6713998..13f75ae19b3f 100644 --- a/vcl/inc/opengl/gdiimpl.hxx +++ b/vcl/inc/opengl/gdiimpl.hxx @@ -124,7 +124,7 @@ public: void DrawConvexPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry, bool blockAA = false ); void DrawConvexPolygon( const tools::Polygon& rPolygon, bool blockAA ); void DrawTrapezoid( const basegfx::B2DTrapezoid& trapezoid, bool blockAA ); - void DrawRect( long nX, long nY, long nWidth, long nHeight ); + void DrawRect( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ); void DrawRect( const tools::Rectangle& rRect ); void DrawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ); void DrawLineSegment(float x1, float y1, float x2, float y2); @@ -208,7 +208,7 @@ public: virtual sal_uInt16 GetBitCount() const override; // get the width of the device - virtual long GetGraphicsWidth() const override; + virtual tools::Long GetGraphicsWidth() const override; // set the clip region to empty virtual void ResetClipRegion() override; @@ -237,12 +237,12 @@ public: virtual void SetROPFillColor( SalROPColor nROPColor ) override; // draw --> LineColor and FillColor and RasterOp and ClipRegion - virtual void drawPixel( long nX, long nY ) override; - virtual void drawPixel( long nX, long nY, Color nColor ) override; + virtual void drawPixel( tools::Long nX, tools::Long nY ) override; + virtual void drawPixel( tools::Long nX, tools::Long nY, Color nColor ) override; - virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ) override; + virtual void drawLine( tools::Long nX1, tools::Long nY1, tools::Long nX2, tools::Long nY2 ) override; - virtual void drawRect( long nX, long nY, long nWidth, long nHeight ) override; + virtual void drawRect( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override; virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) override; @@ -284,9 +284,9 @@ public: // CopyArea --> No RasterOp, but ClipRegion virtual void copyArea( - long nDestX, long nDestY, - long nSrcX, long nSrcY, - long nSrcWidth, long nSrcHeight, + tools::Long nDestX, tools::Long nDestY, + tools::Long nSrcX, tools::Long nSrcY, + tools::Long nSrcWidth, tools::Long nSrcHeight, bool bWindowInvalidate ) override; // CopyBits and DrawBitmap --> RasterOp and ClipRegion @@ -315,21 +315,21 @@ public: const SalBitmap& rSalBitmap, Color nMaskColor ) override; - virtual std::shared_ptr<SalBitmap> getBitmap( long nX, long nY, long nWidth, long nHeight ) override; + virtual std::shared_ptr<SalBitmap> getBitmap( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override; - virtual Color getPixel( long nX, long nY ) override; + virtual Color getPixel( tools::Long nX, tools::Long nY ) override; // invert --> ClipRegion (only Windows or VirDevs) virtual void invert( - long nX, long nY, - long nWidth, long nHeight, + tools::Long nX, tools::Long nY, + tools::Long nWidth, tools::Long nHeight, SalInvert nFlags) override; virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) override; virtual bool drawEPS( - long nX, long nY, - long nWidth, long nHeight, + tools::Long nX, tools::Long nY, + tools::Long nWidth, tools::Long nHeight, void* pPtr, sal_uInt32 nSize ) override; @@ -374,8 +374,8 @@ public: @returns true if successfully drawn, false if not able to draw rectangle */ virtual bool drawAlphaRect( - long nX, long nY, - long nWidth, long nHeight, + tools::Long nX, tools::Long nY, + tools::Long nWidth, tools::Long nHeight, sal_uInt8 nTransparency ) override; virtual bool drawGradient(const tools::PolyPolygon& rPolygon, const Gradient& rGradient) override; diff --git a/vcl/inc/opengl/program.hxx b/vcl/inc/opengl/program.hxx index bff248d9bfab..b69eb0282c88 100644 --- a/vcl/inc/opengl/program.hxx +++ b/vcl/inc/opengl/program.hxx @@ -89,7 +89,7 @@ public: void SetColor( const OString& rName, const Color& rColor ); void SetColor( const OString& rName, Color nColor, sal_uInt8 nTransparency ); void SetColorf( const OString& rName, Color nColor, double fTransparency ); - void SetColorWithIntensity( const OString& rName, const Color& rColor, long nFactor ); + void SetColorWithIntensity( const OString& rName, const Color& rColor, tools::Long nFactor ); void SetTexture( const OString& rName, OpenGLTexture& rTexture ); void SetTransform( const OString& rName, const OpenGLTexture& rTexture, const basegfx::B2DPoint& rNull, const basegfx::B2DPoint& rX, diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx index a01eca89f0fe..61d2d37e90c2 100644 --- a/vcl/inc/opengl/salbmp.hxx +++ b/vcl/inc/opengl/salbmp.hxx @@ -84,7 +84,7 @@ public: public: - void Create( const OpenGLTexture& rTex, long nX, long nY, long nWidth, long nHeight ); + void Create( const OpenGLTexture& rTex, tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ); OpenGLTexture& GetTexture() const; const BitmapPalette& GetBitmapPalette() const { return maPalette; } diff --git a/vcl/inc/opengl/x11/salvd.hxx b/vcl/inc/opengl/x11/salvd.hxx index a77b9874e48b..9c8d3cb70165 100644 --- a/vcl/inc/opengl/x11/salvd.hxx +++ b/vcl/inc/opengl/x11/salvd.hxx @@ -33,14 +33,14 @@ class X11OpenGLSalVirtualDevice : public SalVirtualDevice public: X11OpenGLSalVirtualDevice( SalGraphics const *pGraphics, - long nDX, long nDY, + tools::Long nDX, tools::Long nDY, const SystemGraphicsData *pData, std::unique_ptr<X11SalGraphics> pNewGraphics); virtual ~X11OpenGLSalVirtualDevice() override; // SalGeometryProvider - virtual long GetWidth() const override { return mnWidth; } - virtual long GetHeight() const override { return mnHeight; } + virtual tools::Long GetWidth() const override { return mnWidth; } + virtual tools::Long GetHeight() const override { return mnHeight; } SalDisplay * GetDisplay() const { return mpDisplay; } const SalX11Screen& GetXScreenNumber() const { return mnXScreen; } @@ -49,7 +49,7 @@ public: virtual void ReleaseGraphics( SalGraphics* pGraphics ) override; // Set new size, without saving the old contents - virtual bool SetSize( long nNewDX, long nNewDY ) override; + virtual bool SetSize( tools::Long nNewDX, tools::Long nNewDY ) override; }; #endif // INCLUDED_VCL_INC_OPENGL_X11_SALVD_H diff --git a/vcl/inc/qt5/Qt5Graphics.hxx b/vcl/inc/qt5/Qt5Graphics.hxx index 1515783f6076..bef2f9dc4f66 100644 --- a/vcl/inc/qt5/Qt5Graphics.hxx +++ b/vcl/inc/qt5/Qt5Graphics.hxx @@ -99,10 +99,12 @@ public: virtual bool setClipRegion(const vcl::Region&) override; virtual void ResetClipRegion() override; - virtual void drawPixel(long nX, long nY) override; - virtual void drawPixel(long nX, long nY, Color nColor) override; - virtual void drawLine(long nX1, long nY1, long nX2, long nY2) override; - virtual void drawRect(long nX, long nY, long nWidth, long nHeight) override; + virtual void drawPixel(tools::Long nX, tools::Long nY) override; + virtual void drawPixel(tools::Long nX, tools::Long nY, Color nColor) override; + virtual void drawLine(tools::Long nX1, tools::Long nY1, tools::Long nX2, + tools::Long nY2) override; + virtual void drawRect(tools::Long nX, tools::Long nY, tools::Long nWidth, + tools::Long nHeight) override; virtual void drawPolyLine(sal_uInt32 nPoints, const SalPoint* pPtAry) override; virtual void drawPolygon(sal_uInt32 nPoints, const SalPoint* pPtAry) override; virtual void drawPolyPolygon(sal_uInt32 nPoly, const sal_uInt32* pPoints, @@ -123,8 +125,9 @@ public: double fMiterMinimumAngle, bool bPixelSnapHairline) override; virtual bool drawGradient(const tools::PolyPolygon&, const Gradient&) override; - virtual void copyArea(long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth, - long nSrcHeight, bool bWindowInvalidate) override; + virtual void copyArea(tools::Long nDestX, tools::Long nDestY, tools::Long nSrcX, + tools::Long nSrcY, tools::Long nSrcWidth, tools::Long nSrcHeight, + bool bWindowInvalidate) override; virtual void copyBits(const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics) override; virtual void drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap) override; @@ -133,15 +136,16 @@ public: virtual void drawMask(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, Color nMaskColor) override; - virtual std::shared_ptr<SalBitmap> getBitmap(long nX, long nY, long nWidth, - long nHeight) override; - virtual Color getPixel(long nX, long nY) override; + virtual std::shared_ptr<SalBitmap> getBitmap(tools::Long nX, tools::Long nY, tools::Long nWidth, + tools::Long nHeight) override; + virtual Color getPixel(tools::Long nX, tools::Long nY) override; - virtual void invert(long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) override; + virtual void invert(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, + SalInvert nFlags) override; virtual void invert(sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags) override; - virtual bool drawEPS(long nX, long nY, long nWidth, long nHeight, void* pPtr, - sal_uInt32 nSize) override; + virtual bool drawEPS(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, + void* pPtr, sal_uInt32 nSize) override; virtual bool blendBitmap(const SalTwoRect&, const SalBitmap& rBitmap) override; @@ -156,12 +160,12 @@ public: const basegfx::B2DPoint& rY, const SalBitmap& rSourceBitmap, const SalBitmap* pAlphaBitmap) override; - virtual bool drawAlphaRect(long nX, long nY, long nWidth, long nHeight, - sal_uInt8 nTransparency) override; + virtual bool drawAlphaRect(tools::Long nX, tools::Long nY, tools::Long nWidth, + tools::Long nHeight, sal_uInt8 nTransparency) override; virtual void GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY) override; virtual sal_uInt16 GetBitCount() const override; - virtual long GetGraphicsWidth() const override; + virtual tools::Long GetGraphicsWidth() const override; virtual void SetLineColor() override; virtual void SetLineColor(Color nColor) override; @@ -188,8 +192,8 @@ public: FontSubsetInfo& rInfo // out parameter ) override; - virtual const void* GetEmbedFontData(const PhysicalFontFace*, long* pDataLen) override; - virtual void FreeEmbedFontData(const void* pData, long nDataLen) override; + virtual const void* GetEmbedFontData(const PhysicalFontFace*, tools::Long* pDataLen) override; + virtual void FreeEmbedFontData(const void* pData, tools::Long nDataLen) override; virtual void GetGlyphWidths(const PhysicalFontFace*, bool bVertical, std::vector<sal_Int32>& rWidths, Ucs2UIntMap& rUnicodeEnc) override; diff --git a/vcl/inc/qt5/Qt5VirtualDevice.hxx b/vcl/inc/qt5/Qt5VirtualDevice.hxx index ad0dc3c3c804..0b94928199c8 100644 --- a/vcl/inc/qt5/Qt5VirtualDevice.hxx +++ b/vcl/inc/qt5/Qt5VirtualDevice.hxx @@ -45,12 +45,13 @@ public: virtual SalGraphics* AcquireGraphics() override; virtual void ReleaseGraphics(SalGraphics* pGraphics) override; - virtual bool SetSize(long nNewDX, long nNewDY) override; - virtual bool SetSizeUsingBuffer(long nNewDX, long nNewDY, sal_uInt8* pBuffer) override; + virtual bool SetSize(tools::Long nNewDX, tools::Long nNewDY) override; + virtual bool SetSizeUsingBuffer(tools::Long nNewDX, tools::Long nNewDY, + sal_uInt8* pBuffer) override; // SalGeometryProvider - virtual long GetWidth() const override; - virtual long GetHeight() const override; + virtual tools::Long GetWidth() const override; + virtual tools::Long GetHeight() const override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/regband.hxx b/vcl/inc/regband.hxx index c7b9e611947b..f92976c8a569 100644 --- a/vcl/inc/regband.hxx +++ b/vcl/inc/regband.hxx @@ -37,8 +37,8 @@ Intersection - the Class will process the clipping for the actual band. struct ImplRegionBandSep { ImplRegionBandSep* mpNextSep; - long mnXLeft; - long mnXRight; + tools::Long mnXLeft; + tools::Long mnXRight; bool mbRemoved; }; @@ -48,8 +48,8 @@ enum class LineType { Ascending, Descending }; struct ImplRegionBandPoint { ImplRegionBandPoint* mpNextBandPoint; - long mnX; - long mnLineId; + tools::Long mnX; + tools::Long mnLineId; bool mbEndPoint; LineType meLineType; }; @@ -61,13 +61,13 @@ public: ImplRegionBand* mpPrevBand; // pointer to the previous element of the list (only used temporarily) ImplRegionBandSep* mpFirstSep; // root of the list with x-separations ImplRegionBandPoint* mpFirstBandPoint; // root of the list with lines - long mnYTop; // actual boundary of the band - long mnYBottom; + tools::Long mnYTop; // actual boundary of the band + tools::Long mnYBottom; bool mbTouched : 1; // create y-band with boundaries - ImplRegionBand( long nYTop, long nYBottom ); + ImplRegionBand( tools::Long nYTop, tools::Long nYBottom ); /** copy y-band with all data @param theSourceBand The new ImplRegionBand object will @@ -85,8 +85,8 @@ public: const bool bIgnorePoints = true); ~ImplRegionBand(); - long GetXLeftBoundary() const; - long GetXRightBoundary() const; + tools::Long GetXLeftBoundary() const; + tools::Long GetXRightBoundary() const; // combine overlapping bands void OptimizeBand(); @@ -95,18 +95,18 @@ public: // union with existing separations void ProcessPoints(); // insert point in the list for later processing - bool InsertPoint( long nX, long nLineID, + bool InsertPoint( tools::Long nX, tools::Long nLineID, bool bEndPoint, LineType eLineType ); - void Union( long nXLeft, long nXRight ); - void Intersect( long nXLeft, long nXRight ); - void Exclude( long nXLeft, long nXRight ); - void XOr( long nXLeft, long nXRight ); + void Union( tools::Long nXLeft, tools::Long nXRight ); + void Intersect( tools::Long nXLeft, tools::Long nXRight ); + void Exclude( tools::Long nXLeft, tools::Long nXRight ); + void XOr( tools::Long nXLeft, tools::Long nXRight ); - void MoveX( long nHorzMove ); + void MoveX( tools::Long nHorzMove ); void ScaleX( double fHorzScale ); - bool IsInside( long nX ); + bool IsInside( tools::Long nX ); bool IsEmpty() const { return ((!mpFirstSep) && (!mpFirstBandPoint)); } diff --git a/vcl/inc/regionband.hxx b/vcl/inc/regionband.hxx index a007261489fb..30a75ac015de 100644 --- a/vcl/inc/regionband.hxx +++ b/vcl/inc/regionband.hxx @@ -52,22 +52,22 @@ public: bool isSingleRectangle() const; ImplRegionBand* ImplGetFirstRegionBand() const { return mpFirstBand; } - void ImplAddMissingBands(const long nTop, const long nBottom); + void ImplAddMissingBands(const tools::Long nTop, const tools::Long nBottom); void InsertBand(ImplRegionBand* pPreviousBand, ImplRegionBand* pBandToInsert); void processPoints(); - void CreateBandRange(long nYTop, long nYBottom); - void InsertLine(const Point& rStartPt, const Point& rEndPt, long nLineId); - void InsertPoint(const Point &rPoint, long nLineID, bool bEndPoint, LineType eLineType); + void CreateBandRange(tools::Long nYTop, tools::Long nYBottom); + void InsertLine(const Point& rStartPt, const Point& rEndPt, tools::Long nLineId); + void InsertPoint(const Point &rPoint, tools::Long nLineID, bool bEndPoint, LineType eLineType); bool OptimizeBandList(); - void Move(long nHorzMove, long nVertMove); + void Move(tools::Long nHorzMove, tools::Long nVertMove); void Scale(double fScaleX, double fScaleY); - void InsertBands(long nTop, long nBottom); - static bool InsertSingleBand(ImplRegionBand* pBand, long nYBandPosition); - void Union(long nLeft, long nTop, long nRight, long nBottom); - void Intersect(long nLeft, long nTop, long nRight, long nBottom); + void InsertBands(tools::Long nTop, tools::Long nBottom); + static bool InsertSingleBand(ImplRegionBand* pBand, tools::Long nYBandPosition); + void Union(tools::Long nLeft, tools::Long nTop, tools::Long nRight, tools::Long nBottom); + void Intersect(tools::Long nLeft, tools::Long nTop, tools::Long nRight, tools::Long nBottom); void Union(const RegionBand& rSource); - void Exclude(long nLeft, long nTop, long nRight, long nBottom); - void XOr(long nLeft, long nTop, long nRight, long nBottom); + void Exclude(tools::Long nLeft, tools::Long nTop, tools::Long nRight, tools::Long nBottom); + void XOr(tools::Long nLeft, tools::Long nTop, tools::Long nRight, tools::Long nBottom); void Intersect(const RegionBand& rSource); bool Exclude(const RegionBand& rSource); void XOr(const RegionBand& rSource); diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx index b83138e29d40..d55a40b1a93b 100644 --- a/vcl/inc/salframe.hxx +++ b/vcl/inc/salframe.hxx @@ -127,8 +127,8 @@ public: SalFrameGeometry maGeometry = {}; ///< absolute, unmirrored values // SalGeometryProvider - virtual long GetWidth() const override { return maGeometry.nWidth; } - virtual long GetHeight() const override { return maGeometry.nHeight; } + virtual tools::Long GetWidth() const override { return maGeometry.nWidth; } + virtual tools::Long GetHeight() const override { return maGeometry.nHeight; } virtual bool IsOffScreen() const override { return false; } // SalGraphics or NULL, but two Graphics for all SalFrames @@ -154,10 +154,10 @@ public: // Set ClientSize and Center the Window to the desktop // and send/post a resize message - virtual void SetMinClientSize( long nWidth, long nHeight ) = 0; - virtual void SetMaxClientSize( long nWidth, long nHeight ) = 0; - virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) = 0; - virtual void GetClientSize( long& rWidth, long& rHeight ) = 0; + virtual void SetMinClientSize( tools::Long nWidth, tools::Long nHeight ) = 0; + virtual void SetMaxClientSize( tools::Long nWidth, tools::Long nHeight ) = 0; + virtual void SetPosSize( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, sal_uInt16 nFlags ) = 0; + virtual void GetClientSize( tools::Long& rWidth, tools::Long& rHeight ) = 0; virtual void GetWorkArea( tools::Rectangle& rRect ) = 0; virtual SalFrame* GetParent() const = 0; // Note: x will be mirrored at parent if UI mirroring is active @@ -187,7 +187,7 @@ public: // pointer style virtual void SetPointer( PointerStyle ePointerStyle ) = 0; virtual void CaptureMouse( bool bMouse ) = 0; - virtual void SetPointerPos( long nX, long nY ) = 0; + virtual void SetPointerPos( tools::Long nX, tools::Long nY ) = 0; // flush output buffer virtual void Flush() = 0; @@ -246,7 +246,7 @@ public: // start setting the clipregion consisting of nRects rectangles virtual void BeginSetClipRegion( sal_uInt32 nRects ) = 0; // add a rectangle to the clip region - virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) = 0; + virtual void UnionClipRegion( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) = 0; // done setting up the clipregion virtual void EndSetClipRegion() = 0; diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index c451bcc8e83f..0ae0653ee484 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -95,7 +95,7 @@ public: virtual sal_uInt16 GetBitCount() const = 0; // get the width of the device - virtual long GetGraphicsWidth() const = 0; + virtual tools::Long GetGraphicsWidth() const = 0; // set the clip region to empty virtual void ResetClipRegion() = 0; @@ -177,10 +177,10 @@ public: // embeddable by GetDevFontList or NULL in case of error // parameters: pFont: describes the font in question // pDataLen: out parameter, contains the byte length of the returned buffer - virtual const void* GetEmbedFontData(const PhysicalFontFace* pFont, long* pDataLen) = 0; + virtual const void* GetEmbedFontData(const PhysicalFontFace* pFont, tools::Long* pDataLen) = 0; // free the font data again - virtual void FreeEmbedFontData( const void* pData, long nDataLen ) = 0; + virtual void FreeEmbedFontData( const void* pData, tools::Long nDataLen ) = 0; // get the same widths as in CreateFontSubset // in case of an embeddable font also fill the mapping @@ -202,11 +202,11 @@ public: SalLayoutFlags GetLayout() const { return m_nLayout; } void SetLayout( SalLayoutFlags aLayout ) { m_nLayout = aLayout;} - void mirror( long& nX, const OutputDevice *pOutDev ) const; + void mirror( tools::Long& nX, const OutputDevice *pOutDev ) const; // only called mirror2 to avoid ambiguity [[nodiscard]] - long mirror2( long nX, const OutputDevice *pOutDev ) const; - void mirror( long& nX, long nWidth, const OutputDevice *pOutDev, bool bBack = false ) const; + tools::Long mirror2( tools::Long nX, const OutputDevice *pOutDev ) const; + void mirror( tools::Long& nX, tools::Long nWidth, const OutputDevice *pOutDev, bool bBack = false ) const; bool mirror( sal_uInt32 nPoints, const SalPoint *pPtAry, SalPoint *pPtAry2, const OutputDevice *pOutDev ) const; void mirror( tools::Rectangle& rRect, const OutputDevice*, bool bBack = false ) const; void mirror( vcl::Region& rRgn, const OutputDevice *pOutDev ) const; @@ -219,12 +219,12 @@ public: bool SetClipRegion( const vcl::Region&, const OutputDevice *pOutDev ); // draw --> LineColor and FillColor and RasterOp and ClipRegion - void DrawPixel( long nX, long nY, const OutputDevice *pOutDev ); - void DrawPixel( long nX, long nY, Color nColor, const OutputDevice *pOutDev ); + void DrawPixel( tools::Long nX, tools::Long nY, const OutputDevice *pOutDev ); + void DrawPixel( tools::Long nX, tools::Long nY, Color nColor, const OutputDevice *pOutDev ); - void DrawLine( long nX1, long nY1, long nX2, long nY2, const OutputDevice *pOutDev ); + void DrawLine( tools::Long nX1, tools::Long nY1, tools::Long nX2, tools::Long nY2, const OutputDevice *pOutDev ); - void DrawRect( long nX, long nY, long nWidth, long nHeight, const OutputDevice *pOutDev ); + void DrawRect( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, const OutputDevice *pOutDev ); void DrawPolyLine( sal_uInt32 nPoints, SalPoint const * pPtAry, const OutputDevice *pOutDev ); @@ -282,9 +282,9 @@ public: // CopyArea --> No RasterOp, but ClipRegion void CopyArea( - long nDestX, long nDestY, - long nSrcX, long nSrcY, - long nSrcWidth, long nSrcHeight, + tools::Long nDestX, tools::Long nDestY, + tools::Long nSrcX, tools::Long nSrcY, + tools::Long nSrcWidth, tools::Long nSrcHeight, const OutputDevice *pOutDev ); // CopyBits and DrawBitmap --> RasterOp and ClipRegion @@ -313,18 +313,18 @@ public: const OutputDevice *pOutDev ); std::shared_ptr<SalBitmap> GetBitmap( - long nX, long nY, - long nWidth, long nHeight, + tools::Long nX, tools::Long nY, + tools::Long nWidth, tools::Long nHeight, const OutputDevice *pOutDev ); Color GetPixel( - long nX, long nY, + tools::Long nX, tools::Long nY, const OutputDevice *pOutDev ); // invert --> ClipRegion (only Windows) void Invert( - long nX, long nY, - long nWidth, long nHeight, + tools::Long nX, tools::Long nY, + tools::Long nWidth, tools::Long nHeight, SalInvert nFlags, const OutputDevice *pOutDev ); @@ -335,8 +335,8 @@ public: const OutputDevice *pOutDev ); bool DrawEPS( - long nX, long nY, - long nWidth, long nHeight, + tools::Long nX, tools::Long nY, + tools::Long nWidth, tools::Long nHeight, void* pPtr, sal_uInt32 nSize, const OutputDevice *pOutDev ); @@ -416,8 +416,8 @@ public: const OutputDevice* pOutDev ); bool DrawAlphaRect( - long nX, long nY, - long nWidth, long nHeight, + tools::Long nX, tools::Long nY, + tools::Long nWidth, tools::Long nHeight, sal_uInt8 nTransparency, const OutputDevice *pOutDev ); @@ -443,12 +443,12 @@ protected: virtual bool setClipRegion( const vcl::Region& ) = 0; // draw --> LineColor and FillColor and RasterOp and ClipRegion - virtual void drawPixel( long nX, long nY ) = 0; - virtual void drawPixel( long nX, long nY, Color nColor ) = 0; + virtual void drawPixel( tools::Long nX, tools::Long nY ) = 0; + virtual void drawPixel( tools::Long nX, tools::Long nY, Color nColor ) = 0; - virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ) = 0; + virtual void drawLine( tools::Long nX1, tools::Long nY1, tools::Long nX2, tools::Long nY2 ) = 0; - virtual void drawRect( long nX, long nY, long nWidth, long nHeight ) = 0; + virtual void drawRect( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) = 0; virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) = 0; @@ -500,9 +500,9 @@ protected: // CopyArea --> No RasterOp, but ClipRegion virtual void copyArea( - long nDestX, long nDestY, - long nSrcX, long nSrcY, - long nSrcWidth, long nSrcHeight, + tools::Long nDestX, tools::Long nDestY, + tools::Long nSrcX, tools::Long nSrcY, + tools::Long nSrcWidth, tools::Long nSrcHeight, bool bWindowInvalidate ) = 0; // CopyBits and DrawBitmap --> RasterOp and ClipRegion @@ -521,21 +521,21 @@ protected: const SalBitmap& rSalBitmap, Color nMaskColor ) = 0; - virtual std::shared_ptr<SalBitmap> getBitmap( long nX, long nY, long nWidth, long nHeight ) = 0; + virtual std::shared_ptr<SalBitmap> getBitmap( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) = 0; - virtual Color getPixel( long nX, long nY ) = 0; + virtual Color getPixel( tools::Long nX, tools::Long nY ) = 0; // invert --> ClipRegion (only Windows or VirDevs) virtual void invert( - long nX, long nY, - long nWidth, long nHeight, + tools::Long nX, tools::Long nY, + tools::Long nWidth, tools::Long nHeight, SalInvert nFlags) = 0; virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) = 0; virtual bool drawEPS( - long nX, long nY, - long nWidth, long nHeight, + tools::Long nX, tools::Long nY, + tools::Long nWidth, tools::Long nHeight, void* pPtr, sal_uInt32 nSize ) = 0; @@ -587,8 +587,8 @@ protected: * @returns true if successfully drawn, false if not able to draw rectangle */ virtual bool drawAlphaRect( - long nX, long nY, - long nWidth, long nHeight, + tools::Long nX, tools::Long nY, + tools::Long nWidth, tools::Long nHeight, sal_uInt8 nTransparency ) = 0; private: @@ -596,13 +596,13 @@ private: // for buffering the Mirror-Matrix, see ::getMirror basegfx::B2DHomMatrix m_aLastMirror; - long m_aLastMirrorW; + tools::Long m_aLastMirrorW; protected: /// flags which hold the SetAntialiasing() value from OutputDevice bool m_bAntiAlias : 1; - inline long GetDeviceWidth(const OutputDevice* pOutDev) const; + inline tools::Long GetDeviceWidth(const OutputDevice* pOutDev) const; /** * Handle damage done by drawing with a widget draw override diff --git a/vcl/inc/salgdiimpl.hxx b/vcl/inc/salgdiimpl.hxx index 1af6e68bc2b0..ce86fcbd74df 100644 --- a/vcl/inc/salgdiimpl.hxx +++ b/vcl/inc/salgdiimpl.hxx @@ -59,7 +59,7 @@ public: virtual sal_uInt16 GetBitCount() const = 0; // get the width of the device - virtual long GetGraphicsWidth() const = 0; + virtual tools::Long GetGraphicsWidth() const = 0; // set the clip region to empty virtual void ResetClipRegion() = 0; @@ -88,12 +88,12 @@ public: virtual void SetROPFillColor( SalROPColor nROPColor ) = 0; // draw --> LineColor and FillColor and RasterOp and ClipRegion - virtual void drawPixel( long nX, long nY ) = 0; - virtual void drawPixel( long nX, long nY, Color nColor ) = 0; + virtual void drawPixel( tools::Long nX, tools::Long nY ) = 0; + virtual void drawPixel( tools::Long nX, tools::Long nY, Color nColor ) = 0; - virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ) = 0; + virtual void drawLine( tools::Long nX1, tools::Long nY1, tools::Long nX2, tools::Long nY2 ) = 0; - virtual void drawRect( long nX, long nY, long nWidth, long nHeight ) = 0; + virtual void drawRect( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) = 0; virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) = 0; @@ -135,9 +135,9 @@ public: // CopyArea --> No RasterOp, but ClipRegion virtual void copyArea( - long nDestX, long nDestY, - long nSrcX, long nSrcY, - long nSrcWidth, long nSrcHeight, + tools::Long nDestX, tools::Long nDestY, + tools::Long nSrcX, tools::Long nSrcY, + tools::Long nSrcWidth, tools::Long nSrcHeight, bool bWindowInvalidate ) = 0; // CopyBits and DrawBitmap --> RasterOp and ClipRegion @@ -156,21 +156,21 @@ public: const SalBitmap& rSalBitmap, Color nMaskColor ) = 0; - virtual std::shared_ptr<SalBitmap> getBitmap( long nX, long nY, long nWidth, long nHeight ) = 0; + virtual std::shared_ptr<SalBitmap> getBitmap( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) = 0; - virtual Color getPixel( long nX, long nY ) = 0; + virtual Color getPixel( tools::Long nX, tools::Long nY ) = 0; // invert --> ClipRegion (only Windows or VirDevs) virtual void invert( - long nX, long nY, - long nWidth, long nHeight, + tools::Long nX, tools::Long nY, + tools::Long nWidth, tools::Long nHeight, SalInvert nFlags) = 0; virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) = 0; virtual bool drawEPS( - long nX, long nY, - long nWidth, long nHeight, + tools::Long nX, tools::Long nY, + tools::Long nWidth, tools::Long nHeight, void* pPtr, sal_uInt32 nSize ) = 0; @@ -198,8 +198,8 @@ public: const SalBitmap* pAlphaBitmap) = 0; virtual bool drawAlphaRect( - long nX, long nY, - long nWidth, long nHeight, + tools::Long nX, tools::Long nY, + tools::Long nWidth, tools::Long nHeight, sal_uInt8 nTransparency ) = 0; virtual bool drawGradient(const tools::PolyPolygon& rPolygon, const Gradient& rGradient) = 0; diff --git a/vcl/inc/salgeom.hxx b/vcl/inc/salgeom.hxx index 6adeb7a6937c..ac87d83f4a26 100644 --- a/vcl/inc/salgeom.hxx +++ b/vcl/inc/salgeom.hxx @@ -23,10 +23,11 @@ #include <iostream> #include <vcl/dllapi.h> +#include <tools/long.hxx> struct SalFrameGeometry { // screen position of upper left corner of drawable area in pixel - long nX, nY; + tools::Long nX, nY; // dimensions of the drawable area in pixel unsigned long nWidth, nHeight; // thickness of the decoration in pixel @@ -62,8 +63,8 @@ inline std::ostream &operator <<(std::ostream& s, const SalFrameGeometry& rGeom) class VCL_PLUGIN_PUBLIC SalGeometryProvider { public: virtual ~SalGeometryProvider() {} - virtual long GetWidth() const = 0; - virtual long GetHeight() const = 0; + virtual tools::Long GetWidth() const = 0; + virtual tools::Long GetHeight() const = 0; virtual bool IsOffScreen() const = 0; }; diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx index 24c172e7d0f9..1a6ce96cf809 100644 --- a/vcl/inc/salinst.hxx +++ b/vcl/inc/salinst.hxx @@ -106,7 +106,7 @@ public: // its size; otherwise these remain unchanged. virtual std::unique_ptr<SalVirtualDevice> CreateVirtualDevice( SalGraphics* pGraphics, - long &rDX, long &rDY, + tools::Long &rDX, tools::Long &rDY, DeviceFormat eFormat, const SystemGraphicsData *pData = nullptr ) = 0; // Printer diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index 9ab526365ea7..6e8b2afb2854 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -128,7 +128,7 @@ public: void DrawText(SalGraphics&) const override; sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra, int nFactor) const override; DeviceCoordinate FillDXArray(DeviceCoordinate* pDXArray) const override; - void GetCaretPositions(int nArraySize, long* pCaretXArray) const override; + void GetCaretPositions(int nArraySize, tools::Long* pCaretXArray) const override; bool GetNextGlyph(const GlyphItem** pGlyph, Point& rPos, int& nStart, const PhysicalFontFace** pFallbackFont = nullptr) const override; bool GetOutline(basegfx::B2DPolyPolygonVector&) const override; @@ -176,7 +176,7 @@ public: DeviceCoordinate GetTextWidth() const final override; DeviceCoordinate FillDXArray(DeviceCoordinate* pDXArray) const final override; sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra, int nFactor) const final override; - void GetCaretPositions(int nArraySize, long* pCaretXArray) const final override; + void GetCaretPositions(int nArraySize, tools::Long* pCaretXArray) const final override; // used by display layers LogicalFontInstance& GetFont() const @@ -187,7 +187,7 @@ public: private: // for glyph+font+script fallback - void MoveGlyph(int nStart, long nNewXPos); + void MoveGlyph(int nStart, tools::Long nNewXPos); void DropGlyph(int nStart); void Simplify(bool bIsBase); diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx index 6e79e49208bb..b5d9d64f82e4 100644 --- a/vcl/inc/salobj.hxx +++ b/vcl/inc/salobj.hxx @@ -41,10 +41,10 @@ public: virtual void ResetClipRegion() = 0; virtual void BeginSetClipRegion( sal_uInt32 nRects ) = 0; - virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) = 0; + virtual void UnionClipRegion( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) = 0; virtual void EndSetClipRegion() = 0; - virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) = 0; + virtual void SetPosSize( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) = 0; virtual void Show( bool bVisible ) = 0; virtual void Enable( bool /* nEnable */ ) {} // overridden by WinSalObject virtual void GrabFocus() {} diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx index 9c631dc02100..d72853b597bf 100644 --- a/vcl/inc/salprn.hxx +++ b/vcl/inc/salprn.hxx @@ -73,7 +73,7 @@ public: virtual bool SetData( JobSetFlags nFlags, ImplJobSetup* pSetupData ) = 0; virtual void GetPageInfo( const ImplJobSetup* pSetupData, - long& rOutWidth, long& rOutHeight, + tools::Long& rOutWidth, tools::Long& rOutHeight, Point& rPageOffset, Size& rPaperSize ) = 0; virtual sal_uInt32 GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) = 0; diff --git a/vcl/inc/salvd.hxx b/vcl/inc/salvd.hxx index 8a6fe144c3a1..d1035feaebdd 100644 --- a/vcl/inc/salvd.hxx +++ b/vcl/inc/salvd.hxx @@ -41,10 +41,10 @@ public: virtual void ReleaseGraphics( SalGraphics* pGraphics ) = 0; // Set new size, without saving the old contents - virtual bool SetSize( long nNewDX, long nNewDY ) = 0; + virtual bool SetSize( tools::Long nNewDX, tools::Long nNewDY ) = 0; // Set new size using a buffer at the given address - virtual bool SetSizeUsingBuffer( long nNewDX, long nNewDY, + virtual bool SetSizeUsingBuffer( tools::Long nNewDX, tools::Long nNewDY, sal_uInt8 * /* pBuffer */) { // Only the headless virtual device has an implementation that uses diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index 7f925973bd92..a2fb935da53d 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -467,7 +467,7 @@ private: // for calc ref dialog that shrink to range selection widgets and resize back VclPtr<vcl::Window> m_xRefEdit; std::vector<VclPtr<vcl::Window>> m_aHiddenWidgets; // vector of hidden Controls - long m_nOldEditWidthReq; // Original width request of the input field + tools::Long m_nOldEditWidthReq; // Original width request of the input field sal_Int32 m_nOldBorderWidth; // border width for expanded dialog DECL_LINK(PopupScreenShotMenuHdl, const CommandEvent&, bool); diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx index c6820fbc8cb9..ea2ee46af04f 100644 --- a/vcl/inc/salwtype.hxx +++ b/vcl/inc/salwtype.hxx @@ -24,6 +24,7 @@ #include <rtl/ref.hxx> #include <rtl/ustring.hxx> #include <tools/solar.h> +#include <tools/long.hxx> #include <vcl/GestureEvent.hxx> class LogicalFontInstance; @@ -91,8 +92,8 @@ enum class SalEvent { struct SalAbstractMouseEvent { sal_uInt64 mnTime; // Time in ms, when event is created - long mnX; // X-Position (Pixel, TopLeft-Output) - long mnY; // Y-Position (Pixel, TopLeft-Output) + tools::Long mnX; // X-Position (Pixel, TopLeft-Output) + tools::Long mnY; // Y-Position (Pixel, TopLeft-Output) sal_uInt16 mnCode; // SV-Modifiercode (KEY_SHIFT|KEY_MOD1|KEY_MOD2|MOUSE_LEFT|MOUSE_MIDDLE|MOUSE_RIGHT) protected: @@ -139,13 +140,13 @@ struct SalKeyModEvent struct SalPaintEvent { - long mnBoundX; // BoundRect - X - long mnBoundY; // BoundRect - Y - long mnBoundWidth; // BoundRect - Width - long mnBoundHeight; // BoundRect - Height + tools::Long mnBoundX; // BoundRect - X + tools::Long mnBoundY; // BoundRect - Y + tools::Long mnBoundWidth; // BoundRect - Width + tools::Long mnBoundHeight; // BoundRect - Height bool mbImmediateUpdate; // set to true to force an immediate update - SalPaintEvent( long x, long y, long w, long h, bool bImmediate = false ) : + SalPaintEvent( tools::Long x, tools::Long y, tools::Long w, tools::Long h, bool bImmediate = false ) : mnBoundX( x ), mnBoundY( y ), mnBoundWidth( w ), mnBoundHeight( h ), mbImmediateUpdate( bImmediate ) @@ -155,8 +156,8 @@ struct SalPaintEvent #define SAL_WHEELMOUSE_EVENT_PAGESCROLL (sal_uLong(0xFFFFFFFF)) struct SalWheelMouseEvent final : public SalAbstractMouseEvent { - long mnDelta; // Number of rotations - long mnNotchDelta; // Number of fixed rotations + tools::Long mnDelta; // Number of rotations + tools::Long mnNotchDelta; // Number of fixed rotations double mnScrollLines; // Actual number of lines to scroll bool mbHorz; // Horizontal bool mbDeltaIsPixel; // delta value is a pixel value (on touch devices) @@ -176,11 +177,11 @@ struct SalExtTextInputEvent struct SalExtTextInputPosEvent { - long mnX; // Cursor-X-Position to upper left corner of frame - long mnY; // Cursor-Y-Position to upper left corner of frame - long mnWidth; // Cursor-Width in Pixel - long mnHeight; // Cursor-Height in Pixel - long mnExtWidth; // Width of the PreEdit area + tools::Long mnX; // Cursor-X-Position to upper left corner of frame + tools::Long mnY; // Cursor-Y-Position to upper left corner of frame + tools::Long mnWidth; // Cursor-Width in Pixel + tools::Long mnHeight; // Cursor-Height in Pixel + tools::Long mnExtWidth; // Width of the PreEdit area bool mbVertical; // true if in vertical mode SalExtTextInputPosEvent() : mnX(0) @@ -215,10 +216,10 @@ struct SalQueryCharPositionEvent bool mbValid; // The data is valid or not. sal_uLong mnCharPos; // The index of character in a composition. bool mbVertical; // The text is vertical or not. - long mnCursorBoundX; // The cursor bounds corresponding to the character specified by mnCharPos - X - long mnCursorBoundY; // The cursor bounds corresponding to the character specified by mnCharPos - Y - long mnCursorBoundWidth; // The cursor bounds corresponding to the character specified by mnCharPos - Width - long mnCursorBoundHeight; // The cursor bounds corresponding to the character specified by mnCharPos - Height + tools::Long mnCursorBoundX; // The cursor bounds corresponding to the character specified by mnCharPos - X + tools::Long mnCursorBoundY; // The cursor bounds corresponding to the character specified by mnCharPos - Y + tools::Long mnCursorBoundWidth; // The cursor bounds corresponding to the character specified by mnCharPos - Width + tools::Long mnCursorBoundHeight; // The cursor bounds corresponding to the character specified by mnCharPos - Height }; typedef bool (*SALFRAMEPROC)( vcl::Window* pInst, SalEvent nEvent, const void* pEvent ); @@ -232,14 +233,14 @@ enum class SalObjEvent { struct SalFrameState { WindowStateMask mnMask; - long mnX; - long mnY; - long mnWidth; - long mnHeight; - long mnMaximizedX; - long mnMaximizedY; - long mnMaximizedWidth; - long mnMaximizedHeight; + tools::Long mnX; + tools::Long mnY; + tools::Long mnWidth; + tools::Long mnHeight; + tools::Long mnMaximizedX; + tools::Long mnMaximizedY; + tools::Long mnMaximizedWidth; + tools::Long mnMaximizedHeight; WindowStateState mnState; }; @@ -253,14 +254,14 @@ struct SalSwipeEvent { double mnVelocityX; double mnVelocityY; - long mnX; - long mnY; + tools::Long mnX; + tools::Long mnY; }; struct SalLongPressEvent { - long mnX; - long mnY; + tools::Long mnX; + tools::Long mnY; }; struct SalGestureEvent @@ -268,8 +269,8 @@ struct SalGestureEvent GestureEventType meEventType; PanningOrientation meOrientation; double mfOffset; - long mnX; - long mnY; + tools::Long mnX; + tools::Long mnY; }; typedef void (*SALTIMERPROC)(); diff --git a/vcl/inc/scanlinewriter.hxx b/vcl/inc/scanlinewriter.hxx index a5b892b02b6b..6be9623023cd 100644 --- a/vcl/inc/scanlinewriter.hxx +++ b/vcl/inc/scanlinewriter.hxx @@ -34,7 +34,7 @@ class ScanlineWriter sal_uInt8 const mnColorBitSize; // number of bits a color takes sal_uInt8 const mnColorBitMask; // bit mask used to isolate the color sal_uInt8* mpCurrentScanline; - long mnX; + tools::Long mnX; public: @@ -65,10 +65,10 @@ public: void writeRGB(sal_uInt8 nR, sal_uInt8 nG, sal_uInt8 nB) { // calculate to which index we will write - long nScanlineIndex = mnX / mnColorsPerByte; + tools::Long nScanlineIndex = mnX / mnColorsPerByte; // calculate the number of shifts to get the color information to the right place - long nShift = (8 - mnColorBitSize) - ((mnX % mnColorsPerByte) * mnColorBitSize); + tools::Long nShift = (8 - mnColorBitSize) - ((mnX % mnColorsPerByte) * mnColorBitSize); sal_uInt16 nColorIndex = maPalette.GetBestIndex(BitmapColor(nR, nG, nB)); mpCurrentScanline[nScanlineIndex] &= ~(mnColorBitMask << nShift); // clear diff --git a/vcl/inc/scrwnd.hxx b/vcl/inc/scrwnd.hxx index c55fbd985497..879daa9c5021 100644 --- a/vcl/inc/scrwnd.hxx +++ b/vcl/inc/scrwnd.hxx @@ -52,12 +52,12 @@ private: WheelMode mnWheelMode; sal_uLong mnMaxWidth; sal_uLong mnActDist; - long mnActDeltaX; - long mnActDeltaY; + tools::Long mnActDeltaX; + tools::Long mnActDeltaY; void ImplCreateImageList(); void ImplSetRegion(const Bitmap& rRegionBmp); using Window::ImplGetMousePointer; - PointerStyle ImplGetMousePointer( long nDistX, long nDistY ); + PointerStyle ImplGetMousePointer( tools::Long nDistX, tools::Long nDistY ); void ImplDrawWheel(vcl::RenderContext& rRenderContext); void ImplRecalcScrollValues(); diff --git a/vcl/inc/skia/gdiimpl.hxx b/vcl/inc/skia/gdiimpl.hxx index 3cc577300128..a1c32dd00910 100644 --- a/vcl/inc/skia/gdiimpl.hxx +++ b/vcl/inc/skia/gdiimpl.hxx @@ -57,7 +57,7 @@ public: virtual sal_uInt16 GetBitCount() const override; // get the width of the device - virtual long GetGraphicsWidth() const override; + virtual tools::Long GetGraphicsWidth() const override; // set the clip region to empty virtual void ResetClipRegion() override; @@ -86,12 +86,14 @@ public: virtual void SetROPFillColor(SalROPColor nROPColor) override; // draw --> LineColor and FillColor and RasterOp and ClipRegion - virtual void drawPixel(long nX, long nY) override; - virtual void drawPixel(long nX, long nY, Color nColor) override; + virtual void drawPixel(tools::Long nX, tools::Long nY) override; + virtual void drawPixel(tools::Long nX, tools::Long nY, Color nColor) override; - virtual void drawLine(long nX1, long nY1, long nX2, long nY2) override; + virtual void drawLine(tools::Long nX1, tools::Long nY1, tools::Long nX2, + tools::Long nY2) override; - virtual void drawRect(long nX, long nY, long nWidth, long nHeight) override; + virtual void drawRect(tools::Long nX, tools::Long nY, tools::Long nWidth, + tools::Long nHeight) override; virtual void drawPolyLine(sal_uInt32 nPoints, const SalPoint* pPtAry) override; @@ -120,8 +122,9 @@ public: const PolyFlags* const* pFlgAry) override; // CopyArea --> No RasterOp, but ClipRegion - virtual void copyArea(long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth, - long nSrcHeight, bool bWindowInvalidate) override; + virtual void copyArea(tools::Long nDestX, tools::Long nDestY, tools::Long nSrcX, + tools::Long nSrcY, tools::Long nSrcWidth, tools::Long nSrcHeight, + bool bWindowInvalidate) override; virtual void copyBits(const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics) override; @@ -139,18 +142,19 @@ public: virtual void drawMask(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, Color nMaskColor) override; - virtual std::shared_ptr<SalBitmap> getBitmap(long nX, long nY, long nWidth, - long nHeight) override; + virtual std::shared_ptr<SalBitmap> getBitmap(tools::Long nX, tools::Long nY, tools::Long nWidth, + tools::Long nHeight) override; - virtual Color getPixel(long nX, long nY) override; + virtual Color getPixel(tools::Long nX, tools::Long nY) override; // invert --> ClipRegion (only Windows or VirDevs) - virtual void invert(long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) override; + virtual void invert(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, + SalInvert nFlags) override; virtual void invert(sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags) override; - virtual bool drawEPS(long nX, long nY, long nWidth, long nHeight, void* pPtr, - sal_uInt32 nSize) override; + virtual bool drawEPS(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, + void* pPtr, sal_uInt32 nSize) override; /** Render bitmap with alpha channel @@ -187,8 +191,8 @@ public: @returns true if successfully drawn, false if not able to draw rectangle */ - virtual bool drawAlphaRect(long nX, long nY, long nWidth, long nHeight, - sal_uInt8 nTransparency) override; + virtual bool drawAlphaRect(tools::Long nX, tools::Long nY, tools::Long nWidth, + tools::Long nHeight, sal_uInt8 nTransparency) override; virtual bool drawGradient(const tools::PolyPolygon& rPolygon, const Gradient& rGradient) override; @@ -241,8 +245,8 @@ protected: virtual void createWindowContext(bool forceRaster = false) = 0; void createOffscreenSurface(); - void privateDrawAlphaRect(long nX, long nY, long nWidth, long nHeight, double nTransparency, - bool blockAA = false); + void privateDrawAlphaRect(tools::Long nX, tools::Long nY, tools::Long nWidth, + tools::Long nHeight, double nTransparency, bool blockAA = false); void setProvider(SalGeometryProvider* provider) { mProvider = provider; } @@ -289,8 +293,8 @@ protected: // rounding results in off-by-one errors (down), especially when drawing using GPU, // see https://bugs.chromium.org/p/skia/issues/detail?id=9611 . Compensate for // it by using centers of pixels. Using 0.5 may sometimes round up, so go with 0.495 . - static constexpr SkScalar toSkX(long x) { return x + 0.495; } - static constexpr SkScalar toSkY(long y) { return y + 0.495; } + static constexpr SkScalar toSkX(tools::Long x) { return x + 0.495; } + static constexpr SkScalar toSkY(tools::Long y) { return y + 0.495; } // Value to add to be exactly in the middle of the pixel. static constexpr SkScalar toSkXYFix = SkScalar(0.005); diff --git a/vcl/inc/skia/x11/salvd.hxx b/vcl/inc/skia/x11/salvd.hxx index 8ff75175dc70..7beada38daf6 100644 --- a/vcl/inc/skia/x11/salvd.hxx +++ b/vcl/inc/skia/x11/salvd.hxx @@ -22,14 +22,14 @@ class X11SkiaSalVirtualDevice : public SalVirtualDevice int mnHeight; public: - X11SkiaSalVirtualDevice(SalGraphics const* pGraphics, long nDX, long nDY, + X11SkiaSalVirtualDevice(SalGraphics const* pGraphics, tools::Long nDX, tools::Long nDY, const SystemGraphicsData* pData, std::unique_ptr<X11SalGraphics> pNewGraphics); virtual ~X11SkiaSalVirtualDevice() override; // SalGeometryProvider - virtual long GetWidth() const override { return mnWidth; } - virtual long GetHeight() const override { return mnHeight; } + virtual tools::Long GetWidth() const override { return mnWidth; } + virtual tools::Long GetHeight() const override { return mnHeight; } SalDisplay* GetDisplay() const { return mpDisplay; } const SalX11Screen& GetXScreenNumber() const { return mnXScreen; } @@ -38,7 +38,7 @@ public: virtual void ReleaseGraphics(SalGraphics* pGraphics) override; // Set new size, without saving the old contents - virtual bool SetSize(long nNewDX, long nNewDY) override; + virtual bool SetSize(tools::Long nNewDX, tools::Long nNewDY) override; }; #endif // INCLUDED_VCL_INC_SKIA_X11_SALVD_H diff --git a/vcl/inc/slider.hxx b/vcl/inc/slider.hxx index 6f57d269c092..d0bac8419830 100644 --- a/vcl/inc/slider.hxx +++ b/vcl/inc/slider.hxx @@ -30,20 +30,20 @@ private: tools::Rectangle maChannel1Rect; tools::Rectangle maChannel2Rect; tools::Rectangle maThumbRect; - long mnStartPos; - long mnMouseOff; - long mnThumbPixOffset; - long mnThumbPixRange; - long mnThumbPixPos; - long mnThumbSize; - long mnChannelPixRange; - long mnChannelPixTop; - long mnChannelPixBottom; - long mnMinRange; - long mnMaxRange; - long mnThumbPos; - long mnLineSize; - long mnPageSize; + tools::Long mnStartPos; + tools::Long mnMouseOff; + tools::Long mnThumbPixOffset; + tools::Long mnThumbPixRange; + tools::Long mnThumbPixPos; + tools::Long mnThumbSize; + tools::Long mnChannelPixRange; + tools::Long mnChannelPixTop; + tools::Long mnChannelPixBottom; + tools::Long mnMinRange; + tools::Long mnMaxRange; + tools::Long mnThumbPos; + tools::Long mnLineSize; + tools::Long mnPageSize; sal_uInt16 mnStateFlags; ScrollType meScrollType; bool mbCalcSize; @@ -55,16 +55,16 @@ private: void ImplInit( vcl::Window* pParent, WinBits nStyle ); void ImplInitSettings(); void ImplUpdateRects( bool bUpdate = true ); - long ImplCalcThumbPos( long nPixPos ); - long ImplCalcThumbPosPix( long nPos ); + tools::Long ImplCalcThumbPos( tools::Long nPixPos ); + tools::Long ImplCalcThumbPosPix( tools::Long nPos ); void ImplCalc( bool bUpdate = true ); void ImplDraw(vcl::RenderContext& rRenderContext); bool ImplIsPageUp( const Point& rPos ); bool ImplIsPageDown( const Point& rPos ); - long ImplSlide( long nNewPos ); - long ImplDoAction( ); + tools::Long ImplSlide( tools::Long nNewPos ); + tools::Long ImplDoAction( ); void ImplDoMouseAction( const Point& rPos, bool bCallAction ); - void ImplDoSlide( long nNewPos ); + void ImplDoSlide( tools::Long nNewPos ); void ImplDoSlideAction( ScrollType eScrollType ); public: @@ -81,17 +81,17 @@ public: void Slide(); - 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 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 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; } Size CalcWindowSizePixel(); diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 588a51de7115..b8a7a54f35b7 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -223,8 +223,8 @@ struct ImplSVGDIData lru_scale_cache maScaleCache = lru_scale_cache(10); // Cache for scaled images ImplDirectFontSubstitution* mpDirectFontSubst = nullptr; // Font-Substitutions defined in Tools->Options->Fonts GraphicConverter* mpGrfConverter = nullptr; // Converter for graphics - long mnAppFontX = 0; // AppFont X-Numenator for 40/tel Width - long mnAppFontY = 0; // AppFont Y-Numenator for 80/tel Height + tools::Long mnAppFontX = 0; // AppFont X-Numenator for 40/tel Width + tools::Long mnAppFontY = 0; // AppFont Y-Numenator for 80/tel Height bool mbFontSubChanged = false; // true: FontSubstitution was changed between Begin/End o3tl::lru_map<OUString, BitmapEx> maThemeImageCache = o3tl::lru_map<OUString, BitmapEx>(10); diff --git a/vcl/inc/svimpbox.hxx b/vcl/inc/svimpbox.hxx index 92d5754387c7..ae171cca8e65 100644 --- a/vcl/inc/svimpbox.hxx +++ b/vcl/inc/svimpbox.hxx @@ -119,8 +119,8 @@ private: ImpLBSelEng m_aFctSet; - long m_nNodeBmpWidth; - long m_nMostRight; + tools::Long m_nNodeBmpWidth; + tools::Long m_nMostRight; short m_nHorSBarHeight, m_nVerSBarWidth; bool m_bUpdateMode : 1; @@ -136,9 +136,9 @@ private: DECL_LINK(EditTimerCall, Timer *, void); - void InvalidateEntriesFrom( long nY ) const; - bool IsLineVisible( long nY ) const; - void KeyLeftRight( long nDiff ); + void InvalidateEntriesFrom( tools::Long nY ) const; + bool IsLineVisible( tools::Long nY ) const; + void KeyLeftRight( tools::Long nDiff ); void DrawNet(vcl::RenderContext& rRenderContext); @@ -161,7 +161,7 @@ private: bool ButtonUpCheckCtrl( const MouseEvent& rMEvt ); bool ButtonDownCheckExpand( const MouseEvent&, SvTreeListEntry* ); - bool EntryReallyHit(SvTreeListEntry* pEntry, const Point& rPos, long nLine); + bool EntryReallyHit(SvTreeListEntry* pEntry, const Point& rPos, tools::Long nLine); void InitScrollBarBox(); SvLBoxTab* NextTab( SvLBoxTab const * ); @@ -198,10 +198,10 @@ protected: sal_uLong m_nVisibleCount; // Number of lines in control bool m_bInVScrollHdl : 1; bool m_bSimpleTravel : 1; // is true if SelectionMode::Single - long m_nNextVerVisSize; - long m_nNodeBmpTabDistance; // typical smaller than 0 + tools::Long m_nNextVerVisSize; + tools::Long m_nNodeBmpTabDistance; // typical smaller than 0 - virtual long GetEntryLine(const SvTreeListEntry* pEntry) const; + virtual tools::Long GetEntryLine(const SvTreeListEntry* pEntry) const; virtual void CursorDown(); virtual void CursorUp(); virtual void PageDown( sal_uInt16 nDelta ); @@ -209,7 +209,7 @@ protected: // set Thumb to FirstEntryToDraw virtual void SyncVerThumb(); virtual void AdjustScrollBars( Size& rSize ); - virtual void InvalidateEntry( long nY ) const; + virtual void InvalidateEntry( tools::Long nY ) const; tools::Rectangle GetVisibleArea() const; void SetCursor( SvTreeListEntry* pEntry, bool bForceNoSelect = false ); @@ -267,7 +267,7 @@ public: void SetCurEntry( SvTreeListEntry* ); virtual Point GetEntryPosition(const SvTreeListEntry*) const; void MakeVisible( SvTreeListEntry* pEntry, bool bMoveToTop = false ); - void ScrollToAbsPos( long nPos ); + void ScrollToAbsPos( tools::Long nPos ); void PaintDDCursor(SvTreeListEntry* pEntry, bool bShow); @@ -368,7 +368,7 @@ inline Point SvImpLBox::GetEntryPosition(const SvTreeListEntry* pEntry) const return Point(0, GetEntryLine(pEntry)); } -inline bool SvImpLBox::IsLineVisible( long nY ) const +inline bool SvImpLBox::IsLineVisible( tools::Long nY ) const { bool bRet = true; if ( nY < 0 || nY >= m_aOutputSize.Height() ) diff --git a/vcl/inc/test/outputdevice.hxx b/vcl/inc/test/outputdevice.hxx index c0d9a61cdb10..6bfed04bc358 100644 --- a/vcl/inc/test/outputdevice.hxx +++ b/vcl/inc/test/outputdevice.hxx @@ -45,7 +45,7 @@ public: OUString getRenderBackendName() const; - void initialSetup(long nWidth, long nHeight, Color aColor, bool bEnableAA = false, bool bAlphaVirtualDevice = false); + void initialSetup(tools::Long nWidth, tools::Long nHeight, Color aColor, bool bEnableAA = false, bool bAlphaVirtualDevice = false); static TestResult checkRectangle(Bitmap& rBitmap); static TestResult checkRectangleAA(Bitmap& rBitmap); diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx index e26cc6219b38..a2bd795b470e 100644 --- a/vcl/inc/textlayout.hxx +++ b/vcl/inc/textlayout.hxx @@ -29,11 +29,11 @@ namespace vcl class SAL_NO_VTABLE ITextLayout { public: - virtual long GetTextWidth( const OUString& _rText, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const = 0; + virtual tools::Long GetTextWidth( const OUString& _rText, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const = 0; virtual void DrawText( const Point& _rStartPoint, const OUString& _rText, sal_Int32 _nStartIndex, sal_Int32 _nLength, MetricVector* _pVector, OUString* _pDisplayText ) = 0; - virtual void GetCaretPositions( const OUString& _rText, long* _pCaretXArray, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const = 0; - virtual sal_Int32 GetTextBreak( const OUString& _rText, long _nMaxTextWidth, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const = 0; + virtual void GetCaretPositions( const OUString& _rText, tools::Long* _pCaretXArray, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const = 0; + virtual sal_Int32 GetTextBreak( const OUString& _rText, tools::Long _nMaxTextWidth, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const = 0; virtual bool DecomposeTextRectAction() const = 0; protected: @@ -53,7 +53,7 @@ namespace vcl virtual ~DefaultTextLayout(); // ITextLayout overridables - virtual long GetTextWidth( const OUString& _rText, + virtual tools::Long GetTextWidth( const OUString& _rText, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const override; @@ -65,12 +65,12 @@ namespace vcl OUString* _pDisplayText ) override; virtual void GetCaretPositions( const OUString& _rText, - long* _pCaretXArray, + tools::Long* _pCaretXArray, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const override; virtual sal_Int32 GetTextBreak( const OUString& _rText, - long _nMaxTextWidth, + tools::Long _nMaxTextWidth, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const override; diff --git a/vcl/inc/textlineinfo.hxx b/vcl/inc/textlineinfo.hxx index 03b19ede96e6..6b0e72ad36aa 100644 --- a/vcl/inc/textlineinfo.hxx +++ b/vcl/inc/textlineinfo.hxx @@ -26,19 +26,19 @@ class ImplTextLineInfo { private: - long mnWidth; + tools::Long mnWidth; sal_Int32 mnIndex; sal_Int32 mnLen; public: - ImplTextLineInfo( long nWidth, sal_Int32 nIndex, sal_Int32 nLen ) + ImplTextLineInfo( tools::Long nWidth, sal_Int32 nIndex, sal_Int32 nLen ) { mnWidth = nWidth; mnIndex = nIndex; mnLen = nLen; } - long GetWidth() const { return mnWidth; } + tools::Long GetWidth() const { return mnWidth; } sal_Int32 GetIndex() const { return mnIndex; } sal_Int32 GetLen() const { return mnLen; } }; diff --git a/vcl/inc/textrender.hxx b/vcl/inc/textrender.hxx index f1cbfd8990b5..40c253f1b889 100644 --- a/vcl/inc/textrender.hxx +++ b/vcl/inc/textrender.hxx @@ -51,8 +51,8 @@ public: int nGlyphs, FontSubsetInfo& rInfo) = 0; - virtual const void* GetEmbedFontData(const PhysicalFontFace*, long* pDataLen) = 0; - virtual void FreeEmbedFontData( const void* pData, long nDataLen ) = 0; + virtual const void* GetEmbedFontData(const PhysicalFontFace*, tools::Long* pDataLen) = 0; + virtual void FreeEmbedFontData( const void* pData, tools::Long nDataLen ) = 0; virtual void GetGlyphWidths( const PhysicalFontFace*, bool bVertical, diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h index bf4c51c5d0f8..a1f0cd2aaf33 100644 --- a/vcl/inc/toolbox.h +++ b/vcl/inc/toolbox.h @@ -38,7 +38,7 @@ struct ImplToolItem bool mbNonInteractiveWindow; void* mpUserData; Image maImage; - long mnImageAngle; + tools::Long mnImageAngle; bool mbMirrorMode; OUString maText; OUString maQuickHelpText; @@ -51,8 +51,8 @@ struct ImplToolItem Size maMinimalItemSize; /// The overall horizontal item size, including one or more of [image size + textlength + dropdown arrow] Size maItemSize; - long mnSepSize; - long mnDropDownArrowWidth; + tools::Long mnSepSize; + tools::Long mnDropDownArrowWidth; /// Size of the content (bitmap or text, without dropdown) that we have in the item. Size maContentSize; ToolBoxItemType meType; @@ -80,7 +80,7 @@ struct ImplToolItem // the default size is the precomputed size for standard items // ie those that are just ordinary buttons (no windows or text etc.) // bCheckMaxWidth indicates that item windows must not exceed maxWidth in which case they will be painted as buttons - Size GetSize( bool bHorz, bool bCheckMaxWidth, long maxWidth, const Size& rDefaultSize ); + Size GetSize( bool bHorz, bool bCheckMaxWidth, tools::Long maxWidth, const Size& rDefaultSize ); // only useful for buttons: returns if the text or image part or both can be drawn according to current button drawing style void DetermineButtonDrawStyle( ButtonType eButtonType, bool& rbImage, bool& rbText ) const; @@ -136,7 +136,7 @@ struct ImplToolBoxPrivateData // a dummy item representing the custom menu button ImplToolItem maMenubuttonItem; - long mnMenuButtonWidth; + tools::Long mnMenuButtonWidth; Wallpaper maDisplayBackground; diff --git a/vcl/inc/unx/freetypetextrender.hxx b/vcl/inc/unx/freetypetextrender.hxx index 9c4960e0f36c..2ac558eafaed 100644 --- a/vcl/inc/unx/freetypetextrender.hxx +++ b/vcl/inc/unx/freetypetextrender.hxx @@ -55,8 +55,8 @@ public: int nGlyphs, FontSubsetInfo& rInfo) override; - virtual const void* GetEmbedFontData(const PhysicalFontFace*, long* pDataLen) override; - virtual void FreeEmbedFontData( const void* pData, long nDataLen ) override; + virtual const void* GetEmbedFontData(const PhysicalFontFace*, tools::Long* pDataLen) override; + virtual void FreeEmbedFontData( const void* pData, tools::Long nDataLen ) override; virtual void GetGlyphWidths( const PhysicalFontFace*, bool bVertical, diff --git a/vcl/inc/unx/genprn.h b/vcl/inc/unx/genprn.h index 14917cf72ef5..0c92446d5286 100644 --- a/vcl/inc/unx/genprn.h +++ b/vcl/inc/unx/genprn.h @@ -43,7 +43,7 @@ public: virtual bool SetPrinterData( ImplJobSetup* pSetupData ) override; virtual bool SetData( JobSetFlags nFlags, ImplJobSetup* pSetupData ) override; virtual void GetPageInfo( const ImplJobSetup* pSetupData, - long& rOutWidth, long& rOutHeight, + tools::Long& rOutWidth, tools::Long& rOutHeight, Point& rPageOffset, Size& rPaperSize ) override; virtual sal_uInt32 GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) override; diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h index c02d6aa21fe3..8eb37ac187dd 100644 --- a/vcl/inc/unx/genpspgraphics.h +++ b/vcl/inc/unx/genpspgraphics.h @@ -51,8 +51,8 @@ public: void Init( psp::JobData* pJob, psp::PrinterGfx* pGfx ); // helper methods - static const void * DoGetEmbedFontData(psp::fontID aFont, long* pDataLen); - static void DoFreeEmbedFontData( const void* pData, long nLen ); + static const void * DoGetEmbedFontData(psp::fontID aFont, tools::Long* pDataLen); + static void DoFreeEmbedFontData( const void* pData, tools::Long nLen ); // helper methods for sharing with X11SalGraphics static void DoGetGlyphWidths( psp::fontID aFont, @@ -68,7 +68,7 @@ public: virtual SalGraphicsImpl*GetImpl() const override { return nullptr; }; virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) override; virtual sal_uInt16 GetBitCount() const override; - virtual long GetGraphicsWidth() const override; + virtual tools::Long GetGraphicsWidth() const override; virtual void ResetClipRegion() override; virtual bool setClipRegion( const vcl::Region& ) override; @@ -103,8 +103,8 @@ public: sal_Int32* pWidths, int nGlyphs, FontSubsetInfo& rInfo ) override; - virtual const void* GetEmbedFontData(const PhysicalFontFace*, long* pDataLen) override; - virtual void FreeEmbedFontData( const void* pData, long nDataLen ) override; + virtual const void* GetEmbedFontData(const PhysicalFontFace*, tools::Long* pDataLen) override; + virtual void FreeEmbedFontData( const void* pData, tools::Long nDataLen ) override; virtual void GetGlyphWidths( const PhysicalFontFace*, bool bVertical, std::vector< sal_Int32 >& rWidths, @@ -113,10 +113,10 @@ public: GetTextLayout(int nFallbackLevel) override; virtual void DrawTextLayout( const GenericSalLayout& ) override; virtual bool supportsOperation( OutDevSupportType ) const override; - virtual void drawPixel( long nX, long nY ) override; - virtual void drawPixel( long nX, long nY, Color nColor ) override; - virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ) override; - virtual void drawRect( long nX, long nY, long nWidth, long nHeight ) override; + virtual void drawPixel( tools::Long nX, tools::Long nY ) override; + virtual void drawPixel( tools::Long nX, tools::Long nY, Color nColor ) override; + virtual void drawLine( tools::Long nX1, tools::Long nY1, tools::Long nX2, tools::Long nY2 ) override; + virtual void drawRect( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override; virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) override; virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) override; virtual void drawPolyPolygon( sal_uInt32 nPoly, @@ -150,12 +150,12 @@ public: const PolyFlags* const* pFlgAry ) override; virtual bool drawGradient( const tools::PolyPolygon&, const Gradient& ) override { return false; }; - virtual void copyArea( long nDestX, - long nDestY, - long nSrcX, - long nSrcY, - long nSrcWidth, - long nSrcHeight, + virtual void copyArea( tools::Long nDestX, + tools::Long nDestY, + tools::Long nSrcX, + tools::Long nSrcY, + tools::Long nSrcWidth, + tools::Long nSrcHeight, bool bWindowInvalidate) override; virtual void copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) override; @@ -167,14 +167,14 @@ public: virtual void drawMask( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, Color nMaskColor ) override; - virtual std::shared_ptr<SalBitmap> getBitmap( long nX, long nY, long nWidth, long nHeight ) override; - virtual Color getPixel( long nX, long nY ) override; - virtual void invert( long nX, long nY, long nWidth, long nHeight, + virtual std::shared_ptr<SalBitmap> getBitmap( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override; + virtual Color getPixel( tools::Long nX, tools::Long nY ) override; + virtual void invert( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, SalInvert nFlags ) override; virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) override; - virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, + virtual bool drawEPS( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, void* pPtr, sal_uInt32 nSize ) override; virtual bool blendBitmap( const SalTwoRect&, const SalBitmap& rBitmap ) override; @@ -190,7 +190,7 @@ public: const basegfx::B2DPoint& rY, const SalBitmap& rSourceBitmap, const SalBitmap* pAlphaBitmap) override; - virtual bool drawAlphaRect( long nX, long nY, long nWidth, long nHeight, + virtual bool drawAlphaRect( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, sal_uInt8 nTransparency ) override; virtual SystemGraphicsData GetGraphicsData() const override; diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx index 4e409560a981..21b196623f30 100644 --- a/vcl/inc/unx/glyphcache.hxx +++ b/vcl/inc/unx/glyphcache.hxx @@ -148,8 +148,8 @@ private: FreetypeFontInstance& mrFontInstance; // 16.16 fixed point values used for a rotated font - long mnCos; - long mnSin; + tools::Long mnCos; + tools::Long mnSin; int mnWidth; int mnPrioAntiAlias; diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index c6eb3471f8d6..27865f2efb12 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -204,8 +204,8 @@ class GtkSalFrame final : public SalFrame tools::Rectangle m_aFloatRect; FloatWinPopupFlags m_nFloatFlags; bool m_bFloatPositioned; - long m_nWidthRequest; - long m_nHeightRequest; + tools::Long m_nWidthRequest; + tools::Long m_nHeightRequest; cairo_region_t* m_pRegion; GtkDropTarget* m_pDropTarget; GtkDragSource* m_pDragSource; @@ -301,12 +301,12 @@ class GtkSalFrame final : public SalFrame } //call gtk_window_resize - void window_resize(long nWidth, long nHeight); + void window_resize(tools::Long nWidth, tools::Long nHeight); //call gtk_widget_set_size_request - void widget_set_size_request(long nWidth, long nHeight); + void widget_set_size_request(tools::Long nWidth, tools::Long nHeight); - void resizeWindow( long nWidth, long nHeight ); - void moveWindow( long nX, long nY ); + void resizeWindow( tools::Long nWidth, tools::Long nHeight ); + void moveWindow( tools::Long nX, tools::Long nY ); Size calcDefaultSize(); @@ -417,10 +417,10 @@ public: virtual void Show( bool bVisible, bool bNoActivate = false ) override; // Set ClientSize and Center the Window to the desktop // and send/post a resize message - virtual void SetMinClientSize( long nWidth, long nHeight ) override; - virtual void SetMaxClientSize( long nWidth, long nHeight ) override; - virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) override; - virtual void GetClientSize( long& rWidth, long& rHeight ) override; + virtual void SetMinClientSize( tools::Long nWidth, tools::Long nHeight ) override; + virtual void SetMaxClientSize( tools::Long nWidth, tools::Long nHeight ) override; + virtual void SetPosSize( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, sal_uInt16 nFlags ) override; + virtual void GetClientSize( tools::Long& rWidth, tools::Long& rHeight ) override; virtual void GetWorkArea( tools::Rectangle& rRect ) override; virtual SalFrame* GetParent() const override; virtual void SetWindowState( const SalFrameState* pState ) override; @@ -439,7 +439,7 @@ public: virtual void SetPointer( PointerStyle ePointerStyle ) override; virtual void CaptureMouse( bool bMouse ) override; virtual void GrabFocus() override; - virtual void SetPointerPos( long nX, long nY ) override; + virtual void SetPointerPos( tools::Long nX, tools::Long nY ) override; // flush output buffer using SalFrame::Flush; @@ -486,7 +486,7 @@ public: // start setting the clipregion consisting of nRects rectangles virtual void BeginSetClipRegion( sal_uInt32 nRects ) override; // add a rectangle to the clip region - virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override; + virtual void UnionClipRegion( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override; // done setting up the clipregion virtual void EndSetClipRegion() override; diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index 2352b63a4869..3095e80144b3 100644 --- a/vcl/inc/unx/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -205,7 +205,7 @@ public: virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) override; virtual std::unique_ptr<SalVirtualDevice> CreateVirtualDevice( SalGraphics*, - long &nDX, long &nDY, + tools::Long &nDX, tools::Long &nDY, DeviceFormat eFormat, const SystemGraphicsData* = nullptr ) override; virtual std::shared_ptr<SalBitmap> CreateSalBitmap() override; diff --git a/vcl/inc/unx/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx index d1a5226cd9cc..8b37492e61cf 100644 --- a/vcl/inc/unx/gtk/gtkobject.hxx +++ b/vcl/inc/unx/gtk/gtkobject.hxx @@ -40,7 +40,7 @@ public: virtual ~GtkSalObjectBase() override; virtual void BeginSetClipRegion( sal_uInt32 nRects ) override; - virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override; + virtual void UnionClipRegion( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override; virtual void SetForwardKey( bool bEnable ) override; @@ -68,7 +68,7 @@ public: virtual void ResetClipRegion() override; virtual void EndSetClipRegion() override; - virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) override; + virtual void SetPosSize( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override; virtual void Show( bool bVisible ) override; virtual void Reparent(SalFrame* pFrame) override; }; @@ -96,7 +96,7 @@ public: virtual void ResetClipRegion() override; virtual void EndSetClipRegion() override; - virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) override; + virtual void SetPosSize( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override; virtual void Show( bool bVisible ) override; virtual void Reparent(SalFrame* pFrame) override; }; diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h index fc84501294fd..7f9f239d57b0 100644 --- a/vcl/inc/unx/salbmp.h +++ b/vcl/inc/unx/salbmp.h @@ -49,11 +49,11 @@ private: ImplCreateDIB( Drawable aDrawable, SalX11Screen nXScreen, - long nDrawableDepth, - long nX, - long nY, - long nWidth, - long nHeight, + tools::Long nDrawableDepth, + tools::Long nX, + tools::Long nY, + tools::Long nWidth, + tools::Long nHeight, bool bGrey ); @@ -77,31 +77,31 @@ public: bool ImplCreateFromDrawable( Drawable aDrawable, SalX11Screen nXScreen, - long nDrawableDepth, - long nX, - long nY, - long nWidth, - long nHeight + tools::Long nDrawableDepth, + tools::Long nX, + tools::Long nY, + tools::Long nWidth, + tools::Long nHeight ); XImage* ImplCreateXImage( SalDisplay const * pSalDisp, SalX11Screen nXScreen, - long nDepth, + tools::Long nDepth, const SalTwoRect& rTwoRect ) const; ImplSalDDB* ImplGetDDB( Drawable, SalX11Screen nXScreen, - long nDrawableDepth, + tools::Long nDrawableDepth, const SalTwoRect& ) const; void ImplDraw( Drawable aDrawable, SalX11Screen nXScreen, - long nDrawableDepth, + tools::Long nDrawableDepth, const SalTwoRect& rTwoRect, const GC& rGC ) const; @@ -156,19 +156,19 @@ private: Pixmap maPixmap; SalTwoRect maTwoRect; - long mnDepth; + tools::Long mnDepth; SalX11Screen mnXScreen; static void ImplDraw( Drawable aSrcDrawable, - long nSrcDrawableDepth, + tools::Long nSrcDrawableDepth, Drawable aDstDrawable, - long nSrcX, - long nSrcY, - long nDestWidth, - long nDestHeight, - long nDestX, - long nDestY, + tools::Long nSrcX, + tools::Long nSrcY, + tools::Long nDestWidth, + tools::Long nDestHeight, + tools::Long nDestX, + tools::Long nDestY, const GC& rGC ); @@ -184,22 +184,22 @@ public: ImplSalDDB( Drawable aDrawable, SalX11Screen nXScreen, - long nDrawableDepth, - long nX, - long nY, - long nWidth, - long nHeight + tools::Long nDrawableDepth, + tools::Long nX, + tools::Long nY, + tools::Long nWidth, + tools::Long nHeight ); ~ImplSalDDB(); Pixmap ImplGetPixmap() const { return maPixmap; } - long ImplGetWidth() const { return maTwoRect.mnDestWidth; } - long ImplGetHeight() const { return maTwoRect.mnDestHeight; } - long ImplGetDepth() const { return mnDepth; } + tools::Long ImplGetWidth() const { return maTwoRect.mnDestWidth; } + tools::Long ImplGetHeight() const { return maTwoRect.mnDestHeight; } + tools::Long ImplGetDepth() const { return mnDepth; } const SalX11Screen& ImplGetScreen() const { return mnXScreen; } - bool ImplMatches( SalX11Screen nXScreen, long nDepth, const SalTwoRect& rTwoRect ) const; + bool ImplMatches( SalX11Screen nXScreen, tools::Long nDepth, const SalTwoRect& rTwoRect ) const; void ImplDraw( Drawable aDrawable, diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 660a87ac47f7..c4fe3e747e59 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -311,7 +311,7 @@ protected: void processRandREvent( XEvent* ); void doDestruct(); - void addXineramaScreenUnique( int i, long i_nX, long i_nY, long i_nWidth, long i_nHeight ); + void addXineramaScreenUnique( int i, tools::Long i_nX, tools::Long i_nY, tools::Long i_nWidth, tools::Long i_nHeight ); Time GetEventTimeImpl( bool bAlwaysReget = false ) const; public: static bool BestOpenGLVisual(Display* pDisplay, int nScreen, XVisualInfo& rVI); diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index 4bc756a01639..ead2eedd7ef1 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -215,10 +215,10 @@ public: virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ) override; virtual void Show( bool bVisible, bool bNoActivate = false ) override; - virtual void SetMinClientSize( long nWidth, long nHeight ) override; - virtual void SetMaxClientSize( long nWidth, long nHeight ) override; - virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) override; - virtual void GetClientSize( long& rWidth, long& rHeight ) override; + virtual void SetMinClientSize( tools::Long nWidth, tools::Long nHeight ) override; + virtual void SetMaxClientSize( tools::Long nWidth, tools::Long nHeight ) override; + virtual void SetPosSize( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, sal_uInt16 nFlags ) override; + virtual void GetClientSize( tools::Long& rWidth, tools::Long& rHeight ) override; virtual void GetWorkArea( tools::Rectangle& rRect ) override; virtual SalFrame* GetParent() const override; virtual void SetWindowState( const SalFrameState* pState ) override; @@ -229,7 +229,7 @@ public: virtual void ToTop( SalFrameToTop nFlags ) override; virtual void SetPointer( PointerStyle ePointerStyle ) override; virtual void CaptureMouse( bool bMouse ) override; - virtual void SetPointerPos( long nX, long nY ) override; + virtual void SetPointerPos( tools::Long nX, tools::Long nY ) override; using SalFrame::Flush; virtual void Flush() override; virtual void SetInputContext( SalInputContext* pContext ) override; @@ -255,7 +255,7 @@ public: // start setting the clipregion consisting of nRects rectangles virtual void BeginSetClipRegion( sal_uInt32 nRects ) override; // add a rectangle to the clip region - virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override; + virtual void UnionClipRegion( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override; // done setting up the clipregion virtual void EndSetClipRegion() override; diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 6e5e260f1185..e4adf4ec6c20 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -103,7 +103,7 @@ public: // override all pure virtual methods virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) override; virtual sal_uInt16 GetBitCount() const override; - virtual long GetGraphicsWidth() const override; + virtual tools::Long GetGraphicsWidth() const override; virtual void ResetClipRegion() override; virtual bool setClipRegion( const vcl::Region& ) override; @@ -137,8 +137,8 @@ public: int nGlyphs, FontSubsetInfo& rInfo ) override; - virtual const void* GetEmbedFontData(const PhysicalFontFace*, long* pDataLen) override; - virtual void FreeEmbedFontData( const void* pData, long nDataLen ) override; + virtual const void* GetEmbedFontData(const PhysicalFontFace*, tools::Long* pDataLen) override; + virtual void FreeEmbedFontData( const void* pData, tools::Long nDataLen ) override; virtual void GetGlyphWidths( const PhysicalFontFace*, @@ -151,10 +151,10 @@ public: virtual void DrawTextLayout( const GenericSalLayout& ) override; virtual bool supportsOperation( OutDevSupportType ) const override; - virtual void drawPixel( long nX, long nY ) override; - virtual void drawPixel( long nX, long nY, Color nColor ) override; - virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ) override; - virtual void drawRect( long nX, long nY, long nWidth, long nHeight ) override; + virtual void drawPixel( tools::Long nX, tools::Long nY ) override; + virtual void drawPixel( tools::Long nX, tools::Long nY, Color nColor ) override; + virtual void drawLine( tools::Long nX1, tools::Long nY1, tools::Long nX2, tools::Long nY2 ) override; + virtual void drawRect( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override; virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) override; virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) override; @@ -202,12 +202,12 @@ public: #endif virtual void copyArea( - long nDestX, - long nDestY, - long nSrcX, - long nSrcY, - long nSrcWidth, - long nSrcHeight, + tools::Long nDestX, + tools::Long nDestY, + tools::Long nSrcX, + tools::Long nSrcY, + tools::Long nSrcWidth, + tools::Long nSrcHeight, bool bWindowInvalidate ) override; virtual void copyBits( @@ -228,12 +228,12 @@ public: const SalBitmap& rSalBitmap, Color nMaskColor ) override; - virtual std::shared_ptr<SalBitmap> getBitmap( long nX, long nY, long nWidth, long nHeight ) override; - virtual Color getPixel( long nX, long nY ) override; - virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ) override; + virtual std::shared_ptr<SalBitmap> getBitmap( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override; + virtual Color getPixel( tools::Long nX, tools::Long nY ) override; + virtual void invert( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, SalInvert nFlags ) override; virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) override; - virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uInt32 nSize ) override; + virtual bool drawEPS( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, void* pPtr, sal_uInt32 nSize ) override; virtual bool blendBitmap( const SalTwoRect&, @@ -258,8 +258,8 @@ public: const SalBitmap* pAlphaBitmap) override; virtual bool drawAlphaRect( - long nX, long nY, long nWidth, - long nHeight, sal_uInt8 nTransparency ) override; + tools::Long nX, tools::Long nY, tools::Long nWidth, + tools::Long nHeight, sal_uInt8 nTransparency ) override; virtual SystemGraphicsData GetGraphicsData() const override; diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h index 933de199654d..69c686de1c0d 100644 --- a/vcl/inc/unx/salinst.h +++ b/vcl/inc/unx/salinst.h @@ -52,12 +52,12 @@ public: virtual void DestroyObject( SalObject* pObject ) override; /// Gtk vclplug needs to pass GtkSalGraphics to X11SalVirtualDevice, so create it, and pass as pNewGraphics. - static std::unique_ptr<SalVirtualDevice> CreateX11VirtualDevice(SalGraphics const * pGraphics, long &nDX, long &nDY, + static std::unique_ptr<SalVirtualDevice> CreateX11VirtualDevice(SalGraphics const * pGraphics, tools::Long &nDX, tools::Long &nDY, DeviceFormat eFormat, const SystemGraphicsData* pData, std::unique_ptr<X11SalGraphics> pNewGraphics); virtual std::unique_ptr<SalVirtualDevice> CreateVirtualDevice( SalGraphics* pGraphics, - long &nDX, long &nDY, + tools::Long &nDX, tools::Long &nDY, DeviceFormat eFormat, const SystemGraphicsData *pData = nullptr ) override; virtual void PostPrintersChanged() override; virtual std::unique_ptr<GenPspGraphics> CreatePrintGraphics() override; diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h index 52e4b8f2bc6a..6cb63db11dd6 100644 --- a/vcl/inc/unx/salobj.h +++ b/vcl/inc/unx/salobj.h @@ -36,7 +36,7 @@ public: ~SalClipRegion(); void BeginSetClipRegion( sal_uInt32 nRects ); - void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); + void UnionClipRegion( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ); XRectangle *EndSetClipRegion() { return ClipRectangleList.get(); } @@ -74,10 +74,10 @@ public: // override all pure virtual methods virtual void ResetClipRegion() override; virtual void BeginSetClipRegion( sal_uInt32 nRects ) override; - virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override; + virtual void UnionClipRegion( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override; virtual void EndSetClipRegion() override; - virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) override; + virtual void SetPosSize( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override; virtual void Show( bool bVisible ) override; virtual void GrabFocus() override; diff --git a/vcl/inc/unx/salunx.h b/vcl/inc/unx/salunx.h index b70f45769d7c..70fb0e4d0a58 100644 --- a/vcl/inc/unx/salunx.h +++ b/vcl/inc/unx/salunx.h @@ -20,7 +20,9 @@ #ifndef INCLUDED_VCL_INC_UNX_SALUNX_H #define INCLUDED_VCL_INC_UNX_SALUNX_H -inline long Divide( long nDividend, long nDivisor ) +#include <tools/long.hxx> + +inline tools::Long Divide( tools::Long nDividend, tools::Long nDivisor ) { return (nDividend + nDivisor/2) / nDivisor; } #endif diff --git a/vcl/inc/unx/salvd.h b/vcl/inc/unx/salvd.h index b9874a3eb084..f01e3b5076f2 100644 --- a/vcl/inc/unx/salvd.h +++ b/vcl/inc/unx/salvd.h @@ -46,7 +46,7 @@ class X11SalVirtualDevice : public SalVirtualDevice bool bExternPixmap_; public: - X11SalVirtualDevice(SalGraphics const *pGraphics, long &nDX, long &nDY, + X11SalVirtualDevice(SalGraphics const *pGraphics, tools::Long &nDX, tools::Long &nDY, DeviceFormat eFormat, const SystemGraphicsData *pData, std::unique_ptr<X11SalGraphics> pNewGraphics); virtual ~X11SalVirtualDevice() override; @@ -67,11 +67,11 @@ public: virtual void ReleaseGraphics( SalGraphics* pGraphics ) override; /// Set new size, without saving the old contents - virtual bool SetSize( long nNewDX, long nNewDY ) override; + virtual bool SetSize( tools::Long nNewDX, tools::Long nNewDY ) override; // SalGeometryProvider - virtual long GetWidth() const override { return nDX_; } - virtual long GetHeight() const override { return nDY_; } + virtual tools::Long GetWidth() const override { return nDX_; } + virtual tools::Long GetHeight() const override { return nDY_; } }; #endif // INCLUDED_VCL_INC_UNX_SALVD_H diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx index 1739053a0d41..99420b3066c9 100644 --- a/vcl/inc/unx/wmadaptor.hxx +++ b/vcl/inc/unx/wmadaptor.hxx @@ -227,7 +227,7 @@ public: /* * set _NET_WM_USER_TIME property, if NetWM */ - virtual void setUserTime( X11SalFrame* i_pFrame, long i_nUserTime ) const; + virtual void setUserTime( X11SalFrame* i_pFrame, tools::Long i_nUserTime ) const; /* * tells whether fullscreen mode is supported by WM diff --git a/vcl/inc/window.h b/vcl/inc/window.h index ba318833f11b..a14852ca02c0 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -104,11 +104,11 @@ struct ImplWinData mpExtOldAttrAry; std::optional<tools::Rectangle> mpCursorRect; - long mnCursorExtWidth; + tools::Long mnCursorExtWidth; bool mbVertical; std::unique_ptr<tools::Rectangle[]> mpCompositionCharRects; - long mnCompositionCharRects; + tools::Long mnCompositionCharRects; std::optional<tools::Rectangle> mpFocusRect; std::optional<tools::Rectangle> @@ -141,14 +141,14 @@ struct ImplFrameData sal_Int32 mnDPIY; //< Original Screen Resolution ImplSVEvent * mnFocusId; //< FocusId for PostUserLink ImplSVEvent * mnMouseMoveId; //< MoveId for PostUserLink - long mnLastMouseX; //< last x mouse position - long mnLastMouseY; //< last y mouse position - long mnBeforeLastMouseX; //< last but one x mouse position - long mnBeforeLastMouseY; //< last but one y mouse position - long mnFirstMouseX; //< first x mouse position by mousebuttondown - long mnFirstMouseY; //< first y mouse position by mousebuttondown - long mnLastMouseWinX; //< last x mouse position, rel. to pMouseMoveWin - long mnLastMouseWinY; //< last y mouse position, rel. to pMouseMoveWin + tools::Long mnLastMouseX; //< last x mouse position + tools::Long mnLastMouseY; //< last y mouse position + tools::Long mnBeforeLastMouseX; //< last but one x mouse position + tools::Long mnBeforeLastMouseY; //< last but one y mouse position + tools::Long mnFirstMouseX; //< first x mouse position by mousebuttondown + tools::Long mnFirstMouseY; //< first y mouse position by mousebuttondown + tools::Long mnLastMouseWinX; //< last x mouse position, rel. to pMouseMoveWin + tools::Long mnLastMouseWinY; //< last y mouse position, rel. to pMouseMoveWin sal_uInt16 mnModalMode; //< frame based modal count (app based makes no sense anymore) sal_uInt64 mnMouseDownTime; //< mouse button down time for double click sal_uInt16 mnClickCount; //< mouse click count @@ -269,9 +269,9 @@ public: sal_Int32 mnHeightRequest; sal_Int32 mnOptimalWidthCache; sal_Int32 mnOptimalHeightCache; - long mnX; - long mnY; - long mnAbsScreenX; + tools::Long mnX; + tools::Long mnY; + tools::Long mnAbsScreenX; Point maPos; OString maHelpId; OUString maHelpText; @@ -406,8 +406,8 @@ class VCL_DLLPUBLIC PaintBufferGuard bool mbBackground; Wallpaper maBackground; AllSettings maSettings; - long mnOutOffX; - long mnOutOffY; + tools::Long mnOutOffX; + tools::Long mnOutOffY; tools::Rectangle m_aPaintRect; public: PaintBufferGuard(ImplFrameData* pFrameData, vcl::Window* pWindow); @@ -422,9 +422,9 @@ public: // helper methods bool ImplHandleMouseEvent( const VclPtr<vcl::Window>& xWindow, MouseNotifyEvent nSVEvent, bool bMouseLeave, - long nX, long nY, sal_uInt64 nMsgTime, + tools::Long nX, tools::Long nY, sal_uInt64 nMsgTime, sal_uInt16 nCode, MouseEventModifiers nMode ); -void ImplHandleResize( vcl::Window* pWindow, long nNewWidth, long nNewHeight ); +void ImplHandleResize( vcl::Window* pWindow, tools::Long nNewWidth, tools::Long nNewHeight ); VCL_DLLPUBLIC void ImplWindowStateFromStr(WindowStateData& rData, const OString& rStr); diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx index 2c82b3ab8dd3..32a6401a6799 100644 --- a/vcl/inc/wizdlg.hxx +++ b/vcl/inc/wizdlg.hxx @@ -85,7 +85,7 @@ namespace vcl // So use the travelXXX methods if you need to travel protected: - long LogicalCoordinateToPixel(int iCoordinate); + tools::Long LogicalCoordinateToPixel(int iCoordinate); /**sets the number of buttons which should be left-aligned. Normally, buttons are right-aligned. only to be used during construction, before any layouting happened @@ -120,7 +120,7 @@ namespace vcl virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) override; bool ShowPage( sal_uInt16 nLevel ); - bool Finish( long nResult = 0 ); + bool Finish( tools::Long nResult = 0 ); sal_uInt16 GetCurLevel() const { return mnCurLevel; } void AddPage( TabPage* pPage ); @@ -128,7 +128,7 @@ namespace vcl void SetPage( sal_uInt16 nLevel, TabPage* pPage ); TabPage* GetPage( sal_uInt16 nLevel ) const; - void AddButton( Button* pButton, long nOffset = 0 ); + void AddButton( Button* pButton, tools::Long nOffset = 0 ); void RemoveButton( Button* pButton ); void SetPageSizePixel( const Size& rSize ) { maPageSize = rSize; } |