[Libreoffice-commits] core.git: framework/inc framework/source

[Noel Grandin (via logerrit)]

 framework/inc/jobs/helponstartup.hxx    |    3 ++-
 framework/source/jobs/helponstartup.cxx |   18 +++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 7e44d8d78a3c58a5468c4c3331992a0c472560c6
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sat Dec 18 18:57:12 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Dec 20 08:34:04 2021 +0100

    osl::Mutex->std::mutex in HelpOnStartup
    
    Change-Id: I3133ab5e0f0af40c7570856c216f3921576818af
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127103
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/framework/inc/jobs/helponstartup.hxx 
b/framework/inc/jobs/helponstartup.hxx
index 63326f00454d..6df378c726b9 100644
--- a/framework/inc/jobs/helponstartup.hxx
+++ b/framework/inc/jobs/helponstartup.hxx
@@ -21,6 +21,7 @@
 
 #include <sal/config.h>
 
+#include <mutex>
 #include <string_view>
 
 #include <cppuhelper/implbase.hxx>
@@ -44,7 +45,7 @@ class HelpOnStartup final : public ::cppu::WeakImplHelper< 
css::lang::XServiceIn
 
     // member
     private:
-        osl::Mutex m_mutex;
+        std::mutex m_mutex;
 
         /** @short  reference to a uno service manager. */
         css::uno::Reference< css::uno::XComponentContext > m_xContext;
diff --git a/framework/source/jobs/helponstartup.cxx 
b/framework/source/jobs/helponstartup.cxx
index 41c6c3dc3e1e..968a3aa10577 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -133,7 +133,7 @@ css::uno::Any SAL_CALL HelpOnStartup::execute(const 
css::uno::Sequence< css::bea
 
 void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
 {
-    osl::MutexGuard g(m_mutex);
+    std::unique_lock g(m_mutex);
     if (aEvent.Source == m_xModuleManager)
         m_xModuleManager.clear();
     else if (aEvent.Source == m_xDesktop)
@@ -174,9 +174,9 @@ OUString HelpOnStartup::its_getModuleIdFromEnv(const 
css::uno::Sequence< css::be
     // OK - now we are sure this document is a top level document.
     // Classify it.
     // SAFE ->
-    osl::ClearableMutexGuard aLock(m_mutex);
+    std::unique_lock aLock(m_mutex);
     css::uno::Reference< css::frame::XModuleManager2 > xModuleManager = 
m_xModuleManager;
-    aLock.clear();
+    aLock.unlock();
     // <- SAFE
 
     OUString sModuleId;
@@ -195,9 +195,9 @@ OUString HelpOnStartup::its_getModuleIdFromEnv(const 
css::uno::Sequence< css::be
 OUString HelpOnStartup::its_getCurrentHelpURL()
 {
     // SAFE ->
-    osl::ClearableMutexGuard aLock(m_mutex);
+    std::unique_lock aLock(m_mutex);
     css::uno::Reference< css::frame::XDesktop2 > xDesktop = m_xDesktop;
-    aLock.clear();
+    aLock.unlock();
     // <- SAFE
 
     if (!xDesktop.is())
@@ -239,11 +239,11 @@ bool 
HelpOnStartup::its_isHelpUrlADefaultOne(std::u16string_view sHelpURL)
         return false;
 
     // SAFE ->
-    osl::ClearableMutexGuard aLock(m_mutex);
+    std::unique_lock aLock(m_mutex);
     css::uno::Reference< css::container::XNameAccess >     xConfig = m_xConfig;
     OUString                                        sLocale = m_sLocale;
     OUString                                        sSystem = m_sSystem;
-    aLock.clear();
+    aLock.unlock();
     // <- SAFE
 
     if (!xConfig.is())
@@ -282,11 +282,11 @@ bool 
HelpOnStartup::its_isHelpUrlADefaultOne(std::u16string_view sHelpURL)
 OUString HelpOnStartup::its_checkIfHelpEnabledAndGetURL(const OUString& 
sModule)
 {
     // SAFE ->
-    osl::ClearableMutexGuard aLock(m_mutex);
+    std::unique_lock aLock(m_mutex);
     css::uno::Reference< css::container::XNameAccess > xConfig = m_xConfig;
     OUString                                    sLocale = m_sLocale;
     OUString                                    sSystem = m_sSystem;
-    aLock.clear();
+    aLock.unlock();
     // <- SAFE
 
     OUString sHelpURL;