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 /linguistic | |
| parent | 0b4965bcd7ec911951e7ca3a4cd48062843b2634 (diff) | |
Change INetProtocol to scoped enumeration
...and fix o3tl::enumarray::operator [] const overload
Change-Id: I749b1b9d68686b03a97074253478d9d2d9d32b0b
Diffstat (limited to 'linguistic')
| -rw-r--r-- | linguistic/source/convdiclist.cxx | 6 | ||||
| -rw-r--r-- | linguistic/source/misc2.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index f1cc93064839..6ebd8c4e5dee 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -71,7 +71,7 @@ OUString GetConvDicMainURL( const OUString &rDicName, const OUString &rDirectory OUString aFullDicName = OUString(rDicName) + CONV_DIC_DOT_EXT; INetURLObject aURLObj; - aURLObj.SetSmartProtocol( INET_PROT_FILE ); + aURLObj.SetSmartProtocol( INetProtocol::FILE ); aURLObj.SetSmartURL( rDirectoryURL ); aURLObj.Append( aFullDicName, INetURLObject::ENCODE_ALL ); DBG_ASSERT(!aURLObj.HasError(), "invalid URL"); @@ -276,8 +276,8 @@ void SAL_CALL ConvDicNameContainer::removeByName( const OUString& rName ) OUString aName( xDel->getName() ); OUString aDicMainURL( GetConvDicMainURL( aName, GetDictionaryWriteablePath() ) ); INetURLObject aObj( aDicMainURL ); - DBG_ASSERT( aObj.GetProtocol() == INET_PROT_FILE, "+HangulHanjaOptionsDialog::OkHdl(): non-file URLs cannot be deleted" ); - if( aObj.GetProtocol() == INET_PROT_FILE ) + DBG_ASSERT( aObj.GetProtocol() == INetProtocol::FILE, "+HangulHanjaOptionsDialog::OkHdl(): non-file URLs cannot be deleted" ); + if( aObj.GetProtocol() == INetProtocol::FILE ) { try { diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx index e7e8031e41c8..ed3c3d8bc56c 100644 --- a/linguistic/source/misc2.cxx +++ b/linguistic/source/misc2.cxx @@ -140,7 +140,7 @@ OUString GetWritableDictionaryURL( const OUString &rDicName ) // build URL to use for a new (persistent) dictionary INetURLObject aURLObj; - aURLObj.SetSmartProtocol( INET_PROT_FILE ); + aURLObj.SetSmartProtocol( INetProtocol::FILE ); aURLObj.SetSmartURL( aDirName ); DBG_ASSERT(!aURLObj.HasError(), "lng : invalid URL"); aURLObj.Append( rDicName, INetURLObject::ENCODE_ALL ); |