diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-07 20:21:21 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-07 20:21:21 +0200 |
| commit | 5ba54aacd5318fbf9b9f0589a090f717c53833c7 (patch) | |
| tree | 6028b817c850a5e1e178c0def4d4e61e949409b7 /forms | |
| parent | 2a4753b9a36bb136945857c3b882b00ad2b4486d (diff) | |
Remove dead INetProtocol::Vim
...which removes the need to abstract over the standard URI '%' escape prefix
vs. the silly vim '=' special case invention.
Change-Id: I54a52dd912c3aafc38275a0ac2466a6daeec328f
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/Button.cxx | 2 | ||||
| -rw-r--r-- | forms/source/component/DatabaseForm.cxx | 8 | ||||
| -rw-r--r-- | forms/source/component/ImageButton.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index ac576027344e..9870aec1a130 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -144,7 +144,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::DECODE_UNAMBIGUOUS); _rxOutStream << sTmp; _rxOutStream << m_sTargetFrame; writeHelpTextCompatibly(_rxOutStream); diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 7033be97a129..1bf4af9d43bc 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -484,7 +484,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::DECODE_UNAMBIGUOUS); } Encode( aName ); Encode( aValue ); @@ -1031,7 +1031,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::DECODE_UNAMBIGUOUS); pStream = ::utl::UcbStreamHelper::CreateStream(aFileName, StreamMode::READ); if (!pStream || (pStream->GetError() != ERRCODE_NONE)) { @@ -3862,7 +3862,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::DECODE_UNAMBIGUOUS); _rxOutStream << sTmp; _rxOutStream->writeShort( (sal_Int16)m_eSubmitMethod ); _rxOutStream->writeShort( (sal_Int16)m_eSubmitEncoding ); @@ -3972,7 +3972,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::DECODE_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 f355b9d21266..4889d9d8f274 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::DECODE_UNAMBIGUOUS)); _rxOutStream << sTmp; _rxOutStream << m_sTargetFrame; writeHelpTextCompatibly(_rxOutStream); |