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 /cui/source/dialogs/hldoctp.cxx | |
| 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 'cui/source/dialogs/hldoctp.cxx')
| -rw-r--r-- | cui/source/dialogs/hldoctp.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 12d73d1966ad..11fe8e63db34 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -39,7 +39,7 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* p mbMarkWndOpen ( false ) { get(m_pCbbPath, "path"); - m_pCbbPath->SetSmartProtocol(INetProtocol::FILE); + m_pCbbPath->SetSmartProtocol(INetProtocol::File); get(m_pBtFileopen, "fileopen"); m_pBtFileopen->SetModeImage(Image(CUI_RES(RID_SVXBMP_FILEOPEN))); get(m_pEdTarget, "target"); @@ -113,7 +113,7 @@ OUString SvxHyperlinkDocTp::GetCurrentURL () if ( aStrPath != aEmptyStr ) { INetURLObject aURL( aStrPath ); - if ( aURL.GetProtocol() != INetProtocol::NOT_VALID ) // maybe the path is already a valid + if ( aURL.GetProtocol() != INetProtocol::NotValid ) // maybe the path is already a valid aStrURL = aStrPath; // hyperlink, then we can use this path directly else utl::LocalFileHelper::ConvertSystemPathToURL( aStrPath, aBaseURL, aStrURL ); @@ -341,7 +341,7 @@ void SvxHyperlinkDocTp::SetMarkStr ( const OUString& aStrMark ) SvxHyperlinkDocTp::EPathType SvxHyperlinkDocTp::GetPathType ( const OUString& rStrPath ) { - INetURLObject aURL( rStrPath, INetProtocol::FILE ); + INetURLObject aURL( rStrPath, INetProtocol::File ); if( aURL.HasError() ) return Type_Invalid; |