diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 08:47:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 12:49:02 +0200 |
| commit | bfde4866e07746eafa2f0d6173c29d805cc35ad0 (patch) | |
| tree | be939a44eb70c7187fa5536089b782326b160013 /linguistic | |
| parent | 803215142efa6437515348f63bd70ffdcf5d45f1 (diff) | |
convert DecodeMechanism to scoped enum
Change-Id: I5c56634b1bca8e37fa73d02d2428645301b6c547
Diffstat (limited to 'linguistic')
| -rw-r--r-- | linguistic/source/convdiclist.cxx | 6 | ||||
| -rw-r--r-- | linguistic/source/dlistimp.cxx | 2 | ||||
| -rw-r--r-- | linguistic/source/misc2.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 4c77c0018a28..4efefdf7e936 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -72,7 +72,7 @@ OUString GetConvDicMainURL( const OUString &rDicName, const OUString &rDirectory if (aURLObj.HasError()) return OUString(); else - return aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI ); + return aURLObj.GetMainURL( INetURLObject::DecodeMechanism::ToIUri ); } class ConvDicNameContainer : @@ -263,7 +263,7 @@ void SAL_CALL ConvDicNameContainer::removeByName( const OUString& rName ) { try { - ::ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), + ::ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); aCnt.executeCommand( "delete", makeAny( true ) ); @@ -307,7 +307,7 @@ void ConvDicNameContainer::AddConvDics( // get decoded dictionary file name INetURLObject aURLObj( aURL ); OUString aDicName = aURLObj.getBase( INetURLObject::LAST_SEGMENT, - true, INetURLObject::DECODE_WITH_CHARSET ); + true, INetURLObject::DecodeMechanism::WithCharset ); uno::Reference < XConversionDictionary > xDic; if (nLang == LANGUAGE_KOREAN && diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 6b2a43be4068..f86963015fbf 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -341,7 +341,7 @@ void DicList::SearchForDictionaries( // get decoded dictionary file name INetURLObject aURLObj( aURL ); OUString aDicName = aURLObj.getName( INetURLObject::LAST_SEGMENT, - true, INetURLObject::DECODE_WITH_CHARSET ); + true, INetURLObject::DecodeMechanism::WithCharset ); DictionaryType eType = bNeg ? DictionaryType_NEGATIVE : DictionaryType_POSITIVE; uno::Reference< XDictionary > xDic = diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx index cf893f397015..9bd7fd5add26 100644 --- a/linguistic/source/misc2.cxx +++ b/linguistic/source/misc2.cxx @@ -160,10 +160,10 @@ OUString GetWritableDictionaryURL( const OUString &rDicName ) aURLObj.Append( rDicName, INetURLObject::EncodeMechanism::All ); DBG_ASSERT(!aURLObj.HasError(), "lng : invalid URL"); - // NO_DECODE preserves the escape sequences that might be included in aDirName + // DecodeMechanism::NONE preserves the escape sequences that might be included in aDirName // depending on the characters used in the path string. (Needed when comparing // the dictionary URL with GetDictionaryWriteablePath in DicList::createDictionary.) - return aURLObj.GetMainURL( INetURLObject::NO_DECODE ); + return aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ); } } // namespace linguistic |