From bfde4866e07746eafa2f0d6173c29d805cc35ad0 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 5 Dec 2016 08:47:18 +0200 Subject: convert DecodeMechanism to scoped enum Change-Id: I5c56634b1bca8e37fa73d02d2428645301b6c547 --- forms/source/component/Button.cxx | 2 +- forms/source/component/DatabaseForm.cxx | 10 +++++----- forms/source/component/ImageButton.cxx | 2 +- forms/source/richtext/richtextvclcontrol.cxx | 2 +- forms/source/xforms/submission/replace.cxx | 2 +- forms/source/xforms/submission/submission_get.cxx | 2 +- forms/source/xforms/submission/submission_post.cxx | 2 +- forms/source/xforms/submission/submission_put.cxx | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) (limited to 'forms') diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index d5c4b8e9221b..15944189adb2 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -145,7 +145,7 @@ void OButtonModel::write(const Reference& _rxOutStream) thr _rxOutStream->writeShort( (sal_uInt16)m_eButtonType ); - OUString sTmp = INetURLObject::decode( m_sTargetURL, INetURLObject::DECODE_UNAMBIGUOUS); + OUString sTmp = INetURLObject::decode( m_sTargetURL, INetURLObject::DecodeMechanism::Unambiguous); _rxOutStream << sTmp; _rxOutStream << m_sTargetFrame; writeHelpTextCompatibly(_rxOutStream); diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index b98374b5b80d..d61c7a70a490 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -466,7 +466,7 @@ OUString ODatabaseForm::GetDataEncoded(bool _bURLEncoded,const ReferenceGetError() != ERRCODE_NONE)) { @@ -2191,7 +2191,7 @@ void ODatabaseForm::submit_impl(const Reference& Control, const css::a { INetURLObject aUrlObj( aURLStr, INetURLObject::EncodeMechanism::WasEncoded ); aUrlObj.SetParam( aData, INetURLObject::EncodeMechanism::All ); - aURL.Complete = aUrlObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ); + aURL.Complete = aUrlObj.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ); if (xTransformer.is()) xTransformer->parseStrict(aURL); @@ -3823,7 +3823,7 @@ void SAL_CALL ODatabaseForm::write(const Reference& _rxOutS _rxOutStream->writeBoolean(m_bAllowDelete); // html form stuff - OUString sTmp = INetURLObject::decode( m_aTargetURL, INetURLObject::DECODE_UNAMBIGUOUS); + OUString sTmp = INetURLObject::decode( m_aTargetURL, INetURLObject::DecodeMechanism::Unambiguous); _rxOutStream << sTmp; _rxOutStream->writeShort( (sal_Int16)m_eSubmitMethod ); _rxOutStream->writeShort( (sal_Int16)m_eSubmitEncoding ); @@ -3933,7 +3933,7 @@ void SAL_CALL ODatabaseForm::read(const Reference& _rxInStre // html stuff OUString sTmp; _rxInStream >> sTmp; - m_aTargetURL = INetURLObject::decode( sTmp, INetURLObject::DECODE_UNAMBIGUOUS); + m_aTargetURL = INetURLObject::decode( sTmp, INetURLObject::DecodeMechanism::Unambiguous); m_eSubmitMethod = (FormSubmitMethod)_rxInStream->readShort(); m_eSubmitEncoding = (FormSubmitEncoding)_rxInStream->readShort(); _rxInStream >> m_aTargetFrame; diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx index 1bde517002f4..4b2fec5dd410 100644 --- a/forms/source/component/ImageButton.cxx +++ b/forms/source/component/ImageButton.cxx @@ -96,7 +96,7 @@ void OImageButtonModel::write(const Reference& _rxOutStream _rxOutStream->writeShort(0x0003); _rxOutStream->writeShort((sal_uInt16)m_eButtonType); - OUString sTmp(INetURLObject::decode( m_sTargetURL, INetURLObject::DECODE_UNAMBIGUOUS)); + OUString sTmp(INetURLObject::decode( m_sTargetURL, INetURLObject::DecodeMechanism::Unambiguous)); _rxOutStream << sTmp; _rxOutStream << m_sTargetFrame; writeHelpTextCompatibly(_rxOutStream); diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index 253ffa074626..5ea1f430ef49 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.cxx @@ -266,7 +266,7 @@ namespace frm { INetURLObject aURL( sFileName ); aURL.removeSegment(); - getEngine().Read( *pStream, aURL.GetMainURL( INetURLObject::NO_DECODE ), eFormat ); + getEngine().Read( *pStream, aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), eFormat ); } else { diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx index fa39715b0a1c..dc9a857e9395 100644 --- a/forms/source/xforms/submission/replace.cxx +++ b/forms/source/xforms/submission/replace.cxx @@ -69,7 +69,7 @@ CSubmission::SubmissionResult CSubmission::replace(const OUString& aReplace, con descriptor[1] = PropertyValue(OUString("ReadOnly"), -1, makeAny(true), PropertyState_DIRECT_VALUE); - OUString aURL = m_aURLObj.GetMainURL(INetURLObject::NO_DECODE); + OUString aURL = m_aURLObj.GetMainURL(INetURLObject::DecodeMechanism::NONE); OUString aTarget = "_default"; xLoader->loadComponentFromURL(aURL, aTarget, FrameSearchFlag::ALL, descriptor); diff --git a/forms/source/xforms/submission/submission_get.cxx b/forms/source/xforms/submission/submission_get.cxx index da266d39e2cc..14652d4d28f8 100644 --- a/forms/source/xforms/submission/submission_get.cxx +++ b/forms/source/xforms/submission/submission_get.cxx @@ -70,7 +70,7 @@ CSubmission::SubmissionResult CSubmissionGet::submit(const css::uno::Reference< // append query string to the URL try { - OStringBuffer aUTF8QueryURL(OUStringToOString(m_aURLObj.GetMainURL(INetURLObject::NO_DECODE), + OStringBuffer aUTF8QueryURL(OUStringToOString(m_aURLObj.GetMainURL(INetURLObject::DecodeMechanism::NONE), RTL_TEXTENCODING_UTF8)); OStringBuffer aQueryString; diff --git a/forms/source/xforms/submission/submission_post.cxx b/forms/source/xforms/submission/submission_post.cxx index 0580cf5eba5f..db9b868b26fc 100644 --- a/forms/source/xforms/submission/submission_post.cxx +++ b/forms/source/xforms/submission/submission_post.cxx @@ -50,7 +50,7 @@ CSubmission::SubmissionResult CSubmissionPost::submit(const css::uno::Reference< unique_ptr< CSerialization > apSerialization(createSerialization(aInteractionHandler,aEnvironment)); try { - ucbhelper::Content aContent(m_aURLObj.GetMainURL(INetURLObject::NO_DECODE), aEnvironment, comphelper::getProcessComponentContext()); + ucbhelper::Content aContent(m_aURLObj.GetMainURL(INetURLObject::DecodeMechanism::NONE), aEnvironment, comphelper::getProcessComponentContext()); // use post command OUString aCommandName("post"); diff --git a/forms/source/xforms/submission/submission_put.cxx b/forms/source/xforms/submission/submission_put.cxx index 3d7284cf69cf..dfafa8f949f7 100644 --- a/forms/source/xforms/submission/submission_put.cxx +++ b/forms/source/xforms/submission/submission_put.cxx @@ -48,7 +48,7 @@ CSubmission::SubmissionResult CSubmissionPut::submit(const css::uno::Reference< unique_ptr< CSerialization > apSerialization(createSerialization(aInteractionHandler,aEnvironment)); try { - ucbhelper::Content aContent(m_aURLObj.GetMainURL(INetURLObject::NO_DECODE), aEnvironment, comphelper::getProcessComponentContext()); + ucbhelper::Content aContent(m_aURLObj.GetMainURL(INetURLObject::DecodeMechanism::NONE), aEnvironment, comphelper::getProcessComponentContext()); // insert serialized data to content -> PUT css::uno::Reference< XInputStream > aInStream = apSerialization->getInputStream(); -- cgit