summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/generic/app/i18n_status.cxx2
-rw-r--r--vcl/unx/generic/gdi/salbmp.cxx10
-rw-r--r--vcl/unx/generic/print/common_gfx.cxx21
-rw-r--r--vcl/unx/generic/print/genprnpsp.cxx2
-rw-r--r--vcl/unx/generic/window/salframe.cxx2
-rw-r--r--vcl/unx/gtk/gtksalframe.cxx2
-rw-r--r--vcl/unx/gtk3/gtk3gtkframe.cxx2
7 files changed, 22 insertions, 19 deletions
diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx
index c80846e621ca..9406b94a8c45 100644
--- a/vcl/unx/generic/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -371,7 +371,7 @@ void I18NStatus::setStatusText( const OUString& rText )
bool bVisible = true;
if( m_pParent )
{
- long w, h;
+ sal_Int32 w, h;
m_pParent->GetClientSize( w, h );
if( w == 0 || h == 0 )
{
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index e5db7853548f..92b0b4eb2fe9 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -236,11 +236,11 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB(
BitmapBuffer* X11SalBitmap::ImplCreateDIB(
Drawable aDrawable,
SalX11Screen nScreen,
- long nDrawableDepth,
- long nX,
- long nY,
- long nWidth,
- long nHeight,
+ sal_Int32 nDrawableDepth,
+ sal_Int32 nX,
+ sal_Int32 nY,
+ sal_Int32 nWidth,
+ sal_Int32 nHeight,
bool bGrey
) {
BitmapBuffer* pDIB = nullptr;
diff --git a/vcl/unx/generic/print/common_gfx.cxx b/vcl/unx/generic/print/common_gfx.cxx
index 85984e835736..67bed525c5ea 100644
--- a/vcl/unx/generic/print/common_gfx.cxx
+++ b/vcl/unx/generic/print/common_gfx.cxx
@@ -484,7 +484,7 @@ PrinterGfx::DrawPolyLineBezier (sal_uInt32 nPoints, const Point* pPath, const Po
PSSetColor ();
PSSetLineWidth ();
- snprintf(pString, nBezString, "%li %li moveto\n", pPath[0].X(), pPath[0].Y());
+ snprintf(pString, nBezString, "%" SAL_PRIdINT32 " %" SAL_PRIdINT32 " moveto\n", pPath[0].X(), pPath[0].Y());
WritePS(mpPageBody, pString);
// Handle the drawing of mixed lines mixed with curves
@@ -494,7 +494,7 @@ PrinterGfx::DrawPolyLineBezier (sal_uInt32 nPoints, const Point* pPath, const Po
{
if (pFlgAry[i] != PolyFlags::Control) //If the next point is a PolyFlags::Normal, we're drawing a line
{
- snprintf(pString, nBezString, "%li %li lineto\n", pPath[i].X(), pPath[i].Y());
+ snprintf(pString, nBezString, "%" SAL_PRIdINT32 " %" SAL_PRIdINT32 " lineto\n", pPath[i].X(), pPath[i].Y());
i++;
}
else //Otherwise we're drawing a spline
@@ -504,7 +504,8 @@ PrinterGfx::DrawPolyLineBezier (sal_uInt32 nPoints, const Point* pPath, const Po
if ((pFlgAry[i] == PolyFlags::Control) && (pFlgAry[i+1] == PolyFlags::Control) &&
(pFlgAry[i+2] != PolyFlags::Control))
{
- snprintf(pString, nBezString, "%li %li %li %li %li %li curveto\n",
+ snprintf(pString, nBezString, "%" SAL_PRIdINT32 " %" SAL_PRIdINT32 " %" SAL_PRIdINT32 " %" SAL_PRIdINT32
+ " %" SAL_PRIdINT32 " %" SAL_PRIdINT32 " curveto\n",
pPath[i].X(), pPath[i].Y(),
pPath[i+1].X(), pPath[i+1].Y(),
pPath[i+2].X(), pPath[i+2].Y());
@@ -532,13 +533,13 @@ PrinterGfx::DrawPolygonBezier (sal_uInt32 nPoints, const Point* pPath, const Pol
if (nPoints <= 0 || (pPath == nullptr) || !(maFillColor.Is() || maLineColor.Is()))
return;
- snprintf(pString, nBezString, "%li %li moveto\n", pPath[0].X(), pPath[0].Y());
+ snprintf(pString, nBezString, "%" SAL_PRIdINT32 " %" SAL_PRIdINT32 " moveto\n", pPath[0].X(), pPath[0].Y());
WritePS(mpPageBody, pString); //Move to the starting point for the PolyPolygon
for (unsigned int i=1; i < nPoints;)
{
if (pFlgAry[i] != PolyFlags::Control)
{
- snprintf(pString, nBezString, "%li %li lineto\n", pPath[i].X(), pPath[i].Y());
+ snprintf(pString, nBezString, "%" SAL_PRIdINT32 " %" SAL_PRIdINT32 " lineto\n", pPath[i].X(), pPath[i].Y());
WritePS(mpPageBody, pString);
i++;
}
@@ -549,7 +550,8 @@ PrinterGfx::DrawPolygonBezier (sal_uInt32 nPoints, const Point* pPath, const Pol
if ((pFlgAry[i] == PolyFlags::Control) && (pFlgAry[i+1] == PolyFlags::Control) &&
(pFlgAry[i+2] != PolyFlags::Control))
{
- snprintf(pString, nBezString, "%li %li %li %li %li %li curveto\n",
+ snprintf(pString, nBezString, "%" SAL_PRIdINT32 " %" SAL_PRIdINT32 " %" SAL_PRIdINT32 " %" SAL_PRIdINT32
+ " %" SAL_PRIdINT32 " %" SAL_PRIdINT32 " curveto\n",
pPath[i].X(), pPath[i].Y(),
pPath[i+1].X(), pPath[i+1].Y(),
pPath[i+2].X(), pPath[i+2].Y());
@@ -594,7 +596,7 @@ PrinterGfx::DrawPolyPolygonBezier (sal_uInt32 nPoly, const sal_uInt32 * pPoints,
if( nPoints == 0 || pPtAry[i] == nullptr )
continue;
- snprintf(pString, nBezString, "%li %li moveto\n", pPtAry[i][0].X(), pPtAry[i][0].Y()); //Move to the starting point
+ snprintf(pString, nBezString, "%" SAL_PRIdINT32 " %" SAL_PRIdINT32 " moveto\n", pPtAry[i][0].X(), pPtAry[i][0].Y()); //Move to the starting point
WritePS(mpPageBody, pString);
for (unsigned int j=1; j < nPoints;)
{
@@ -602,7 +604,7 @@ PrinterGfx::DrawPolyPolygonBezier (sal_uInt32 nPoly, const sal_uInt32 * pPoints,
// polygon without beziers
if ( ! pFlgAry[i] || pFlgAry[i][j] != PolyFlags::Control)
{
- snprintf(pString, nBezString, "%li %li lineto\n", pPtAry[i][j].X(), pPtAry[i][j].Y());
+ snprintf(pString, nBezString, "%" SAL_PRIdINT32 " %" SAL_PRIdINT32 " lineto\n", pPtAry[i][j].X(), pPtAry[i][j].Y());
WritePS(mpPageBody, pString);
j++;
}
@@ -612,7 +614,8 @@ PrinterGfx::DrawPolyPolygonBezier (sal_uInt32 nPoly, const sal_uInt32 * pPoints,
break; //Error: wrong sequence of control/normal points somehow
if ((pFlgAry[i][j] == PolyFlags::Control) && (pFlgAry[i][j+1] == PolyFlags::Control) && (pFlgAry[i][j+2] != PolyFlags::Control))
{
- snprintf(pString, nBezString, "%li %li %li %li %li %li curveto\n",
+ snprintf(pString, nBezString, "%" SAL_PRIdINT32 " %" SAL_PRIdINT32 " %" SAL_PRIdINT32
+ " %" SAL_PRIdINT32 " %" SAL_PRIdINT32 " %" SAL_PRIdINT32 " curveto\n",
pPtAry[i][j].X(), pPtAry[i][j].Y(),
pPtAry[i][j+1].X(), pPtAry[i][j+1].Y(),
pPtAry[i][j+2].X(), pPtAry[i][j+2].Y());
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx
index f8951f4ea160..3b2659c5bcef 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -697,7 +697,7 @@ bool PspSalInfoPrinter::SetData(
void PspSalInfoPrinter::GetPageInfo(
const ImplJobSetup* pJobSetup,
- long& rOutWidth, long& rOutHeight,
+ sal_Int32& rOutWidth, sal_Int32& rOutHeight,
Point& rPageOffset,
Size& rPaperSize )
{
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 8f8bc056e054..872d8ca947ac 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -1442,7 +1442,7 @@ void X11SalFrame::GetWorkArea( tools::Rectangle& rWorkArea )
rWorkArea = pDisplay_->getWMAdaptor()->getWorkArea( 0 );
}
-void X11SalFrame::GetClientSize( long &rWidth, long &rHeight )
+void X11SalFrame::GetClientSize( sal_Int32 &rWidth, sal_Int32 &rHeight )
{
if( ! bViewable_ )
{
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index d95fa6ec60ac..404f45bf8015 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -1683,7 +1683,7 @@ void GtkSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_u
TriggerPaintEvent();
}
-void GtkSalFrame::GetClientSize( long& rWidth, long& rHeight )
+void GtkSalFrame::GetClientSize( sal_Int32& rWidth, sal_Int32& rHeight )
{
if( m_pWindow && !(m_nState & GDK_WINDOW_STATE_ICONIFIED) )
{
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 4ba26b017ed4..78bb5c2bd93d 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1671,7 +1671,7 @@ void GtkSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_u
m_bDefaultPos = false;
}
-void GtkSalFrame::GetClientSize( long& rWidth, long& rHeight )
+void GtkSalFrame::GetClientSize( sal_Int32& rWidth, sal_Int32& rHeight )
{
if( m_pWindow && !(m_nState & GDK_WINDOW_STATE_ICONIFIED) )
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 16:40:27 +0000