summaryrefslogtreecommitdiff
path: root/forms/source
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-12-05 08:47:18 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-12-05 12:49:02 +0200
commitbfde4866e07746eafa2f0d6173c29d805cc35ad0 (patch)
treebe939a44eb70c7187fa5536089b782326b160013 /forms/source
parent803215142efa6437515348f63bd70ffdcf5d45f1 (diff)
convert DecodeMechanism to scoped enum
Change-Id: I5c56634b1bca8e37fa73d02d2428645301b6c547
Diffstat (limited to 'forms/source')
-rw-r--r--forms/source/component/Button.cxx2
-rw-r--r--forms/source/component/DatabaseForm.cxx10
-rw-r--r--forms/source/component/ImageButton.cxx2
-rw-r--r--forms/source/richtext/richtextvclcontrol.cxx2
-rw-r--r--forms/source/xforms/submission/replace.cxx2
-rw-r--r--forms/source/xforms/submission/submission_get.cxx2
-rw-r--r--forms/source/xforms/submission/submission_post.cxx2
-rw-r--r--forms/source/xforms/submission/submission_put.cxx2
8 files changed, 12 insertions, 12 deletions
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<XObjectOutputStream>& _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 Reference<XContro
aURL.SetSmartProtocol(INetProtocol::File);
aURL.SetSmartURL(aValue);
if( INetProtocol::File == aURL.GetProtocol() )
- aValue = INetURLObject::decode(aURL.PathToFileName(), INetURLObject::DECODE_UNAMBIGUOUS);
+ aValue = INetURLObject::decode(aURL.PathToFileName(), INetURLObject::DecodeMechanism::Unambiguous);
}
Encode( aName );
Encode( aValue );
@@ -1008,7 +1008,7 @@ bool ODatabaseForm::InsertFilePart( INetMIMEMessage& rParent, const OUString& rN
aURL.SetSmartURL(rFileName);
if( INetProtocol::File == aURL.GetProtocol() )
{
- aFileName = INetURLObject::decode(aURL.PathToFileName(), INetURLObject::DECODE_UNAMBIGUOUS);
+ aFileName = INetURLObject::decode(aURL.PathToFileName(), INetURLObject::DecodeMechanism::Unambiguous);
pStream = ::utl::UcbStreamHelper::CreateStream(aFileName, StreamMode::READ);
if (!pStream || (pStream->GetError() != ERRCODE_NONE))
{
@@ -2191,7 +2191,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& 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<XObjectOutputStream>& _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<XObjectInputStream>& _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<XObjectOutputStream>& _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();