[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sc/source

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Tue Apr 13 20:04:52 UTC 2021


 sc/source/ui/app/inputwin.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 0ad467d9abd27197bc5f7f22db5a25b3246e6808
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Apr 13 17:14:57 2021 +0300
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Apr 13 22:04:15 2021 +0200

    Early return from ScInputWindow::setPosSizePixel() if no-op
    
    This seems to fix https://github.com/CollaboraOnline/online/issues/1988
    
    Change-Id: I5fd826647ce85b7ad2d93085fb0c2fa9db69e745
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114056
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index b718ba7cb7a5..b22c30c42a58 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -489,6 +489,10 @@ void ScInputWindow::SetSizePixel( const Size& rNewSize )
 
 void ScInputWindow::setPosSizePixel(long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags)
 {
+    if ((!(nFlags & PosSizeFlags::Size) ||  GetSizePixel() == Size(nWidth, nHeight)) &&
+        (!(nFlags & PosSizeFlags::Pos) || GetPosPixel() == Point(nX, nY)))
+        return;
+
     ToolBox::setPosSizePixel(nX, nY, nWidth, nHeight, nFlags);
     if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier())
     {


More information about the Libreoffice-commits mailing list