diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-26 09:50:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-03 10:37:51 +0200 |
| commit | 8bc951daf79decbd8a599a409c6d33c5456710e0 (patch) | |
| tree | 61d220d83e90a176fbcbe667827eee4b9631a4ca /vcl/inc/unx | |
| parent | 10eefdfa6c0250c6069e641e404f34e5a91fe993 (diff) | |
long->sal_Int32 in tools/gen.hxx
which triggered a lot of changes in sw/
Change-Id: Ia2aa22ea3f76463a85ea077a411246fcfed00bf6
Reviewed-on: https://gerrit.libreoffice.org/48806
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/inc/unx')
| -rw-r--r-- | vcl/inc/unx/genprn.h | 2 | ||||
| -rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/unx/salbmp.h | 10 | ||||
| -rw-r--r-- | vcl/inc/unx/salframe.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/vcl/inc/unx/genprn.h b/vcl/inc/unx/genprn.h index 9d80de32f99b..c00b589471dc 100644 --- a/vcl/inc/unx/genprn.h +++ b/vcl/inc/unx/genprn.h @@ -44,7 +44,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, + sal_Int32& rOutWidth, sal_Int32& rOutHeight, Point& rPageOffset, Size& rPaperSize ) override; virtual sal_uInt32 GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) override; diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 3db18f03fbcf..dc6f512c4526 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -462,7 +462,7 @@ public: 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 GetClientSize( sal_Int32& rWidth, sal_Int32& rHeight ) override; virtual void GetWorkArea( tools::Rectangle& rRect ) override; virtual SalFrame* GetParent() const override; virtual void SetWindowState( const SalFrameState* pState ) override; diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h index 3f45cd5d853c..0dd228c0b13f 100644 --- a/vcl/inc/unx/salbmp.h +++ b/vcl/inc/unx/salbmp.h @@ -49,11 +49,11 @@ private: static BitmapBuffer* ImplCreateDIB( Drawable aDrawable, SalX11Screen nXScreen, - 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 ); diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index 92bfcbfb9d31..5deb7f009325 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -221,7 +221,7 @@ public: 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 GetClientSize( sal_Int32& rWidth, sal_Int32& rHeight ) override; virtual void GetWorkArea( tools::Rectangle& rRect ) override; virtual SalFrame* GetParent() const override; virtual void SetWindowState( const SalFrameState* pState ) override; |