[Libreoffice-commits] core.git: vcl/source

Andrea Gelmini (via logerrit) logerrit at kemper.freedesktop.org
Sat Aug 29 09:21:10 UTC 2020


 vcl/source/window/window.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4cfa88a60893f7bd0303ddf077efcedea76d4b5c
Author:     Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Fri Aug 28 12:57:59 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Aug 29 11:20:17 2020 +0200

    Fix typo in code
    
    It passed "make check" on Linux
    
    Change-Id: I261b3dedd78494ec22a6903f0ab65231965881c2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101604
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index a0b4441e966a..523dc5bdde77 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -403,11 +403,11 @@ void Window::dispose()
     }
 
     // check if the focus window is our child
-    bool bHasFocussedChild = false;
+    bool bHasFocusedChild = false;
     if (pSVData->mpWinData->mpFocusWin && ImplIsRealParentPath(pSVData->mpWinData->mpFocusWin))
     {
         // #122232#, this must not happen and is an application bug ! but we try some cleanup to hopefully avoid crashes, see below
-        bHasFocussedChild = true;
+        bHasFocusedChild = true;
 #if OSL_DEBUG_LEVEL > 0
         OUString aTempStr = "Window (" + GetText() +
                 ") with focused child window destroyed ! THIS WILL LEAD TO CRASHES AND MUST BE FIXED !";
@@ -419,7 +419,7 @@ void Window::dispose()
     // if we get focus pass focus to another window
     vcl::Window* pOverlapWindow = ImplGetFirstOverlapWindow();
     if (pSVData->mpWinData->mpFocusWin == this
-        || bHasFocussedChild) // #122232#, see above, try some cleanup
+        || bHasFocusedChild) // #122232#, see above, try some cleanup
     {
         if ( mpWindowImpl->mbFrame )
         {


More information about the Libreoffice-commits mailing list