diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-02 18:32:36 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-02 18:33:37 +0200 |
| commit | 54e87df11faf697d3b2666198a3d20b3ee091419 (patch) | |
| tree | 8cfe316f012a4969ca6980fa6ac2fdb3a9424118 /forms | |
| parent | 3aac11a1233f679ea813fee8b8de134553d7db60 (diff) | |
Change INetProtocol enumerators to CamelCase
...to avoid clashes with macros and poor warnings about hiding global FILE
Change-Id: I444e8b958f029201b228937e088efabc4b6d3050
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 3041e83dbe11..e9a88e72ae9f 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(INetProtocol::FILE); + aURL.SetSmartProtocol(INetProtocol::File); aURL.SetSmartURL(aValue); - if( INetProtocol::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(INetProtocol::FILE); + aURL.SetSmartProtocol(INetProtocol::File); aURL.SetSmartURL(rFileName); - if( INetProtocol::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 79a4d04b375d..796335772f4a 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 (INetProtocol::NOT_VALID == aUrl.GetProtocol()) + if (INetProtocol::NotValid == 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 79a295ae661c..7b80b1d99661 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() != INetProtocol::FILE) + if (!aQueryString.isEmpty() && m_aURLObj.GetProtocol() != INetProtocol::File) { aUTF8QueryURL.append('?'); aUTF8QueryURL.append(aQueryString.makeStringAndClear()); |