summaryrefslogtreecommitdiff
path: root/vcl/win
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/win')
-rw-r--r--vcl/win/gdi/gdiimpl.cxx26
-rw-r--r--vcl/win/gdi/salbmp.cxx2
-rw-r--r--vcl/win/gdi/salfont.cxx10
-rw-r--r--vcl/win/gdi/salgdi.cxx10
-rw-r--r--vcl/win/gdi/salgdi2.cxx12
-rw-r--r--vcl/win/window/salframe.cxx24
6 files changed, 42 insertions, 42 deletions
diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index ecfec5c8dccf..102f009dd632 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -1171,13 +1171,13 @@ bool WinSalGraphicsImpl::setClipRegion( const vcl::Region& i_rClip )
for (auto const& rectangle : aRectangles)
{
- const long nW(rectangle.GetWidth());
- const long nH(rectangle.GetHeight());
+ const tools::Long nW(rectangle.GetWidth());
+ const tools::Long nH(rectangle.GetHeight());
if(nW && nH)
{
- const long nRight(rectangle.Left() + nW);
- const long nBottom(rectangle.Top() + nH);
+ const tools::Long nRight(rectangle.Left() + nW);
+ const tools::Long nBottom(rectangle.Top() + nH);
if(bFirstClipRect)
{
@@ -1560,7 +1560,7 @@ void WinSalGraphicsImpl::SetROPFillColor( SalROPColor nROPColor )
SetFillColor( ImplGetROPColor( nROPColor ) );
}
-void WinSalGraphicsImpl::DrawPixelImpl( long nX, long nY, COLORREF crColor )
+void WinSalGraphicsImpl::DrawPixelImpl( tools::Long nX, tools::Long nY, COLORREF crColor )
{
const HDC hDC = mrParent.getHDC();
@@ -2505,10 +2505,10 @@ static void paintToGdiPlus(
static void setInterpolationMode(
Gdiplus::Graphics& rGraphics,
- long rSrcWidth,
- long rDestWidth,
- long rSrcHeight,
- long rDestHeight)
+ tools::Long rSrcWidth,
+ tools::Long rDestWidth,
+ tools::Long rSrcHeight,
+ tools::Long rDestHeight)
{
const bool bSameWidth(rSrcWidth == rDestWidth);
const bool bSameHeight(rSrcHeight == rDestHeight);
@@ -2632,13 +2632,13 @@ bool WinSalGraphicsImpl::drawTransformedBitmap(
if(aARGB)
{
- const long nSrcWidth(aARGB->GetWidth());
- const long nSrcHeight(aARGB->GetHeight());
+ const tools::Long nSrcWidth(aARGB->GetWidth());
+ const tools::Long nSrcHeight(aARGB->GetHeight());
if(nSrcWidth && nSrcHeight)
{
- const long nDestWidth(basegfx::fround(basegfx::B2DVector(rX - rNull).getLength()));
- const long nDestHeight(basegfx::fround(basegfx::B2DVector(rY - rNull).getLength()));
+ const tools::Long nDestWidth(basegfx::fround(basegfx::B2DVector(rX - rNull).getLength()));
+ const tools::Long nDestHeight(basegfx::fround(basegfx::B2DVector(rY - rNull).getLength()));
if(nDestWidth && nDestHeight)
{
diff --git a/vcl/win/gdi/salbmp.cxx b/vcl/win/gdi/salbmp.cxx
index 43b322358b41..2418c10a1770 100644
--- a/vcl/win/gdi/salbmp.cxx
+++ b/vcl/win/gdi/salbmp.cxx
@@ -53,7 +53,7 @@
#undef max
#endif
-static void ImplSetPixel4( sal_uInt8* pScanline, long nX, const BYTE cIndex )
+static void ImplSetPixel4( sal_uInt8* pScanline, tools::Long nX, const BYTE cIndex )
{
BYTE& rByte = pScanline[ nX >> 1 ];
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index c1d209f4d765..04f3b46ce6e6 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -67,7 +67,7 @@ using namespace vcl;
static FIXED FixedFromDouble( double d )
{
- const long l = static_cast<tools::Long>( d * 65536. );
+ const tools::Long l = static_cast<tools::Long>( d * 65536. );
return *reinterpret_cast<FIXED const *>(&l);
}
@@ -593,10 +593,10 @@ void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont )
rFont.SetPitch( ImplLogPitchToSal( rLogFont.lfPitchAndFamily ) );
rFont.SetWeight( ImplWeightToSal( rLogFont.lfWeight ) );
- long nFontHeight = rLogFont.lfHeight;
+ tools::Long nFontHeight = rLogFont.lfHeight;
if ( nFontHeight < 0 )
nFontHeight = -nFontHeight;
- long nDPIY = GetDeviceCaps( hDC, LOGPIXELSY );
+ tools::Long nDPIY = GetDeviceCaps( hDC, LOGPIXELSY );
if( !nDPIY )
nDPIY = 600;
nFontHeight *= 72;
@@ -1344,8 +1344,8 @@ bool WinFontInstance::GetGlyphOutline(sal_GlyphId nId, basegfx::B2DPolyPolygon&
// of previous segment
sal_uInt16 nPnt = 0;
- long nX = IntTimes256FromFixed( pHeader->pfxStart.x );
- long nY = IntTimes256FromFixed( pHeader->pfxStart.y );
+ tools::Long nX = IntTimes256FromFixed( pHeader->pfxStart.x );
+ tools::Long nY = IntTimes256FromFixed( pHeader->pfxStart.y );
pPoints[ nPnt ] = Point( nX, nY );
pFlags[ nPnt++ ] = PolyFlags::Normal;
diff --git a/vcl/win/gdi/salgdi.cxx b/vcl/win/gdi/salgdi.cxx
index f117bc9a9ba0..92a0b62879d5 100644
--- a/vcl/win/gdi/salgdi.cxx
+++ b/vcl/win/gdi/salgdi.cxx
@@ -178,11 +178,11 @@ void ImplInitSalGDI()
if( bDither16 )
{
// create DIBPattern for 16Bit dithering
- long n;
+ tools::Long n;
pSalData->mhDitherDIB = GlobalAlloc( GMEM_FIXED, sizeof( BITMAPINFOHEADER ) + 192 );
pSalData->mpDitherDIB = static_cast<BYTE*>(GlobalLock( pSalData->mhDitherDIB ));
- pSalData->mpDitherDiff = new long[ 256 ];
+ pSalData->mpDitherDiff = new tools::Long[ 256 ];
pSalData->mpDitherLow = new BYTE[ 256 ];
pSalData->mpDitherHigh = new BYTE[ 256 ];
pSalData->mpDitherDIBData = pSalData->mpDitherDIB + sizeof( BITMAPINFOHEADER );
@@ -251,12 +251,12 @@ void ImplInitSalGDI()
if( pSalData->mhDitherPal )
{
// create DIBPattern for 8Bit dithering
- long const nSize = sizeof( BITMAPINFOHEADER ) + ( 256 * sizeof( short ) ) + 64;
- long n;
+ tools::Long const nSize = sizeof( BITMAPINFOHEADER ) + ( 256 * sizeof( short ) ) + 64;
+ tools::Long n;
pSalData->mhDitherDIB = GlobalAlloc( GMEM_FIXED, nSize );
pSalData->mpDitherDIB = static_cast<BYTE*>(GlobalLock( pSalData->mhDitherDIB ));
- pSalData->mpDitherDiff = new long[ 256 ];
+ pSalData->mpDitherDiff = new tools::Long[ 256 ];
pSalData->mpDitherLow = new BYTE[ 256 ];
pSalData->mpDitherHigh = new BYTE[ 256 ];
pSalData->mpDitherDIBData = pSalData->mpDitherDIB + sizeof( BITMAPINFOHEADER ) + ( 256 * sizeof( short ) );
diff --git a/vcl/win/gdi/salgdi2.cxx b/vcl/win/gdi/salgdi2.cxx
index e23ebb4430a8..54afa84c7bc4 100644
--- a/vcl/win/gdi/salgdi2.cxx
+++ b/vcl/win/gdi/salgdi2.cxx
@@ -77,9 +77,9 @@ public:
int mnComponentSize;
int mnComponentExchangeIndex;
- long mnScanlineSize;
+ tools::Long mnScanlineSize;
- ColorScanlineConverter(ScanlineFormat eSourceFormat, int nComponentSize, long nScanlineSize)
+ ColorScanlineConverter(ScanlineFormat eSourceFormat, int nComponentSize, tools::Long nScanlineSize)
: meSourceFormat(eSourceFormat)
, mnComponentSize(nComponentSize)
, mnComponentExchangeIndex(0)
@@ -94,7 +94,7 @@ public:
void convertScanline(sal_uInt8* pSource, sal_uInt8* pDestination)
{
- for (long x = 0; x < mnScanlineSize; x += mnComponentSize)
+ for (tools::Long x = 0; x < mnScanlineSize; x += mnComponentSize)
{
for (int i = 0; i < mnComponentSize; ++i)
{
@@ -126,7 +126,7 @@ void convertToWinSalBitmap(SalBitmap& rSalBitmap, WinSalBitmap& rWinSalBitmap)
sal_uInt8* pSource(pRead->mpBits);
sal_uInt8* pDestination(pWrite->mpBits);
- long readRowChange = pRead->mnScanlineSize;
+ tools::Long readRowChange = pRead->mnScanlineSize;
if(pRead->mnFormat & ScanlineFormat::TopDown)
{
pSource += pRead->mnScanlineSize * (pRead->mnHeight - 1);
@@ -143,7 +143,7 @@ void convertToWinSalBitmap(SalBitmap& rSalBitmap, WinSalBitmap& rWinSalBitmap)
4, pRead->mnScanlineSize));
if (pConverter)
{
- for (long y = 0; y < pRead->mnHeight; y++)
+ for (tools::Long y = 0; y < pRead->mnHeight; y++)
{
pConverter->convertScanline(pSource, pDestination);
pSource += readRowChange;
@@ -152,7 +152,7 @@ void convertToWinSalBitmap(SalBitmap& rSalBitmap, WinSalBitmap& rWinSalBitmap)
}
else
{
- for (long y = 0; y < pRead->mnHeight; y++)
+ for (tools::Long y = 0; y < pRead->mnHeight; y++)
{
memcpy(pDestination, pSource, pRead->mnScanlineSize);
pSource += readRowChange;
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index ab4102056604..e016430611ad 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -126,7 +126,7 @@ bool WinSalFrame::mbInReparent = false;
// Macros for support of WM_UNICHAR & Keyman 6.0
//#define Uni_UTF32ToSurrogate1(ch) (((unsigned long) (ch) - 0x10000) / 0x400 + 0xD800)
-#define Uni_UTF32ToSurrogate2(ch) ((static_cast<unsigned long>(ch) - 0x10000) % 0x400 + 0xDC00)
+#define Uni_UTF32ToSurrogate2(ch) ((static_cast<tools::ULong>(ch) - 0x10000) % 0x400 + 0xDC00)
#define Uni_SupplementaryPlanesStart 0x10000
static void UpdateFrameGeometry( HWND hWnd, WinSalFrame* pFrame );
@@ -160,10 +160,10 @@ static void ImplSaveFrameState( WinSalFrame* pFrame )
RECT aRect2 = aRect;
AdjustWindowRectEx( &aRect2, GetWindowStyle( pFrame->mhWnd ),
FALSE, GetWindowExStyle( pFrame->mhWnd ) );
- long nTopDeco = abs( aRect.top - aRect2.top );
- long nLeftDeco = abs( aRect.left - aRect2.left );
- long nBottomDeco = abs( aRect.bottom - aRect2.bottom );
- long nRightDeco = abs( aRect.right - aRect2.right );
+ tools::Long nTopDeco = abs( aRect.top - aRect2.top );
+ tools::Long nLeftDeco = abs( aRect.left - aRect2.left );
+ tools::Long nBottomDeco = abs( aRect.bottom - aRect2.bottom );
+ tools::Long nRightDeco = abs( aRect.right - aRect2.right );
pFrame->maState.mnX = aRect.left + nLeftDeco;
pFrame->maState.mnY = aRect.top + nTopDeco;
@@ -180,10 +180,10 @@ static void ImplSaveFrameState( WinSalFrame* pFrame )
RECT aRect2 = aRect;
AdjustWindowRectEx( &aRect2, GetWindowStyle( pFrame->mhWnd ),
FALSE, GetWindowExStyle( pFrame->mhWnd ) );
- long nTopDeco = abs( aRect.top - aRect2.top );
- long nLeftDeco = abs( aRect.left - aRect2.left );
- long nBottomDeco = abs( aRect.bottom - aRect2.bottom );
- long nRightDeco = abs( aRect.right - aRect2.right );
+ tools::Long nTopDeco = abs( aRect.top - aRect2.top );
+ tools::Long nLeftDeco = abs( aRect.left - aRect2.left );
+ tools::Long nBottomDeco = abs( aRect.bottom - aRect2.bottom );
+ tools::Long nRightDeco = abs( aRect.right - aRect2.right );
pFrame->maState.mnState &= ~WindowStateState(WindowStateState::Minimized | WindowStateState::Maximized);
// subtract decoration
@@ -2578,7 +2578,7 @@ static void ImplSalUpdateStyleFontW( HDC hDC, const LOGFONTW& rLogFont, vcl::Fon
}
}
-static long ImplW2I( const wchar_t* pStr )
+static tools::Long ImplW2I( const wchar_t* pStr )
{
long n = 0;
int nSign = 1;
@@ -2607,8 +2607,8 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
aMouseSettings.SetDoubleClickTime( GetDoubleClickTime() );
aMouseSettings.SetDoubleClickWidth( GetSystemMetrics( SM_CXDOUBLECLK ) );
aMouseSettings.SetDoubleClickHeight( GetSystemMetrics( SM_CYDOUBLECLK ) );
- long nDragWidth = GetSystemMetrics( SM_CXDRAG );
- long nDragHeight = GetSystemMetrics( SM_CYDRAG );
+ tools::Long nDragWidth = GetSystemMetrics( SM_CXDRAG );
+ tools::Long nDragHeight = GetSystemMetrics( SM_CYDRAG );
if ( nDragWidth )
aMouseSettings.SetStartDragWidth( nDragWidth );
if ( nDragHeight )
generated by cgit (git 2.34.1) at 2024-07-16 04:37:30 +0000