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 /editeng | |
| 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 'editeng')
| -rw-r--r-- | editeng/source/items/flditem.cxx | 6 | ||||
| -rw-r--r-- | editeng/source/misc/svxacorr.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 09e8021f5ade..8297a406c6c9 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -1008,7 +1008,7 @@ OUString SvxExtFileField::GetFormatted() const INetURLObject aURLObj( aFile ); - if( INetProtocol::NOT_VALID == aURLObj.GetProtocol() ) + if( INetProtocol::NotValid == aURLObj.GetProtocol() ) { // invalid? try to interpret string as system file name OUString aURLStr; @@ -1020,12 +1020,12 @@ OUString SvxExtFileField::GetFormatted() const // #92009# Be somewhat liberate when trying to // get formatted content out of the FileField - if( INetProtocol::NOT_VALID == aURLObj.GetProtocol() ) + if( INetProtocol::NotValid == aURLObj.GetProtocol() ) { // still not valid? Then output as is aString = aFile; } - else if( INetProtocol::FILE == aURLObj.GetProtocol() ) + else if( INetProtocol::File == aURLObj.GetProtocol() ) { switch( eFormat ) { diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 241b26b335bd..1397bbfb54b1 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -662,7 +662,7 @@ bool SvxAutoCorrect::FnAddNonBrkSpace( sal_Int32 nProtocolLen = nEndPos - nSttWdPos + 1; if (nIndex + nProtocolLen <= rTxt.getLength()) { - if (INetURLObject::CompareProtocolScheme(rTxt.copy(nIndex, nProtocolLen)) != INetProtocol::NOT_VALID) + if (INetURLObject::CompareProtocolScheme(rTxt.copy(nIndex, nProtocolLen)) != INetProtocol::NotValid) return false; } @@ -854,7 +854,7 @@ bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc, sal_Int32 nProtocolLen = pDelim - pWordStt + 1; if (nIndex + nProtocolLen <= rTxt.getLength()) { - if (INetURLObject::CompareProtocolScheme(rTxt.copy(nIndex, nProtocolLen)) != INetProtocol::NOT_VALID) + if (INetURLObject::CompareProtocolScheme(rTxt.copy(nIndex, nProtocolLen)) != INetProtocol::NotValid) return false; // already ok } |