core.git: 2 commits - sc/source vcl/source

[Caolán McNamara (via logerrit)]

 sc/source/ui/docshell/datastream.cxx |    2 +-
 vcl/source/window/menubarwindow.cxx  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4604ca7581a81d84eea1dcd517b9fe04b0371d82
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Oct 28 21:29:09 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Oct 29 22:08:09 2024 +0100

    cid#1607551 silence Overflowed constant
    
    Change-Id: Id632cf7933059e54b3cae9daabd981781e944313
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175803
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Jenkins

diff --git a/vcl/source/window/menubarwindow.cxx 
b/vcl/source/window/menubarwindow.cxx
index d440e7ab3987..db9781a537be 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -794,7 +794,7 @@ bool MenuBarWindow::HandleKeyEvent( const KeyEvent& 
rKEvent, bool bFromMenu )
                 }
                 if ( nCode == KEY_RIGHT || nCode == KEY_HOME )
                 {
-                    n++;
+                    n = (n == ITEMPOS_INVALID) ? 0 : n + 1;
                     if ( n >= m_pMenu->GetItemCount() )
                         n = 0;
                 }
commit 167a9b8caf40a95c736be1d360bc4ef55052a39e
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Oct 28 21:24:42 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Oct 29 22:07:59 2024 +0100

    cid#1607341 silence Data race condition
    
    clarify that the same mutex is held for writing and reading to
    maUsedLines
    
    Change-Id: Ifabe8006cc1eac3cf05e9d5c4e907e79f22c3de7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175802
    Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sc/source/ui/docshell/datastream.cxx 
b/sc/source/ui/docshell/datastream.cxx
index 6d28fff40fdc..521dd930e484 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -176,7 +176,7 @@ private:
         while (!isTerminateRequested())
         {
             std::optional<DataStream::LinesType> oLines;
-            std::unique_lock aGuard(maMtxLines);
+            std::unique_lock aGuard(getLinesMutex());
 
             if (!maUsedLines.empty())
             {