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 /sfx2/source/appl/linkmgr2.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 'sfx2/source/appl/linkmgr2.cxx')
| -rw-r--r-- | sfx2/source/appl/linkmgr2.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index 50461699fd4e..a64704b0503b 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -563,7 +563,7 @@ OUString lcl_DDE_RelToAbs( const OUString& rTopic, const OUString& rBaseURL ) { OUString sRet; INetURLObject aURL( rTopic ); - if( INetProtocol::NOT_VALID == aURL.GetProtocol() ) + if( INetProtocol::NotValid == aURL.GetProtocol() ) utl::LocalFileHelper::ConvertSystemPathToURL( rTopic, rBaseURL, sRet ); if( sRet.isEmpty() ) sRet = URIHelper::SmartRel2Abs( INetURLObject(rBaseURL), rTopic, URIHelper::GetMaybeFileHdl(), true ); @@ -657,8 +657,8 @@ bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink ) INetURLObject aURL( sTopic ); INetProtocol eOld = aURL.GetProtocol(); aURL.SetURL( sTopic = lcl_DDE_RelToAbs( sTopic, sReferer ) ); - if( INetProtocol::NOT_VALID != eOld || - INetProtocol::HTTP != aURL.GetProtocol() ) + if( INetProtocol::NotValid != eOld || + INetProtocol::Http != aURL.GetProtocol() ) { SfxStringItem aName( SID_FILE_NAME, sTopic ); SfxBoolItem aMinimized(SID_MINIMIZED, true); |