diff options
Diffstat (limited to 'forms/source/xforms/submission/submission.hxx')
-rw-r--r-- | forms/source/xforms/submission/submission.hxx | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx index 655529063a7d..26a2514c829d 100644 --- a/forms/source/xforms/submission/submission.hxx +++ b/forms/source/xforms/submission/submission.hxx @@ -21,7 +21,6 @@ #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> @@ -39,6 +38,8 @@ #include "serialization.hxx" #include <memory> +#include <mutex> +#include <utility> class CSubmissionPut; class CSubmissionPost; @@ -71,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() @@ -79,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(); } }; @@ -114,23 +113,19 @@ 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>&); }; |