diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-02 15:58:06 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-02 16:30:34 +0200 |
| commit | 44b3e56bb4a4df59f53447c4ca4d8e02fe926206 (patch) | |
| tree | 71a9efde3a6a2a00688e8feb8e3086cb32eceb4f /sfx2/source/appl/linkmgr2.cxx | |
| parent | 0b4965bcd7ec911951e7ca3a4cd48062843b2634 (diff) | |
Change INetProtocol to scoped enumeration
...and fix o3tl::enumarray::operator [] const overload
Change-Id: I749b1b9d68686b03a97074253478d9d2d9d32b0b
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 65be6e6d74c3..50461699fd4e 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( INET_PROT_NOT_VALID == aURL.GetProtocol() ) + if( INetProtocol::NOT_VALID == 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( INET_PROT_NOT_VALID != eOld || - INET_PROT_HTTP != aURL.GetProtocol() ) + if( INetProtocol::NOT_VALID != eOld || + INetProtocol::HTTP != aURL.GetProtocol() ) { SfxStringItem aName( SID_FILE_NAME, sTopic ); SfxBoolItem aMinimized(SID_MINIMIZED, true); |