diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 08:47:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 12:49:02 +0200 |
| commit | bfde4866e07746eafa2f0d6173c29d805cc35ad0 (patch) | |
| tree | be939a44eb70c7187fa5536089b782326b160013 /forms/source/component | |
| parent | 803215142efa6437515348f63bd70ffdcf5d45f1 (diff) | |
convert DecodeMechanism to scoped enum
Change-Id: I5c56634b1bca8e37fa73d02d2428645301b6c547
Diffstat (limited to 'forms/source/component')
| -rw-r--r-- | forms/source/component/Button.cxx | 2 | ||||
| -rw-r--r-- | forms/source/component/DatabaseForm.cxx | 10 | ||||
| -rw-r--r-- | forms/source/component/ImageButton.cxx | 2 |
3 files changed, 7 insertions, 7 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); |