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 /editeng | |
| parent | 0b4965bcd7ec911951e7ca3a4cd48062843b2634 (diff) | |
Change INetProtocol to scoped enumeration
...and fix o3tl::enumarray::operator [] const overload
Change-Id: I749b1b9d68686b03a97074253478d9d2d9d32b0b
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 7371b6cadc2c..09e8021f5ade 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( INET_PROT_NOT_VALID == aURLObj.GetProtocol() ) + if( INetProtocol::NOT_VALID == 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( INET_PROT_NOT_VALID == aURLObj.GetProtocol() ) + if( INetProtocol::NOT_VALID == aURLObj.GetProtocol() ) { // still not valid? Then output as is aString = aFile; } - else if( INET_PROT_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 7ec0a8b96fb5..241b26b335bd 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)) != INET_PROT_NOT_VALID) + if (INetURLObject::CompareProtocolScheme(rTxt.copy(nIndex, nProtocolLen)) != INetProtocol::NOT_VALID) 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)) != INET_PROT_NOT_VALID) + if (INetURLObject::CompareProtocolScheme(rTxt.copy(nIndex, nProtocolLen)) != INetProtocol::NOT_VALID) return false; // already ok } |