1 files changed, 10 insertions, 19 deletions
diff --git a/forms/source/xforms/submission/submission_get.cxx b/forms/source/xforms/submission/submission_get.cxx
index 394c8b817486..4ee8140b2172 100644
--- a/forms/source/xforms/submission/submission_get.cxx
+++ b/forms/source/xforms/submission/submission_get.cxx
@@ -24,22 +24,17 @@
 #include <rtl/strbuf.hxx>
 #include <osl/diagnose.h>
 #include <ucbhelper/content.hxx>
-#include <com/sun/star/io/Pipe.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
-#include <tools/diagnose_ex.h>
-
-#include <memory>
+#include <comphelper/diagnose_ex.hxx>
 
 using namespace css::uno;
 using namespace css::ucb;
 using namespace css::task;
 using namespace css::io;
-using namespace osl;
 using namespace ucbhelper;
-using namespace std;
 
 
-CSubmissionGet::CSubmissionGet(const OUString& aURL, const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment)
+CSubmissionGet::CSubmissionGet(std::u16string_view aURL, const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment)
     : CSubmission(aURL, aFragment)
 {
 }
@@ -47,20 +42,20 @@ CSubmissionGet::CSubmissionGet(const OUString& aURL, const css::uno::Reference<
 CSubmission::SubmissionResult CSubmissionGet::submit(const css::uno::Reference< css::task::XInteractionHandler >& aInteractionHandler)
 {
     // GET always uses application/x-www-formurlencoded
-    std::unique_ptr< CSerialization > apSerialization(new CSerializationURLEncoded());
-    apSerialization->setSource(m_aFragment);
-    apSerialization->serialize();
+    CSerializationURLEncoded aSerialization;
+    aSerialization.setSource(m_aFragment);
+    aSerialization.serialize();
 
-    css::uno::Reference< XInputStream > aInStream = apSerialization->getInputStream();
+    css::uno::Reference< XInputStream > aInStream = aSerialization.getInputStream();
 
     // create a commandEnvironment and use the default interaction handler
-    CCommandEnvironmentHelper *pHelper = new CCommandEnvironmentHelper;
+    rtl::Reference<CCommandEnvironmentHelper> pHelper = new CCommandEnvironmentHelper;
     if( aInteractionHandler.is() )
         pHelper->m_aInteractionHandler = aInteractionHandler;
     else
         pHelper->m_aInteractionHandler.set(
             css::task::InteractionHandler::createWithParent(m_xContext, nullptr), UNO_QUERY_THROW);
-    CProgressHandlerHelper *pProgressHelper = new CProgressHandlerHelper;
+    rtl::Reference<CProgressHandlerHelper> pProgressHelper = new CProgressHandlerHelper;
     pHelper->m_aProgressHandler.set(pProgressHelper);
 
     // UCB has ownership of environment...
@@ -79,14 +74,10 @@ CSubmission::SubmissionResult CSubmissionGet::submit(const css::uno::Reference<
             aQueryString.append(reinterpret_cast<char const *>(aByteBuffer.getConstArray()), n);
         if (!aQueryString.isEmpty() && m_aURLObj.GetProtocol() != INetProtocol::File)
         {
-            aUTF8QueryURL.append('?');
-            aUTF8QueryURL.append(aQueryString.makeStringAndClear());
+            aUTF8QueryURL.append("?" + aQueryString);
         }
-        OUString aQueryURL = OStringToOUString(aUTF8QueryURL.makeStringAndClear(), RTL_TEXTENCODING_UTF8);
+        OUString aQueryURL = OStringToOUString(aUTF8QueryURL, RTL_TEXTENCODING_UTF8);
         ucbhelper::Content aContent(aQueryURL, aEnvironment, m_xContext);
-        css::uno::Reference< XOutputStream > aPipe( css::io::Pipe::create(m_xContext), UNO_QUERY_THROW );
-        if (!aContent.openStream(aPipe))
-            return UNKNOWN_ERROR;
         // get reply
         try {
             m_aResultStream = aContent.openStream();