core.git: 2 commits - cui/source extensions/source

[Caolán McNamara (via logerrit)]

 cui/source/tabpages/tpbitmap.cxx               |    2 +-
 extensions/source/update/check/updatecheck.cxx |    6 +++++-
 extensions/source/update/check/updatecheck.hxx |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 059e695005b7eb500058f8c1c6cf83eb92dad20b
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Dec 10 12:26:35 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Dec 11 10:44:34 2024 +0100

    cid#1606642 Data race condition
    
    Change-Id: I7b36a4632981a548c04b2bc31decc9be98200c37
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178284
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/extensions/source/update/check/updatecheck.cxx 
b/extensions/source/update/check/updatecheck.cxx
index 41c05ac635fc..97aa043d3f87 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -1182,7 +1182,6 @@ UpdateCheck::showDialog(bool forceCheck)
     }
 }
 
-
 void
 UpdateCheck::setUpdateInfo(const UpdateInfo& aInfo)
 {
@@ -1253,6 +1252,11 @@ UpdateCheck::setUpdateInfo(const UpdateInfo& aInfo)
     setUIState(eUIState, bSuppressBubble);
 }
 
+bool UpdateCheck::hasOfficeUpdate() const
+{
+    std::unique_lock aGuard(m_aMutex);
+    return m_aUpdateInfo.BuildId.getLength() > 0;
+}
 
 void
 UpdateCheck::setCheckFailedState()
diff --git a/extensions/source/update/check/updatecheck.hxx 
b/extensions/source/update/check/updatecheck.hxx
index 7af355bc41ea..7b38e3f0d271 100644
--- a/extensions/source/update/check/updatecheck.hxx
+++ b/extensions/source/update/check/updatecheck.hxx
@@ -93,7 +93,7 @@ public:
     bool shouldShowExtUpdDlg() const { return ( m_bShowExtUpdDlg && 
m_bHasExtensionUpdate ); }
     void showExtensionDialog();
     void setHasExtensionUpdates( bool bHasUpdates ) { m_bHasExtensionUpdate = 
bHasUpdates; }
-    bool hasOfficeUpdate() const { return (m_aUpdateInfo.BuildId.getLength() > 
0); }
+    bool hasOfficeUpdate() const;
 
     // DownloadInteractionHandler
     virtual bool downloadTargetExists(const OUString& rFileName) override;
commit ab314514f9cc422c6018ec3b387c730afa1de817
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Dec 11 08:23:02 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Dec 11 10:44:21 2024 +0100

    cid#1636673 COPY_INSTEAD_OF_MOVE
    
    Change-Id: Ifd97a8f5578552266354861eb4a59f3e09fc57da
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178285
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index a4154aa344c8..b95f76a99b2b 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -787,7 +787,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, 
weld::Button&, void)
         pDlg.disposeAndClear();
 
         if( !nError )
-            AddBitmap(aGraphic, aName);
+            AddBitmap(std::move(aGraphic), aName);
     }
     else
     {