summaryrefslogtreecommitdiff
path: root/vcl/unx/generic/gdi
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/unx/generic/gdi')
-rw-r--r--vcl/unx/generic/gdi/cairo_xlib_cairo.hxx6
-rw-r--r--vcl/unx/generic/gdi/font.cxx4
-rw-r--r--vcl/unx/generic/gdi/freetypetextrender.cxx4
-rw-r--r--vcl/unx/generic/gdi/gdiimpl.cxx46
-rw-r--r--vcl/unx/generic/gdi/gdiimpl.hxx34
-rw-r--r--vcl/unx/generic/gdi/salbmp.cxx62
-rw-r--r--vcl/unx/generic/gdi/salgdi.cxx14
-rw-r--r--vcl/unx/generic/gdi/salgdi2.cxx22
-rw-r--r--vcl/unx/generic/gdi/salvd.cxx12
-rw-r--r--vcl/unx/generic/gdi/x11cairotextrender.cxx2
10 files changed, 103 insertions, 103 deletions
diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
index 8b67c5951667..793f17f44342 100644
--- a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
+++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
@@ -38,7 +38,7 @@ namespace cairo {
explicit X11SysData( const SystemEnvData& );
void* pDisplay; // the relevant display connection
- long hDrawable; // a drawable
+ tools::Long hDrawable; // a drawable
void* pVisual; // the visual in use
int nScreen; // the current screen of the drawable
void* pRenderFormat; // render format for drawable
@@ -48,9 +48,9 @@ namespace cairo {
struct X11Pixmap
{
void* mpDisplay; // the relevant display connection
- long mhDrawable; // a drawable
+ tools::Long mhDrawable; // a drawable
- X11Pixmap( long hDrawable, void* pDisplay ) :
+ X11Pixmap( tools::Long hDrawable, void* pDisplay ) :
mpDisplay(pDisplay),
mhDrawable(hDrawable)
{}
diff --git a/vcl/unx/generic/gdi/font.cxx b/vcl/unx/generic/gdi/font.cxx
index 5a6f04fd856f..2c53f277c12d 100644
--- a/vcl/unx/generic/gdi/font.cxx
+++ b/vcl/unx/generic/gdi/font.cxx
@@ -94,12 +94,12 @@ bool X11SalGraphics::CreateFontSubset(
pGlyphIds, pEncoding, pWidths, nGlyphCount, rInfo);
}
-const void* X11SalGraphics::GetEmbedFontData(const PhysicalFontFace* pFont, long* pDataLen)
+const void* X11SalGraphics::GetEmbedFontData(const PhysicalFontFace* pFont, tools::Long* pDataLen)
{
return mxTextRenderImpl->GetEmbedFontData(pFont, pDataLen);
}
-void X11SalGraphics::FreeEmbedFontData( const void* pData, long nLen )
+void X11SalGraphics::FreeEmbedFontData( const void* pData, tools::Long nLen )
{
mxTextRenderImpl->FreeEmbedFontData(pData, nLen);
}
diff --git a/vcl/unx/generic/gdi/freetypetextrender.cxx b/vcl/unx/generic/gdi/freetypetextrender.cxx
index b364406f1e1d..0e6556b24588 100644
--- a/vcl/unx/generic/gdi/freetypetextrender.cxx
+++ b/vcl/unx/generic/gdi/freetypetextrender.cxx
@@ -181,7 +181,7 @@ bool FreeTypeTextRenderImpl::CreateFontSubset(
return bSuccess;
}
-const void* FreeTypeTextRenderImpl::GetEmbedFontData(const PhysicalFontFace* pFont, long* pDataLen)
+const void* FreeTypeTextRenderImpl::GetEmbedFontData(const PhysicalFontFace* pFont, tools::Long* pDataLen)
{
// in this context the pFont->GetFontId() is a valid PSP
// font since they are the only ones left after the PDF
@@ -192,7 +192,7 @@ const void* FreeTypeTextRenderImpl::GetEmbedFontData(const PhysicalFontFace* pFo
return GenPspGraphics::DoGetEmbedFontData(aFont, pDataLen);
}
-void FreeTypeTextRenderImpl::FreeEmbedFontData( const void* pData, long nLen )
+void FreeTypeTextRenderImpl::FreeEmbedFontData( const void* pData, tools::Long nLen )
{
GenPspGraphics::DoFreeEmbedFontData( pData, nLen );
}
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index 337454c2a868..eaccc865cd41 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -543,9 +543,9 @@ void X11SalGraphicsImpl::copyBits( const SalTwoRect& rPosAry,
}
}
-void X11SalGraphicsImpl::copyArea ( long nDestX, long nDestY,
- long nSrcX, long nSrcY,
- long nSrcWidth, long nSrcHeight,
+void X11SalGraphicsImpl::copyArea ( tools::Long nDestX, tools::Long nDestY,
+ tools::Long nSrcX, tools::Long nSrcY,
+ tools::Long nSrcWidth, tools::Long nSrcHeight,
bool /*bWindowInvalidate*/)
{
SalTwoRect aPosAry(nSrcX, nSrcY, nSrcWidth, nSrcHeight, nDestX, nDestY, nSrcWidth, nSrcHeight);
@@ -558,7 +558,7 @@ void X11SalGraphicsImpl::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap&
Display* pXDisp = pSalDisp->GetDisplay();
const Drawable aDrawable( mrParent.GetDrawable() );
const SalColormap& rColMap = pSalDisp->GetColormap( mrParent.m_nXScreen );
- const long nDepth = mrParent.GetDisplay()->GetVisual( mrParent.m_nXScreen ).GetDepth();
+ const tools::Long nDepth = mrParent.GetDisplay()->GetVisual( mrParent.m_nXScreen ).GetDepth();
GC aGC( GetCopyGC() );
XGCValues aOldVal, aNewVal;
int nValues = GCForeground | GCBackground;
@@ -791,7 +791,7 @@ bool X11SalGraphicsImpl::drawAlphaBitmap( const SalTwoRect& rTR,
// the alpha values need to be inverted for XRender
// TODO: make upper layers use standard alpha
- long* pLDst = reinterpret_cast<long*>(pAlphaBits);
+ tools::Long* pLDst = reinterpret_cast<long*>(pAlphaBits);
for( int i = nImageSize/sizeof(long); --i >= 0; ++pLDst )
*pLDst = ~*pLDst;
@@ -851,8 +851,8 @@ bool X11SalGraphicsImpl::drawTransformedBitmap(
return false;
}
-bool X11SalGraphicsImpl::drawAlphaRect( long nX, long nY, long nWidth,
- long nHeight, sal_uInt8 nTransparency )
+bool X11SalGraphicsImpl::drawAlphaRect( tools::Long nX, tools::Long nY, tools::Long nWidth,
+ tools::Long nHeight, sal_uInt8 nTransparency )
{
if( ! mrParent.m_pFrame && ! mrParent.m_pVDev )
return false;
@@ -951,11 +951,11 @@ bool X11SalGraphicsImpl::setClipRegion( const vcl::Region& i_rClip )
for (auto const& rectangle : aRectangles)
{
- const long nW(rectangle.GetWidth());
+ const tools::Long nW(rectangle.GetWidth());
if(nW)
{
- const long nH(rectangle.GetHeight());
+ const tools::Long nH(rectangle.GetHeight());
if(nH)
{
@@ -1116,13 +1116,13 @@ void X11SalGraphicsImpl::SetXORMode( bool bSet, bool )
}
}
-void X11SalGraphicsImpl::drawPixel( long nX, long nY )
+void X11SalGraphicsImpl::drawPixel( tools::Long nX, tools::Long nY )
{
if( mnPenColor != SALCOLOR_NONE )
XDrawPoint( mrParent.GetXDisplay(), mrParent.GetDrawable(), SelectPen(), nX, nY );
}
-void X11SalGraphicsImpl::drawPixel( long nX, long nY, Color nColor )
+void X11SalGraphicsImpl::drawPixel( tools::Long nX, tools::Long nY, Color nColor )
{
if( nColor == SALCOLOR_NONE )
return;
@@ -1150,7 +1150,7 @@ void X11SalGraphicsImpl::drawPixel( long nX, long nY, Color nColor )
}
}
-void X11SalGraphicsImpl::drawLine( long nX1, long nY1, long nX2, long nY2 )
+void X11SalGraphicsImpl::drawLine( tools::Long nX1, tools::Long nY1, tools::Long nX2, tools::Long nY2 )
{
if( mnPenColor != SALCOLOR_NONE )
{
@@ -1159,7 +1159,7 @@ void X11SalGraphicsImpl::drawLine( long nX1, long nY1, long nX2, long nY2 )
}
}
-void X11SalGraphicsImpl::drawRect( long nX, long nY, long nDX, long nDY )
+void X11SalGraphicsImpl::drawRect( tools::Long nX, tools::Long nY, tools::Long nDX, tools::Long nDY )
{
if( mnBrushColor != SALCOLOR_NONE )
{
@@ -1320,10 +1320,10 @@ bool X11SalGraphicsImpl::drawPolyPolygonBezier( sal_uInt32, const sal_uInt32*,
return false;
}
-void X11SalGraphicsImpl::invert( long nX,
- long nY,
- long nDX,
- long nDY,
+void X11SalGraphicsImpl::invert( tools::Long nX,
+ tools::Long nY,
+ tools::Long nDX,
+ tools::Long nDY,
SalInvert nFlags )
{
GC pGC;
@@ -1372,7 +1372,7 @@ void X11SalGraphicsImpl::invert( sal_uInt32 nPoints,
Complex, CoordModeOrigin );
}
-bool X11SalGraphicsImpl::drawEPS( long,long,long,long,void*,sal_uInt32 )
+bool X11SalGraphicsImpl::drawEPS( tools::Long,tools::Long,tools::Long,tools::Long,void*,sal_uInt32 )
{
return false;
}
@@ -1428,7 +1428,7 @@ bool X11SalGraphicsImpl::drawPolyPolygon(
return bDrawn;
}
-long X11SalGraphicsImpl::GetGraphicsHeight() const
+tools::Long X11SalGraphicsImpl::GetGraphicsHeight() const
{
if( mrParent.m_pFrame )
return mrParent.m_pFrame->maGeometry.nHeight;
@@ -1850,7 +1850,7 @@ bool X11SalGraphicsImpl::drawPolyLine(
return bDrawnOk;
}
-Color X11SalGraphicsImpl::getPixel( long nX, long nY )
+Color X11SalGraphicsImpl::getPixel( tools::Long nX, tools::Long nY )
{
if( mrParent.bWindow_ && !mrParent.bVirDev_ )
{
@@ -1884,7 +1884,7 @@ Color X11SalGraphicsImpl::getPixel( long nX, long nY )
return mrParent.GetColormap().GetColor( aXColor.pixel );
}
-std::shared_ptr<SalBitmap> X11SalGraphicsImpl::getBitmap( long nX, long nY, long nDX, long nDY )
+std::shared_ptr<SalBitmap> X11SalGraphicsImpl::getBitmap( tools::Long nX, tools::Long nY, tools::Long nDX, tools::Long nDY )
{
bool bFakeWindowBG = false;
@@ -1909,7 +1909,7 @@ std::shared_ptr<SalBitmap> X11SalGraphicsImpl::getBitmap( long nX, long nY, long
bFakeWindowBG = true;
else
{
- long nOrgDX = nDX, nOrgDY = nDY;
+ tools::Long nOrgDX = nDX, nOrgDY = nDY;
// clip to window size
if ( nX < 0 )
@@ -1956,7 +1956,7 @@ sal_uInt16 X11SalGraphicsImpl::GetBitCount() const
return mrParent.GetVisual().GetDepth();
}
-long X11SalGraphicsImpl::GetGraphicsWidth() const
+tools::Long X11SalGraphicsImpl::GetGraphicsWidth() const
{
if( mrParent.m_pFrame )
return mrParent.m_pFrame->maGeometry.nWidth;
diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx
index 6a9201cf9c6c..1379deca6f83 100644
--- a/vcl/unx/generic/gdi/gdiimpl.hxx
+++ b/vcl/unx/generic/gdi/gdiimpl.hxx
@@ -96,7 +96,7 @@ private:
const basegfx::triangulator::B2DTriangleVector& rTriangles,
double fTransparency);
- long GetGraphicsHeight() const;
+ tools::Long GetGraphicsHeight() const;
void drawMaskedBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
@@ -120,7 +120,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;
@@ -149,12 +149,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;
@@ -196,9 +196,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
@@ -217,21 +217,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;
@@ -279,8 +279,8 @@ public:
fully transparent 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/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index 1ca2697ee6a0..9e76a48c08e2 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -112,7 +112,7 @@ namespace
size_t nExtraSpaceInScanLine = pDIB->mnScanlineSize - pDIB->mnWidth * pDIB->mnBitCount / 8;
if (nExtraSpaceInScanLine)
{
- for (long i = 0; i < pDIB->mnHeight; ++i)
+ for (tools::Long i = 0; i < pDIB->mnHeight; ++i)
{
sal_uInt8 *pRow = pDIB->mpBits + (i * pDIB->mnScanlineSize);
memset(pRow + (pDIB->mnScanlineSize - nExtraSpaceInScanLine), 0, nExtraSpaceInScanLine);
@@ -168,7 +168,7 @@ std::unique_ptr<BitmapBuffer> X11SalBitmap::ImplCreateDIB(
pDIB->mnWidth = rSize.Width();
pDIB->mnHeight = rSize.Height();
- long nScanlineBase;
+ tools::Long nScanlineBase;
bool bFail = o3tl::checked_multiply<long>(pDIB->mnWidth, nBitCount, nScanlineBase);
if (bFail)
{
@@ -208,11 +208,11 @@ std::unique_ptr<BitmapBuffer> X11SalBitmap::ImplCreateDIB(
std::unique_ptr<BitmapBuffer> X11SalBitmap::ImplCreateDIB(
Drawable aDrawable,
SalX11Screen nScreen,
- 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
) {
std::unique_ptr<BitmapBuffer> pDIB;
@@ -358,7 +358,7 @@ std::unique_ptr<BitmapBuffer> X11SalBitmap::ImplCreateDIB(
XImage* X11SalBitmap::ImplCreateXImage(
SalDisplay const *pSalDisp,
SalX11Screen nScreen,
- long nDepth,
+ tools::Long nDepth,
const SalTwoRect& rTwoRect
) const
{
@@ -379,8 +379,8 @@ XImage* X11SalBitmap::ImplCreateXImage(
if( mpDIB && mpDIB->mnWidth && mpDIB->mnHeight )
{
Display* pXDisp = pSalDisp->GetDisplay();
- long nWidth = rTwoRect.mnDestWidth;
- long nHeight = rTwoRect.mnDestHeight;
+ tools::Long nWidth = rTwoRect.mnDestWidth;
+ tools::Long nHeight = rTwoRect.mnDestHeight;
if( 1 == GetBitCount() )
nDepth = 1;
@@ -512,11 +512,11 @@ XImage* X11SalBitmap::ImplCreateXImage(
bool X11SalBitmap::ImplCreateFromDrawable(
Drawable aDrawable,
SalX11Screen nScreen,
- 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
) {
Destroy();
@@ -529,7 +529,7 @@ bool X11SalBitmap::ImplCreateFromDrawable(
ImplSalDDB* X11SalBitmap::ImplGetDDB(
Drawable aDrawable,
SalX11Screen nXScreen,
- long nDrawableDepth,
+ tools::Long nDrawableDepth,
const SalTwoRect& rTwoRect
) const
{
@@ -627,7 +627,7 @@ ImplSalDDB* X11SalBitmap::ImplGetDDB(
void X11SalBitmap::ImplDraw(
Drawable aDrawable,
SalX11Screen nXScreen,
- long nDrawableDepth,
+ tools::Long nDrawableDepth,
const SalTwoRect& rTwoRect,
const GC& rGC
) const
@@ -707,7 +707,7 @@ bool X11SalBitmap::Create(
css::uno::Sequence< css::uno::Any > args;
if( xFastPropertySet->getFastPropertyValue(bMask ? 2 : 1) >>= args ) {
- long pixmapHandle = {}; // spurious -Werror=maybe-uninitialized
+ tools::Long pixmapHandle = {}; // spurious -Werror=maybe-uninitialized
sal_Int32 depth;
if( ( args[1] >>= pixmapHandle ) && ( args[2] >>= depth ) ) {
@@ -877,11 +877,11 @@ ImplSalDDB::ImplSalDDB( XImage* pImage, Drawable aDrawable,
ImplSalDDB::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
) : maTwoRect(0, 0, nWidth, nHeight, 0, 0, nWidth, nHeight)
, mnDepth( nDrawableDepth )
, mnXScreen( nXScreen )
@@ -922,7 +922,7 @@ ImplSalDDB::~ImplSalDDB()
XFreePixmap( vcl_sal::getSalDisplay(GetGenericUnixSalData())->GetDisplay(), maPixmap );
}
-bool ImplSalDDB::ImplMatches( SalX11Screen nXScreen, long nDepth, const SalTwoRect& rTwoRect ) const
+bool ImplSalDDB::ImplMatches( SalX11Screen nXScreen, tools::Long nDepth, const SalTwoRect& rTwoRect ) const
{
bool bRet = false;
@@ -970,14 +970,14 @@ void ImplSalDDB::ImplDraw(
void ImplSalDDB::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
) {
SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericUnixSalData());
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 6da291c91bea..045a97e14db0 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -342,7 +342,7 @@ sal_uInt16 X11SalGraphics::GetBitCount() const
return mxImpl->GetBitCount();
}
-long X11SalGraphics::GetGraphicsWidth() const
+tools::Long X11SalGraphics::GetGraphicsWidth() const
{
return mxImpl->GetGraphicsWidth();
}
@@ -414,22 +414,22 @@ void X11SalGraphics::SetXORMode( bool bSet, bool bInvertOnly )
mxImpl->SetXORMode( bSet, bInvertOnly );
}
-void X11SalGraphics::drawPixel( long nX, long nY )
+void X11SalGraphics::drawPixel( tools::Long nX, tools::Long nY )
{
mxImpl->drawPixel( nX, nY );
}
-void X11SalGraphics::drawPixel( long nX, long nY, Color nColor )
+void X11SalGraphics::drawPixel( tools::Long nX, tools::Long nY, Color nColor )
{
mxImpl->drawPixel( nX, nY, nColor );
}
-void X11SalGraphics::drawLine( long nX1, long nY1, long nX2, long nY2 )
+void X11SalGraphics::drawLine( tools::Long nX1, tools::Long nY1, tools::Long nX2, tools::Long nY2 )
{
mxImpl->drawLine( nX1, nY1, nX2, nY2 );
}
-void X11SalGraphics::drawRect( long nX, long nY, long nDX, long nDY )
+void X11SalGraphics::drawRect( tools::Long nX, tools::Long nY, tools::Long nDX, tools::Long nDY )
{
mxImpl->drawRect( nX, nY, nDX, nDY );
}
@@ -474,8 +474,8 @@ void X11SalGraphics::invert( sal_uInt32 nPoints,
mxImpl->invert( nPoints, pPtAry, nFlags );
}
-bool X11SalGraphics::drawEPS( long nX, long nY, long nWidth,
- long nHeight, void* pPtr, sal_uInt32 nSize )
+bool X11SalGraphics::drawEPS( tools::Long nX, tools::Long nY, tools::Long nWidth,
+ tools::Long nHeight, void* pPtr, sal_uInt32 nSize )
{
return mxImpl->drawEPS( nX, nY, nWidth, nHeight, pPtr, nSize );
}
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 768562bfb498..fca6051dc3cd 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -91,9 +91,9 @@ void X11SalGraphics::copyBits( const SalTwoRect& rPosAry,
mxImpl->copyBits( rPosAry, pSSrcGraphics );
}
-void X11SalGraphics::copyArea ( long nDestX, long nDestY,
- long nSrcX, long nSrcY,
- long nSrcWidth, long nSrcHeight,
+void X11SalGraphics::copyArea ( tools::Long nDestX, tools::Long nDestY,
+ tools::Long nSrcX, tools::Long nSrcY,
+ tools::Long nSrcWidth, tools::Long nSrcHeight,
bool bWindowInvalidate)
{
mxImpl->copyArea( nDestX, nDestY, nSrcX, nSrcY, nSrcWidth, nSrcHeight, bWindowInvalidate );
@@ -141,8 +141,8 @@ bool X11SalGraphics::drawTransformedBitmap(
return mxImpl->drawTransformedBitmap( rNull, rX, rY, rSourceBitmap, pAlphaBitmap );
}
-bool X11SalGraphics::drawAlphaRect( long nX, long nY, long nWidth,
- long nHeight, sal_uInt8 nTransparency )
+bool X11SalGraphics::drawAlphaRect( tools::Long nX, tools::Long nY, tools::Long nWidth,
+ tools::Long nHeight, sal_uInt8 nTransparency )
{
return mxImpl->drawAlphaRect( nX, nY, nWidth, nHeight, nTransparency );
}
@@ -154,20 +154,20 @@ void X11SalGraphics::drawMask( const SalTwoRect& rPosAry,
mxImpl->drawMask( rPosAry, rSalBitmap, nMaskColor );
}
-std::shared_ptr<SalBitmap> X11SalGraphics::getBitmap( long nX, long nY, long nDX, long nDY )
+std::shared_ptr<SalBitmap> X11SalGraphics::getBitmap( tools::Long nX, tools::Long nY, tools::Long nDX, tools::Long nDY )
{
return mxImpl->getBitmap( nX, nY, nDX, nDY );
}
-Color X11SalGraphics::getPixel( long nX, long nY )
+Color X11SalGraphics::getPixel( tools::Long nX, tools::Long nY )
{
return mxImpl->getPixel( nX, nY );
}
-void X11SalGraphics::invert( long nX,
- long nY,
- long nDX,
- long nDY,
+void X11SalGraphics::invert( tools::Long nX,
+ tools::Long nY,
+ tools::Long nDX,
+ tools::Long nDY,
SalInvert nFlags )
{
mxImpl->invert( nX, nY, nDX, nDY, nFlags );
diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx
index 00a6f0a19416..eeb4e73fe62d 100644
--- a/vcl/unx/generic/gdi/salvd.cxx
+++ b/vcl/unx/generic/gdi/salvd.cxx
@@ -38,7 +38,7 @@
#endif
std::unique_ptr<SalVirtualDevice> X11SalInstance::CreateX11VirtualDevice(SalGraphics const * pGraphics,
- long &nDX, long &nDY, DeviceFormat eFormat, const SystemGraphicsData *pData,
+ tools::Long &nDX, tools::Long &nDY, DeviceFormat eFormat, const SystemGraphicsData *pData,
std::unique_ptr<X11SalGraphics> pNewGraphics)
{
assert(pNewGraphics);
@@ -54,7 +54,7 @@ std::unique_ptr<SalVirtualDevice> X11SalInstance::CreateX11VirtualDevice(SalGrap
}
std::unique_ptr<SalVirtualDevice> X11SalInstance::CreateVirtualDevice(SalGraphics* pGraphics,
- long &nDX, long &nDY, DeviceFormat eFormat, const SystemGraphicsData *pData)
+ tools::Long &nDX, tools::Long &nDY, DeviceFormat eFormat, const SystemGraphicsData *pData)
{
return CreateX11VirtualDevice(pGraphics, nDX, nDY, eFormat, pData, std::make_unique<X11SalGraphics>());
}
@@ -92,7 +92,7 @@ void X11SalGraphics::Init( X11SalVirtualDevice *pDevice, cairo_surface_t* pPreEx
mxImpl->Init();
}
-X11SalVirtualDevice::X11SalVirtualDevice(SalGraphics const * pGraphics, long &nDX, long &nDY,
+X11SalVirtualDevice::X11SalVirtualDevice(SalGraphics const * pGraphics, tools::Long &nDX, tools::Long &nDY,
DeviceFormat eFormat, const SystemGraphicsData *pData,
std::unique_ptr<X11SalGraphics> pNewGraphics) :
pGraphics_(std::move(pNewGraphics)),
@@ -132,8 +132,8 @@ X11SalVirtualDevice::X11SalVirtualDevice(SalGraphics const * pGraphics, long &nD
break;
nScreen++;
}
- nDX_ = static_cast<long>(w);
- nDY_ = static_cast<long>(h);
+ nDX_ = static_cast<tools::Long>(w);
+ nDY_ = static_cast<tools::Long>(h);
nDX = nDX_;
nDY = nDY_;
m_nXScreen = SalX11Screen( nScreen );
@@ -199,7 +199,7 @@ SalGraphics* X11SalVirtualDevice::AcquireGraphics()
void X11SalVirtualDevice::ReleaseGraphics( SalGraphics* )
{ bGraphics_ = false; }
-bool X11SalVirtualDevice::SetSize( long nDX, long nDY )
+bool X11SalVirtualDevice::SetSize( tools::Long nDX, tools::Long nDY )
{
if( bExternPixmap_ )
return false;
diff --git a/vcl/unx/generic/gdi/x11cairotextrender.cxx b/vcl/unx/generic/gdi/x11cairotextrender.cxx
index 91f82ac84b21..d49d932656ee 100644
--- a/vcl/unx/generic/gdi/x11cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/x11cairotextrender.cxx
@@ -46,7 +46,7 @@ void X11CairoTextRender::clipRegion(cairo_t* cr)
Region pClipRegion = mrParent.mpClipRegion;
if( pClipRegion && !XEmptyRegion( pClipRegion ) )
{
- for (long i = 0; i < pClipRegion->numRects; ++i)
+ for (tools::Long i = 0; i < pClipRegion->numRects; ++i)
{
cairo_rectangle(cr,
pClipRegion->rects[i].x1,
generated by cgit (git 2.34.1) at 2024-06-20 21:11:18 +0000