From 44b3e56bb4a4df59f53447c4ca4d8e02fe926206 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 2 Apr 2015 15:58:06 +0200 Subject: Change INetProtocol to scoped enumeration ...and fix o3tl::enumarray::operator [] const overload Change-Id: I749b1b9d68686b03a97074253478d9d2d9d32b0b --- cui/source/dialogs/linkdlg.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cui/source/dialogs/linkdlg.cxx') diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index fc0c4d67cf58..bde358525512 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -361,7 +361,7 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton ) SvBaseLink* pLink = static_cast(pEntry->GetUserData()); pLinkMgr->GetDisplayNames( pLink, &sType, &sFile, 0, 0 ); INetURLObject aUrl(sFile); - if(aUrl.GetProtocol() == INET_PROT_FILE) + if(aUrl.GetProtocol() == INetProtocol::FILE) { OUString sOldPath(aUrl.PathToFileName()); sal_Int32 nLen = aUrl.GetName().getLength(); @@ -386,7 +386,7 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton ) continue; pLinkMgr->GetDisplayNames( pLink, &sType, &sFile, &sLinkName, &sFilter ); INetURLObject aUrl_(sFile); - INetURLObject aUrl2(aPath, INET_PROT_FILE); + INetURLObject aUrl2(aPath, INetProtocol::FILE); aUrl2.insertName( aUrl_.getName() ); OUString sNewLinkName; MakeLnkName( sNewLinkName, 0 , @@ -639,7 +639,7 @@ void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, sal_uLong nPos, bool long nWidthPixel = m_pTbLinks->GetLogicTab( 2 ) - m_pTbLinks->GetLogicTab( 1 ); nWidthPixel -= SV_TAB_BORDER; OUString aTxt = m_pTbLinks->GetEllipsisString( sFileNm, nWidthPixel, TEXT_DRAW_PATHELLIPSIS ); - INetURLObject aPath( sFileNm, INET_PROT_FILE ); + INetURLObject aPath( sFileNm, INetProtocol::FILE ); OUString aFileName = aPath.getName(); aFileName = INetURLObject::decode(aFileName, '%', INetURLObject::DECODE_UNAMBIGUOUS); -- cgit