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 /linguistic | |
| 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 '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 6ebd8c4e5dee..0144fa32518e 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( INetProtocol::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() == INetProtocol::FILE, "+HangulHanjaOptionsDialog::OkHdl(): non-file URLs cannot be deleted" ); - if( aObj.GetProtocol() == INetProtocol::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 ed3c3d8bc56c..64fed55c6234 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( INetProtocol::FILE ); + aURLObj.SetSmartProtocol( INetProtocol::File ); aURLObj.SetSmartURL( aDirName ); DBG_ASSERT(!aURLObj.HasError(), "lng : invalid URL"); aURLObj.Append( rDicName, INetURLObject::ENCODE_ALL ); |