sc/source/ui/app/inputwin.cxx | 2 +-
sc/source/ui/inc/inputwin.hxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit aad248f5719231a8369014d52599c3a3a91ae3c3
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Apr 9 12:14:17 2021 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Fri Apr 16 21:04:42 2021 +0200
Fix Win64 build
... after bff456b37814303e386e86b9d395babaccf164db, which fails only
on Win64, where tools::Long is not long
Change-Id: Ia919b6371f8d8b6ba7c379992591bb9bcc2fe2ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113838
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
(cherry picked from commit c617827d009bd61ff432514d3f607a12e9ccb38a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114182
Tested-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index b581b41e259f..cfd01f1d962f 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -474,7 +474,7 @@ void ScInputWindow::SetSizePixel( const Size& rNewSize )
ToolBox::SetSizePixel(rNewSize);
}
-void ScInputWindow::setPosSizePixel(long nX, long nY, long nWidth, long
nHeight, PosSizeFlags nFlags)
+void ScInputWindow::setPosSizePixel(tools::Long nX, tools::Long nY,
tools::Long nWidth, tools::Long nHeight, PosSizeFlags nFlags)
{
if ((!(nFlags & PosSizeFlags::Size) || GetSizePixel() == Size(nWidth,
nHeight)) &&
(!(nFlags & PosSizeFlags::Pos) || GetPosPixel() == Point(nX, nY)))
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index faeda5e77c92..db4da6e6b691 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -293,7 +293,7 @@ public:
virtual void Paint( vcl::RenderContext& rRenderContext, const
tools::Rectangle& rRect ) override;
virtual void PixelInvalidate(const tools::Rectangle* pRectangle)
override;
- virtual void setPosSizePixel( long nX, long nY, long nWidth, long
nHeight,
+ virtual void setPosSizePixel( tools::Long nX, tools::Long nY,
tools::Long nWidth, tools::Long nHeight,
PosSizeFlags nFlags = PosSizeFlags::All )
override;
virtual void SetSizePixel( const Size& rNewSize ) override;
virtual void Resize() override;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
