diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-02 15:58:06 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-02 16:30:34 +0200 |
| commit | 44b3e56bb4a4df59f53447c4ca4d8e02fe926206 (patch) | |
| tree | 71a9efde3a6a2a00688e8feb8e3086cb32eceb4f /forms | |
| parent | 0b4965bcd7ec911951e7ca3a4cd48062843b2634 (diff) | |
Change INetProtocol to scoped enumeration
...and fix o3tl::enumarray::operator [] const overload
Change-Id: I749b1b9d68686b03a97074253478d9d2d9d32b0b
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/DatabaseForm.cxx | 8 | ||||
| -rw-r--r-- | forms/source/component/clickableimage.cxx | 2 | ||||
| -rw-r--r-- | forms/source/xforms/submission/submission_get.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 225967cbfe77..3041e83dbe11 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -489,9 +489,9 @@ OUString ODatabaseForm::GetDataEncoded(bool _bURLEncoded,const Reference<XContro { // For File URLs we transfer the file name and not a URL, because Netscape does it like that INetURLObject aURL; - aURL.SetSmartProtocol(INET_PROT_FILE); + aURL.SetSmartProtocol(INetProtocol::FILE); aURL.SetSmartURL(aValue); - if( INET_PROT_FILE == aURL.GetProtocol() ) + if( INetProtocol::FILE == aURL.GetProtocol() ) aValue = INetURLObject::decode(aURL.PathToFileName(), '%', INetURLObject::DECODE_UNAMBIGUOUS); } Encode( aName ); @@ -1035,9 +1035,9 @@ bool ODatabaseForm::InsertFilePart( INetMIMEMessage& rParent, const OUString& rN { // We can only process File URLs yet INetURLObject aURL; - aURL.SetSmartProtocol(INET_PROT_FILE); + aURL.SetSmartProtocol(INetProtocol::FILE); aURL.SetSmartURL(rFileName); - if( INET_PROT_FILE == aURL.GetProtocol() ) + if( INetProtocol::FILE == aURL.GetProtocol() ) { aFileName = INetURLObject::decode(aURL.PathToFileName(), '%', INetURLObject::DECODE_UNAMBIGUOUS); pStream = ::utl::UcbStreamHelper::CreateStream(aFileName, StreamMode::READ); diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index d111fc8616fe..79a4d04b375d 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -716,7 +716,7 @@ namespace frm // the SfxMedium is not allowed to be created with an invalid URL, so we have to check this first INetURLObject aUrl(rURL); - if (INET_PROT_NOT_VALID == aUrl.GetProtocol()) + if (INetProtocol::NOT_VALID == aUrl.GetProtocol()) // we treat an invalid URL like we would treat no URL return; diff --git a/forms/source/xforms/submission/submission_get.cxx b/forms/source/xforms/submission/submission_get.cxx index de7caa654f74..79a295ae661c 100644 --- a/forms/source/xforms/submission/submission_get.cxx +++ b/forms/source/xforms/submission/submission_get.cxx @@ -80,7 +80,7 @@ CSubmission::SubmissionResult CSubmissionGet::submit(const css::uno::Reference< Sequence< sal_Int8 > aByteBuffer(size); while ((n = aInStream->readSomeBytes(aByteBuffer, size-1)) != 0) aQueryString.append(reinterpret_cast<char const *>(aByteBuffer.getConstArray()), n); - if (!aQueryString.isEmpty() && m_aURLObj.GetProtocol() != INET_PROT_FILE) + if (!aQueryString.isEmpty() && m_aURLObj.GetProtocol() != INetProtocol::FILE) { aUTF8QueryURL.append('?'); aUTF8QueryURL.append(aQueryString.makeStringAndClear()); |