1 files changed, 16 insertions, 13 deletions
diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx
index 79145e836d17..6ff70e64eba4 100644
--- a/filter/source/config/cache/typedetection.hxx
+++ b/filter/source/config/cache/typedetection.hxx
@@ -24,6 +24,7 @@
 #include <unotools/mediadescriptor.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/implbase.hxx>
+#include <comphelper/compbase.hxx>
 
 namespace filter::config {
 
@@ -69,18 +70,21 @@ public:
 
 private:
 
-    bool impl_getPreselectionForType(
+    static bool impl_getPreselectionForType(
+        std::unique_lock<std::mutex>& rGuard,
         const OUString& sPreSelType, const css::util::URL& aParsedURL, FlatDetection& rFlatTypes, bool bDocService);
 
-    void impl_getPreselectionForDocumentService(
+    static void impl_getPreselectionForDocumentService(
+        std::unique_lock<std::mutex>& rGuard,
         const OUString& sPreSelDocumentService, const css::util::URL& aParsedURL, FlatDetection& rFlatTypes);
 
-    OUString impl_getTypeFromFilter(const OUString& rFilterName);
+    static OUString impl_getTypeFromFilter(std::unique_lock<std::mutex>& rGuard, const OUString& rFilterName);
 
     /**
      * Get all format types that we handle.
      */
-    void impl_getAllFormatTypes(
+    static void impl_getAllFormatTypes(
+        std::unique_lock<std::mutex>& rGuard,
         const css::util::URL& aParsedURL, utl::MediaDescriptor const & rDescriptor,
         FlatDetection& rFlatTypes);
 
@@ -172,7 +176,7 @@ private:
         @return     [string]
                     a valid type name or an empty string if user canceled interaction.
      */
-    OUString impl_askUserForTypeAndFilterIfAllowed(utl::MediaDescriptor& rDescriptor);
+    static OUString impl_askUserForTypeAndFilterIfAllowed(utl::MediaDescriptor& rDescriptor);
 
 
     /** @short      check if an input stream is already part of the
@@ -229,8 +233,8 @@ private:
         @return     TRUE the specified type and its registrations was valid(!) and
                     could be set on the descriptor.
      */
-    bool impl_validateAndSetTypeOnDescriptor(      utl::MediaDescriptor& rDescriptor,
-                                                 const OUString&               sType      );
+    static bool impl_validateAndSetTypeOnDescriptor( utl::MediaDescriptor& rDescriptor,
+                                                     const OUString&               sType      );
 
 
     /** @short      validate the specified filter and its relationships
@@ -250,7 +254,8 @@ private:
         @return     TRUE the specified type and its registrations was valid(!) and
                     could be set on the descriptor.
      */
-    bool impl_validateAndSetFilterOnDescriptor(      utl::MediaDescriptor& rDescriptor,
+    static bool impl_validateAndSetFilterOnDescriptor(
+                                                utl::MediaDescriptor& rDescriptor,
                                                    const OUString&               sFilter    );
 
 
@@ -316,15 +321,14 @@ public:
 
 };
 
-class TerminateDetection : public cppu::WeakComponentImplHelper<css::frame::XTerminateListener>
+class TerminateDetection : public comphelper::WeakComponentImplHelper<css::frame::XTerminateListener>
 {
 private:
-    osl::Mutex m_aLock;
     TypeDetection* m_pTypeDetection;
 
 public:
 
-    using cppu::WeakComponentImplHelperBase::disposing;
+    using comphelper::WeakComponentImplHelperBase::disposing;
     virtual void SAL_CALL disposing(const css::lang::EventObject&) override
     {
     }
@@ -340,8 +344,7 @@ public:
     }
 
     TerminateDetection(TypeDetection* pTypeDetection)
-        : cppu::WeakComponentImplHelper<css::frame::XTerminateListener>(m_aLock)
-        , m_pTypeDetection(pTypeDetection)
+        : m_pTypeDetection(pTypeDetection)
     {
     }
 };