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 /include/svtools | |
| parent | test color scale entries (diff) | |
| download | core-54e87df11faf697d3b2666198a3d20b3ee091419.tar.gz core-54e87df11faf697d3b2666198a3d20b3ee091419.zip | |
Change INetProtocol enumerators to CamelCase
...to avoid clashes with macros and poor warnings about hiding global FILE
Change-Id: I444e8b958f029201b228937e088efabc4b6d3050
Diffstat (limited to 'include/svtools')
| -rw-r--r-- | include/svtools/inettbc.hxx | 6 | ||||
| -rw-r--r-- | include/svtools/place.hxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index 92a07661c6cb..7d2d4f5ccbee 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -59,9 +59,9 @@ protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - SvtURLBox( vcl::Window* pParent, INetProtocol eSmart = INetProtocol::NOT_VALID, bool bSetDefaultHelpID = true ); - SvtURLBox( vcl::Window* pParent, WinBits _nStyle, INetProtocol eSmart = INetProtocol::NOT_VALID, bool bSetDefaultHelpID = true ); - SvtURLBox( vcl::Window* pParent, const ResId& _rResId, INetProtocol eSmart = INetProtocol::NOT_VALID, bool bSetDefaultHelpID = true ); + SvtURLBox( vcl::Window* pParent, INetProtocol eSmart = INetProtocol::NotValid, bool bSetDefaultHelpID = true ); + SvtURLBox( vcl::Window* pParent, WinBits _nStyle, INetProtocol eSmart = INetProtocol::NotValid, bool bSetDefaultHelpID = true ); + SvtURLBox( vcl::Window* pParent, const ResId& _rResId, INetProtocol eSmart = INetProtocol::NotValid, bool bSetDefaultHelpID = true ); virtual ~SvtURLBox(); void SetBaseURL( const OUString& rURL ); diff --git a/include/svtools/place.hxx b/include/svtools/place.hxx index 0933f998a1a5..db70cf96c163 100644 --- a/include/svtools/place.hxx +++ b/include/svtools/place.hxx @@ -33,7 +33,7 @@ public: OUString& GetName( ) { return msName; } OUString GetUrl( ) { return maUrl.GetMainURL( INetURLObject::NO_DECODE ); } INetURLObject& GetUrlObject( ) { return maUrl; } - bool IsLocal( ) { return maUrl.GetProtocol() == INetProtocol::FILE; } + bool IsLocal( ) { return maUrl.GetProtocol() == INetProtocol::File; } bool IsEditable( ) { return mbEditable; } }; |