diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2010-05-11 11:15:15 +0200 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2010-05-11 11:15:15 +0200 |
commit | 5820bb8db3e482e9796c9ccf6e8d8c5e015926e3 (patch) | |
tree | b564147fbb299404961acbb012d76d6f6f313da8 | |
parent | f4410925a564f6ec608ccbc8861424cf055f5ad5 (diff) | |
parent | 28d847ff77ea9257bc082d07ed3a38d71f2fd030 (diff) |
CWS-TOOLING: integrate CWS sg01
-rw-r--r-- | cui/source/dialogs/hldoctp.cxx | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index d8e5878c3a8e..a87d7710f484 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -39,7 +39,6 @@ sal_Char __READONLY_DATA sHash[] = "#"; sal_Char __READONLY_DATA sFileScheme[] = INET_FILE_SCHEME; -sal_Char __READONLY_DATA sPortalFileScheme[] = "vnd.sun.star.wfs://"; sal_Char __READONLY_DATA sNewsSRVScheme[] = "news://"; // TODO news:// is nonsense sal_Char __READONLY_DATA sHTTPScheme[] = INET_HTTP_SCHEME; @@ -170,8 +169,7 @@ void SvxHyperlinkDocTp::GetCurentItemData ( String& aStrURL, String& aStrName, // get data from standard-fields aStrURL = GetCurrentURL(); - if( aStrURL.EqualsIgnoreCaseAscii( sFileScheme ) || - aStrURL.EqualsIgnoreCaseAscii( sPortalFileScheme ) ) + if( aStrURL.EqualsIgnoreCaseAscii( sFileScheme ) ) aStrURL=aEmptyStr; GetDataFromCommonFields( aStrName, aStrIntName, aStrFrame, eMode ); @@ -212,8 +210,7 @@ IMPL_LINK ( SvxHyperlinkDocTp, ClickFileopenHdl_Impl, void *, EMPTYARG ) com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0, GetParent() ); String aOldURL( GetCurrentURL() ); - if( aOldURL.EqualsIgnoreCaseAscii( sFileScheme, 0, sizeof( sFileScheme ) - 1 ) || - aOldURL.EqualsIgnoreCaseAscii( sPortalFileScheme, 0, sizeof( sFileScheme ) - 1 ) ) + if( aOldURL.EqualsIgnoreCaseAscii( sFileScheme, 0, sizeof( sFileScheme ) - 1 ) ) { aDlg.SetDisplayDirectory( aOldURL ); } @@ -250,15 +247,13 @@ IMPL_LINK ( SvxHyperlinkDocTp, ClickTargetHdl_Impl, void *, EMPTYARG ) if ( GetPathType ( maStrURL ) == Type_ExistsFile || maStrURL == aEmptyStr || maStrURL.EqualsIgnoreCaseAscii( sFileScheme ) || - maStrURL.EqualsIgnoreCaseAscii( sPortalFileScheme ) || maStrURL.SearchAscii( sHash ) == 0 ) { mpMarkWnd->SetError( LERR_NOERROR ); EnterWait(); - if ( maStrURL.EqualsIgnoreCaseAscii( sFileScheme ) || - maStrURL.EqualsIgnoreCaseAscii( sPortalFileScheme ) ) + if ( maStrURL.EqualsIgnoreCaseAscii( sFileScheme ) ) mpMarkWnd->RefreshTree ( aEmptyStr ); else mpMarkWnd->RefreshTree ( maStrURL ); @@ -305,8 +300,7 @@ IMPL_LINK ( SvxHyperlinkDocTp, TimeoutHdl_Impl, Timer *, EMPTYARG ) { EnterWait(); - if ( maStrURL.EqualsIgnoreCaseAscii( sFileScheme ) || - maStrURL.EqualsIgnoreCaseAscii( sPortalFileScheme ) ) + if ( maStrURL.EqualsIgnoreCaseAscii( sFileScheme ) ) mpMarkWnd->RefreshTree ( aEmptyStr ); else mpMarkWnd->RefreshTree ( maStrURL ); |