diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2014-02-21 14:33:44 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2014-02-21 14:35:52 +0900 |
commit | 5f17e5eaad665337c7d8b7f05a61adc21d80a073 (patch) | |
tree | fa653f05c3724046dc9bd373f1e66fd462f282b3 /forms/source/xforms | |
parent | 24dd10c727ab2d7a38368292498520e11d98e3cb (diff) |
Replace deprecated std::auto_ptr with boost::scoped_ptr
Change-Id: I674b7ee507258555b667657a13db6fda9b8d8372
Diffstat (limited to 'forms/source/xforms')
-rw-r--r-- | forms/source/xforms/submission.cxx | 5 | ||||
-rw-r--r-- | forms/source/xforms/submission/submission.hxx | 2 | ||||
-rw-r--r-- | forms/source/xforms/submission/submission_get.cxx | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx index 1559bb8756a0..83ca748b5a56 100644 --- a/forms/source/xforms/submission.cxx +++ b/forms/source/xforms/submission.cxx @@ -52,7 +52,7 @@ #include <comphelper/propertysetinfo.hxx> #include <comphelper/interaction.hxx> #include <comphelper/processfactory.hxx> -#include <memory> +#include <boost/scoped_ptr.hpp> @@ -76,7 +76,6 @@ using com::sun::star::frame::XFrame; using xforms::Submission; using xforms::Model; using xforms::MIP; -using std::auto_ptr; using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -310,7 +309,7 @@ bool Submission::doSubmit( const Reference< XInteractionHandler >& xHandler ) xResult, aMethod.equalsIgnoreAsciiCase("get")); // submit result; set encoding, etc. - auto_ptr<CSubmission> xSubmission; + boost::scoped_ptr<CSubmission> xSubmission; if (aMethod.equalsIgnoreAsciiCase("PUT")) xSubmission.reset(new CSubmissionPut( getAction(), aFragment)); else if (aMethod.equalsIgnoreAsciiCase("post")) diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx index e70df209c90c..b3b486e992ce 100644 --- a/forms/source/xforms/submission/submission.hxx +++ b/forms/source/xforms/submission/submission.hxx @@ -46,6 +46,8 @@ #include "serialization.hxx" +#include <memory> + namespace CSS = com::sun::star; class CSubmissionPut; diff --git a/forms/source/xforms/submission/submission_get.cxx b/forms/source/xforms/submission/submission_get.cxx index 4698241e6ab0..119186addf49 100644 --- a/forms/source/xforms/submission/submission_get.cxx +++ b/forms/source/xforms/submission/submission_get.cxx @@ -18,8 +18,6 @@ */ -#include <memory> - #include "submission_get.hxx" #include "serialization_app_xml.hxx" #include "serialization_urlencoded.hxx" @@ -32,6 +30,8 @@ #include <com/sun/star/io/Pipe.hpp> #include <com/sun/star/task/InteractionHandler.hpp> +#include <boost/scoped_ptr.hpp> + using namespace CSS::uno; using namespace CSS::ucb; using namespace CSS::task; @@ -50,7 +50,7 @@ CSubmissionGet::CSubmissionGet(const OUString& aURL, const CSS::uno::Reference< CSubmission::SubmissionResult CSubmissionGet::submit(const CSS::uno::Reference< CSS::task::XInteractionHandler >& aInteractionHandler) { // GET always uses apllicatin/x-www-formurlencoded - auto_ptr< CSerialization > apSerialization(new CSerializationURLEncoded()); + boost::scoped_ptr< CSerialization > apSerialization(new CSerializationURLEncoded()); apSerialization->setSource(m_aFragment); apSerialization->serialize(); |