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 /svx/source/form | |
| 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 'svx/source/form')
| -rw-r--r-- | svx/source/form/dataaccessdescriptor.cxx | 2 | ||||
| -rw-r--r-- | svx/source/form/databaselocationinput.cxx | 2 | ||||
| -rw-r--r-- | svx/source/form/fmpage.cxx | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx index 1f1d93312ea3..4cb371d81b86 100644 --- a/svx/source/form/dataaccessdescriptor.cxx +++ b/svx/source/form/dataaccessdescriptor.cxx @@ -392,7 +392,7 @@ namespace svx if ( !_sDataSourceNameOrLocation.isEmpty() ) { INetURLObject aURL(_sDataSourceNameOrLocation); - (*this)[ (( aURL.GetProtocol() == INetProtocol::FILE ) ? daDatabaseLocation : daDataSource)] <<= _sDataSourceNameOrLocation; + (*this)[ (( aURL.GetProtocol() == INetProtocol::File ) ? daDatabaseLocation : daDataSource)] <<= _sDataSourceNameOrLocation; } else (*this)[ daDataSource ] <<= OUString(); diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index ae712941f736..8e32e9ce7cb4 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -243,7 +243,7 @@ namespace svx if ( aFileDlg.Execute() == ERRCODE_NONE ) { INetURLObject aURL( aFileDlg.GetPath() ); - if( aURL.GetProtocol() != INetProtocol::NOT_VALID ) + if( aURL.GetProtocol() != INetProtocol::NotValid ) { ::svt::OFileNotation aFileNotation( aURL.GetMainURL( INetURLObject::NO_DECODE ) ); m_rLocationInput.SetText( aFileNotation.get( ::svt::OFileNotation::N_SYSTEM ) ); diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index 3117930c26d3..b0c080aaca2b 100644 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -191,9 +191,9 @@ bool FmFormPage::RequestHelp( vcl::Window* pWindow, SdrView* pView, // testen, ob es ein Protokoll-Typ ist, den ich anzeigen will INetProtocol aProtocol = aUrl.GetProtocol(); static const INetProtocol s_aQuickHelpSupported[] = - { INetProtocol::FTP, INetProtocol::HTTP, INetProtocol::FILE, INetProtocol::MAILTO, INetProtocol::NEWS, - INetProtocol::HTTPS, INetProtocol::JAVASCRIPT, INetProtocol::IMAP, INetProtocol::POP3, - INetProtocol::VIM, INetProtocol::LDAP + { INetProtocol::Ftp, INetProtocol::Http, INetProtocol::File, INetProtocol::Mailto, INetProtocol::News, + INetProtocol::Https, INetProtocol::Javascript, INetProtocol::Imap, INetProtocol::Pop3, + INetProtocol::Vim, INetProtocol::Ldap }; for (sal_uInt16 i=0; i<sizeof(s_aQuickHelpSupported)/sizeof(s_aQuickHelpSupported[0]); ++i) if (s_aQuickHelpSupported[i] == aProtocol) |