1 files changed, 10 insertions, 18 deletions
diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx
index 22228a346e26..26a2514c829d 100644
--- a/forms/source/xforms/submission/submission.hxx
+++ b/forms/source/xforms/submission/submission.hxx
@@ -17,12 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SUBMISSION_HXX
-#define INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SUBMISSION_HXX
+#pragma once
 
 #include <tools/urlobj.hxx>
 #include <osl/conditn.hxx>
-#include <osl/mutex.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Any.hxx>
@@ -40,6 +38,8 @@
 #include "serialization.hxx"
 
 #include <memory>
+#include <mutex>
+#include <utility>
 
 class CSubmissionPut;
 class CSubmissionPost;
@@ -72,7 +72,7 @@ class CProgressHandlerHelper final : public cppu::WeakImplHelper< css::ucb::XPro
     friend class CSubmissionPost;
     friend class CSubmissionGet;
     osl::Condition m_cFinished;
-    osl::Mutex m_mLock;
+    std::mutex m_mLock;
     sal_Int32 m_count;
 public:
     CProgressHandlerHelper()
@@ -80,20 +80,18 @@ public:
     {}
     virtual void SAL_CALL push( const css::uno::Any& /*aStatus*/) override
     {
-        m_mLock.acquire();
+        std::unique_lock g(m_mLock);
         m_count++;
-        m_mLock.release();
     }
     virtual void SAL_CALL update(const css::uno::Any& /*aStatus*/) override
     {
     }
     virtual void SAL_CALL pop() override
     {
-        m_mLock.acquire();
+        std::unique_lock g(m_mLock);
         m_count--;
         if (m_count == 0)
             m_cFinished.set();
-        m_mLock.release();
     }
 };
 
@@ -115,26 +113,20 @@ public:
         UNKNOWN_ERROR
     };
 
-    CSubmission(const OUString& aURL, const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment)
+    CSubmission(std::u16string_view aURL, css::uno::Reference< css::xml::dom::XDocumentFragment > aFragment)
         : m_aURLObj(aURL)
-        , m_aFragment(aFragment)
+        , m_aFragment(std::move(aFragment))
         , m_xContext(::comphelper::getProcessComponentContext())
     {}
 
-    bool IsWebProtocol() const
-    {
-        INetProtocol eProtocol = m_aURLObj.GetProtocol();
-        return eProtocol == INetProtocol::Http || eProtocol == INetProtocol::Https;
-    }
+    const INetURLObject& GetURLObject() const { return m_aURLObj; }
 
     virtual ~CSubmission() {}
 
     virtual SubmissionResult submit(const css::uno::Reference< css::task::XInteractionHandler >& ) = 0;
 
-    SubmissionResult replace(const OUString&, const css::uno::Reference< css::xml::dom::XDocument >&, const css::uno::Reference< css::frame::XFrame>&);
+    SubmissionResult replace(std::u16string_view, const css::uno::Reference< css::xml::dom::XDocument >&, const css::uno::Reference< css::frame::XFrame>&);
 
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */