[Libreoffice-commits] core.git: vcl/headless vcl/inc vcl/osx vcl/qt5 vcl/unx vcl/win
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Feb 26 07:47:29 UTC 2019
vcl/headless/svpdummies.cxx | 2 +-
vcl/headless/svpframe.cxx | 2 +-
vcl/inc/headless/svpdummies.hxx | 2 +-
vcl/inc/headless/svpframe.hxx | 2 +-
vcl/inc/osx/salframe.h | 2 +-
vcl/inc/osx/salobj.h | 2 +-
vcl/inc/qt5/Qt5Frame.hxx | 2 +-
vcl/inc/qt5/Qt5Object.hxx | 2 +-
vcl/inc/salframe.hxx | 2 +-
vcl/inc/salobj.hxx | 2 +-
vcl/inc/unx/gtk/gtkframe.hxx | 2 +-
vcl/inc/unx/gtk/gtkobject.hxx | 2 +-
vcl/inc/unx/salframe.h | 2 +-
vcl/inc/unx/salobj.h | 4 ++--
vcl/inc/win/salframe.h | 2 +-
vcl/inc/win/salobj.h | 2 +-
vcl/osx/salframe.cxx | 2 +-
vcl/osx/salobj.cxx | 2 +-
vcl/qt5/Qt5Frame.cxx | 2 +-
vcl/qt5/Qt5Object.cxx | 2 +-
vcl/unx/generic/window/salframe.cxx | 2 +-
vcl/unx/generic/window/salobj.cxx | 4 ++--
vcl/unx/gtk/gtkobject.cxx | 2 +-
vcl/unx/gtk/gtksalframe.cxx | 2 +-
vcl/unx/gtk3/gtk3gtkframe.cxx | 2 +-
vcl/unx/gtk3/gtk3gtkobject.cxx | 2 +-
vcl/win/window/salframe.cxx | 2 +-
vcl/win/window/salobj.cxx | 2 +-
28 files changed, 30 insertions(+), 30 deletions(-)
New commits:
commit 984a0c79cb57789cff6416900fc363eefead44db
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Feb 25 14:49:41 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Feb 26 08:47:04 2019 +0100
sal_uIntPtr->sal_uInt32 inSalClipRegion::BeginSetClipRegion
sal_uInt32 seems reasonable given that this is the number of rectanges
in an image.
And then convert all of the other BeginSetClipRegion methods to use
sal_uInt32 too.
Change-Id: I85a712ec823662ac30f3859051e2b974fb99775e
Reviewed-on: https://gerrit.libreoffice.org/68343
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx
index 54fa5ecc0328..21a054761ea2 100644
--- a/vcl/headless/svpdummies.cxx
+++ b/vcl/headless/svpdummies.cxx
@@ -35,7 +35,7 @@ SvpSalObject::~SvpSalObject()
}
void SvpSalObject::ResetClipRegion() {}
-void SvpSalObject::BeginSetClipRegion( sal_uLong ) {}
+void SvpSalObject::BeginSetClipRegion( sal_uInt32 ) {}
void SvpSalObject::UnionClipRegion( long, long, long, long ) {}
void SvpSalObject::EndSetClipRegion() {}
void SvpSalObject::SetPosSize( long, long, long, long ) {}
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 4df5328f8cea..f54103ff1ecc 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -491,7 +491,7 @@ void SvpSalFrame::ResetClipRegion()
{
}
-void SvpSalFrame::BeginSetClipRegion( sal_uLong )
+void SvpSalFrame::BeginSetClipRegion( sal_uInt32 )
{
}
diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx
index 419cc541dc84..0b7ddf89b15a 100644
--- a/vcl/inc/headless/svpdummies.hxx
+++ b/vcl/inc/headless/svpdummies.hxx
@@ -38,7 +38,7 @@ public:
// override all pure virtual methods
virtual void ResetClipRegion() override;
- virtual void BeginSetClipRegion( sal_uLong nRects ) override;
+ virtual void BeginSetClipRegion( sal_uInt32 nRects ) override;
virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override;
virtual void EndSetClipRegion() override;
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 15d582ee378d..c997d7716f04 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -110,7 +110,7 @@ public:
virtual void SetParent( SalFrame* pNewParent ) override;
virtual bool SetPluginParent( SystemParentData* pNewParent ) override;
virtual void ResetClipRegion() override;
- virtual void BeginSetClipRegion( sal_uLong nRects ) override;
+ virtual void BeginSetClipRegion( sal_uInt32 nRects ) override;
virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override;
virtual void EndSetClipRegion() override;
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index 85121d80d125..e7bb03008db6 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -156,7 +156,7 @@ public:
// set clip region to none (-> rectangular windows, normal state)
virtual void ResetClipRegion() override;
// start setting the clipregion consisting of nRects rectangles
- virtual void BeginSetClipRegion( sal_uLong nRects ) override;
+ 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;
// done setting up the clipregion
diff --git a/vcl/inc/osx/salobj.h b/vcl/inc/osx/salobj.h
index 40b51004992d..17f5374d1652 100644
--- a/vcl/inc/osx/salobj.h
+++ b/vcl/inc/osx/salobj.h
@@ -55,7 +55,7 @@ public:
virtual ~AquaSalObject() override;
virtual void ResetClipRegion() override;
- virtual void BeginSetClipRegion( sal_uLong nRects ) override;
+ virtual void BeginSetClipRegion( sal_uInt32 nRects ) override;
virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override;
virtual void EndSetClipRegion() override;
virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) override;
diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx
index 723f9fd7a175..ef290ceec59b 100644
--- a/vcl/inc/qt5/Qt5Frame.hxx
+++ b/vcl/inc/qt5/Qt5Frame.hxx
@@ -179,7 +179,7 @@ public:
virtual void SetParent(SalFrame* pNewParent) override;
virtual bool SetPluginParent(SystemParentData* pNewParent) override;
virtual void ResetClipRegion() override;
- virtual void BeginSetClipRegion(sal_uLong nRects) override;
+ virtual void BeginSetClipRegion(sal_uInt32 nRects) override;
virtual void UnionClipRegion(long nX, long nY, long nWidth, long nHeight) override;
virtual void EndSetClipRegion() override;
diff --git a/vcl/inc/qt5/Qt5Object.hxx b/vcl/inc/qt5/Qt5Object.hxx
index 640c83753deb..a0aad7c43551 100644
--- a/vcl/inc/qt5/Qt5Object.hxx
+++ b/vcl/inc/qt5/Qt5Object.hxx
@@ -42,7 +42,7 @@ public:
Qt5Object(Qt5Frame* pParent, bool bShow);
virtual void ResetClipRegion() override;
- virtual void BeginSetClipRegion(sal_uLong nRects) override;
+ virtual void BeginSetClipRegion(sal_uInt32 nRects) override;
virtual void UnionClipRegion(long nX, long nY, long nWidth, long nHeight) override;
virtual void EndSetClipRegion() override;
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index fb3618b3f6bd..70f06988db4b 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -230,7 +230,7 @@ public:
// set clip region to none (-> rectangular windows, normal state)
virtual void ResetClipRegion() = 0;
// start setting the clipregion consisting of nRects rectangles
- virtual void BeginSetClipRegion( sal_uLong nRects ) = 0;
+ 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;
// done setting up the clipregion
diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx
index 3e8dbf152d29..56ca04985a7d 100644
--- a/vcl/inc/salobj.hxx
+++ b/vcl/inc/salobj.hxx
@@ -39,7 +39,7 @@ public:
virtual ~SalObject();
virtual void ResetClipRegion() = 0;
- virtual void BeginSetClipRegion( sal_uLong nRects ) = 0;
+ virtual void BeginSetClipRegion( sal_uInt32 nRects ) = 0;
virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) = 0;
virtual void EndSetClipRegion() = 0;
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index a77c7c61686b..248c896b28a1 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -528,7 +528,7 @@ public:
// set clip region to none (-> rectangular windows, normal state)
virtual void ResetClipRegion() override;
// start setting the clipregion consisting of nRects rectangles
- virtual void BeginSetClipRegion( sal_uLong nRects ) override;
+ 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;
// done setting up the clipregion
diff --git a/vcl/inc/unx/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx
index 1f300954ba42..4523e9998abd 100644
--- a/vcl/inc/unx/gtk/gtkobject.hxx
+++ b/vcl/inc/unx/gtk/gtkobject.hxx
@@ -46,7 +46,7 @@ public:
// override all pure virtual methods
virtual void ResetClipRegion() override;
- virtual void BeginSetClipRegion( sal_uLong nRects ) override;
+ virtual void BeginSetClipRegion( sal_uInt32 nRects ) override;
virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override;
virtual void EndSetClipRegion() override;
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 9d8db1aa9e81..0452efb6c916 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -256,7 +256,7 @@ public:
// set clip region to none (-> rectangular windows, normal state)
virtual void ResetClipRegion() override;
// start setting the clipregion consisting of nRects rectangles
- virtual void BeginSetClipRegion( sal_uIntPtr nRects ) override;
+ 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;
// done setting up the clipregion
diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h
index 4a0535507dc2..0795f20115db 100644
--- a/vcl/inc/unx/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -33,7 +33,7 @@ public:
SalClipRegion();
~SalClipRegion();
- void BeginSetClipRegion( sal_uIntPtr nRects );
+ void BeginSetClipRegion( sal_uInt32 nRects );
void UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
XRectangle *EndSetClipRegion() {
@@ -71,7 +71,7 @@ public:
// override all pure virtual methods
virtual void ResetClipRegion() override;
- virtual void BeginSetClipRegion( sal_uIntPtr nRects ) override;
+ virtual void BeginSetClipRegion( sal_uInt32 nRects ) override;
virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override;
virtual void EndSetClipRegion() override;
diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h
index bc1cec234b9a..c556794b64f7 100644
--- a/vcl/inc/win/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -134,7 +134,7 @@ public:
virtual void SetScreenNumber( unsigned int ) override;
virtual void SetApplicationID( const OUString &rApplicationID ) override;
virtual void ResetClipRegion() override;
- virtual void BeginSetClipRegion( sal_uIntPtr nRects ) override;
+ virtual void BeginSetClipRegion( sal_uInt32 nRects ) override;
virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override;
virtual void EndSetClipRegion() override;
};
diff --git a/vcl/inc/win/salobj.h b/vcl/inc/win/salobj.h
index 5ebdb7afb417..465c9ec778ab 100644
--- a/vcl/inc/win/salobj.h
+++ b/vcl/inc/win/salobj.h
@@ -40,7 +40,7 @@ public:
virtual ~WinSalObject() override;
virtual void ResetClipRegion() override;
- virtual void BeginSetClipRegion( sal_uIntPtr nRects ) override;
+ virtual void BeginSetClipRegion( sal_uInt32 nRects ) override;
virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight) override;
virtual void EndSetClipRegion() override;
virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) override;
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 87dfa3ca275a..f3f3dda1ec5f 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1722,7 +1722,7 @@ void AquaSalFrame::ResetClipRegion()
[mpNSWindow invalidateShadow];
}
-void AquaSalFrame::BeginSetClipRegion( sal_uLong nRects )
+void AquaSalFrame::BeginSetClipRegion( sal_uInt32 nRects )
{
if ( !mpNSWindow )
return;
diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx
index 44e608318268..fb1105b6adb7 100644
--- a/vcl/osx/salobj.cxx
+++ b/vcl/osx/salobj.cxx
@@ -195,7 +195,7 @@ void AquaSalObject::ResetClipRegion()
setClippedPosSize();
}
-void AquaSalObject::BeginSetClipRegion( sal_uLong )
+void AquaSalObject::BeginSetClipRegion( sal_uInt32 )
{
mbClip = false;
}
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 615e2753f598..a1c51c967c0a 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -1011,7 +1011,7 @@ bool Qt5Frame::SetPluginParent(SystemParentData* /*pNewParent*/)
void Qt5Frame::ResetClipRegion() { m_bNullRegion = true; }
-void Qt5Frame::BeginSetClipRegion(sal_uLong)
+void Qt5Frame::BeginSetClipRegion(sal_uInt32)
{
m_aRegion = QRegion(QRect(QPoint(0, 0), m_pQWidget->size()));
}
diff --git a/vcl/qt5/Qt5Object.cxx b/vcl/qt5/Qt5Object.cxx
index e498283ef1ee..b37ef20e61ac 100644
--- a/vcl/qt5/Qt5Object.cxx
+++ b/vcl/qt5/Qt5Object.cxx
@@ -55,7 +55,7 @@ void Qt5Object::ResetClipRegion()
m_pRegion = QRegion();
}
-void Qt5Object::BeginSetClipRegion(sal_uLong) { m_pRegion = QRegion(); }
+void Qt5Object::BeginSetClipRegion(sal_uInt32) { m_pRegion = QRegion(); }
void Qt5Object::UnionClipRegion(long nX, long nY, long nWidth, long nHeight)
{
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 59e5370736f1..9cacc0a886b0 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -4107,7 +4107,7 @@ void X11SalFrame::ResetClipRegion()
op, ordering );
}
-void X11SalFrame::BeginSetClipRegion( sal_uIntPtr /*nRects*/ )
+void X11SalFrame::BeginSetClipRegion( sal_uInt32 /*nRects*/ )
{
m_vClipRectangles.clear();
}
diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx
index c406b152e3a4..d253d08ce5ba 100644
--- a/vcl/unx/generic/window/salobj.cxx
+++ b/vcl/unx/generic/window/salobj.cxx
@@ -188,7 +188,7 @@ SalClipRegion::~SalClipRegion()
}
void
-SalClipRegion::BeginSetClipRegion( sal_uLong nRects )
+SalClipRegion::BeginSetClipRegion( sal_uInt32 nRects )
{
ClipRectangleList.reset( new XRectangle[nRects] );
numClipRectangles = 0;
@@ -283,7 +283,7 @@ X11SalObject::ResetClipRegion()
}
void
-X11SalObject::BeginSetClipRegion( sal_uLong nRectCount )
+X11SalObject::BeginSetClipRegion( sal_uInt32 nRectCount )
{
maClipRegion.BeginSetClipRegion ( nRectCount );
}
diff --git a/vcl/unx/gtk/gtkobject.cxx b/vcl/unx/gtk/gtkobject.cxx
index 38d4c1a747c5..dd7ad722b4c7 100644
--- a/vcl/unx/gtk/gtkobject.cxx
+++ b/vcl/unx/gtk/gtkobject.cxx
@@ -99,7 +99,7 @@ void GtkSalObject::ResetClipRegion()
gdk_window_shape_combine_region( widget_get_window(m_pSocket), nullptr, 0, 0 );
}
-void GtkSalObject::BeginSetClipRegion( sal_uLong )
+void GtkSalObject::BeginSetClipRegion( sal_uInt32 )
{
if( m_pRegion )
gdk_region_destroy( m_pRegion );
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 8b420b49793f..7e64f9545d86 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -2494,7 +2494,7 @@ void GtkSalFrame::ResetClipRegion()
gdk_window_shape_combine_region( widget_get_window( m_pWindow ), nullptr, 0, 0 );
}
-void GtkSalFrame::BeginSetClipRegion( sal_uLong )
+void GtkSalFrame::BeginSetClipRegion( sal_uInt32 )
{
if( m_pRegion )
gdk_region_destroy( m_pRegion );
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index a95f3886d679..33c4b5e7b071 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -2415,7 +2415,7 @@ void GtkSalFrame::ResetClipRegion()
gdk_window_shape_combine_region( widget_get_window( m_pWindow ), nullptr, 0, 0 );
}
-void GtkSalFrame::BeginSetClipRegion( sal_uLong )
+void GtkSalFrame::BeginSetClipRegion( sal_uInt32 )
{
if( m_pRegion )
cairo_region_destroy( m_pRegion );
diff --git a/vcl/unx/gtk3/gtk3gtkobject.cxx b/vcl/unx/gtk3/gtk3gtkobject.cxx
index 33fd6d037981..a92913f110fb 100644
--- a/vcl/unx/gtk3/gtk3gtkobject.cxx
+++ b/vcl/unx/gtk3/gtk3gtkobject.cxx
@@ -104,7 +104,7 @@ void GtkSalObject::ResetClipRegion()
gdk_window_shape_combine_region( widget_get_window(m_pSocket), nullptr, 0, 0 );
}
-void GtkSalObject::BeginSetClipRegion( sal_uLong )
+void GtkSalObject::BeginSetClipRegion( sal_uInt32 )
{
if( m_pRegion )
cairo_region_destroy( m_pRegion );
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 4fcb4947bc89..6a654e3cc01f 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -2854,7 +2854,7 @@ void WinSalFrame::ResetClipRegion()
SetWindowRgn( mhWnd, nullptr, TRUE );
}
-void WinSalFrame::BeginSetClipRegion( sal_uLong nRects )
+void WinSalFrame::BeginSetClipRegion( sal_uInt32 nRects )
{
if( mpClipRgnData )
delete [] reinterpret_cast<BYTE*>(mpClipRgnData);
diff --git a/vcl/win/window/salobj.cxx b/vcl/win/window/salobj.cxx
index f03d2b71afce..a1489a9cc42d 100644
--- a/vcl/win/window/salobj.cxx
+++ b/vcl/win/window/salobj.cxx
@@ -603,7 +603,7 @@ void WinSalObject::ResetClipRegion()
SetWindowRgn( mhWnd, nullptr, TRUE );
}
-void WinSalObject::BeginSetClipRegion( sal_uLong nRectCount )
+void WinSalObject::BeginSetClipRegion( sal_uInt32 nRectCount )
{
sal_uLong nRectBufSize = sizeof(RECT)*nRectCount;
if ( nRectCount < SAL_CLIPRECT_COUNT )
More information about the Libreoffice-commits
mailing list