strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#161490# removed scheme vnd.sun.star.wfs

Browse source
This commit is contained in:
Steffen Grund 2010-01-19 12:49:10 +01:00
parent 055bc5c7f4
commit ae7e1f9179
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cui/source/dialogs/hldoctp.cxx
View file

@ -42,7 +42,6 @@
sal_Char __READONLY_DATA sHash[] = "#"; sal_Char __READONLY_DATA sHash[] = "#";
sal_Char __READONLY_DATA sFileScheme[] = INET_FILE_SCHEME; sal_Char __READONLY_DATA sFileScheme[] = INET_FILE_SCHEME;
sal_Char __READONLY_DATA sPortalFileScheme[] = "vnd.sun.star.wfs://";
sal_Char __READONLY_DATA sNewsSRVScheme[] = "news://"; sal_Char __READONLY_DATA sNewsSRVScheme[] = "news://";
// TODO news:// is nonsense // TODO news:// is nonsense
sal_Char __READONLY_DATA sHTTPScheme[] = INET_HTTP_SCHEME; sal_Char __READONLY_DATA sHTTPScheme[] = INET_HTTP_SCHEME;
@ -173,8 +172,7 @@ void SvxHyperlinkDocTp::GetCurentItemData ( String& aStrURL, String& aStrName,
// get data from standard-fields // get data from standard-fields
aStrURL = GetCurrentURL(); aStrURL = GetCurrentURL();
if( aStrURL.EqualsIgnoreCaseAscii( sFileScheme ) || if( aStrURL.EqualsIgnoreCaseAscii( sFileScheme ) )
aStrURL.EqualsIgnoreCaseAscii( sPortalFileScheme ) )
aStrURL=aEmptyStr; aStrURL=aEmptyStr;
GetDataFromCommonFields( aStrName, aStrIntName, aStrFrame, eMode ); GetDataFromCommonFields( aStrName, aStrIntName, aStrFrame, eMode );
@ -215,8 +213,7 @@ IMPL_LINK ( SvxHyperlinkDocTp, ClickFileopenHdl_Impl, void *, EMPTYARG )
com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0, com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0,
GetParent() ); GetParent() );
String aOldURL( GetCurrentURL() ); String aOldURL( GetCurrentURL() );
if( aOldURL.EqualsIgnoreCaseAscii( sFileScheme, 0, sizeof( sFileScheme ) - 1 ) || if( aOldURL.EqualsIgnoreCaseAscii( sFileScheme, 0, sizeof( sFileScheme ) - 1 ) )
aOldURL.EqualsIgnoreCaseAscii( sPortalFileScheme, 0, sizeof( sFileScheme ) - 1 ) )
{ {
aDlg.SetDisplayDirectory( aOldURL ); aDlg.SetDisplayDirectory( aOldURL );
} }
@ -253,15 +250,13 @@ IMPL_LINK ( SvxHyperlinkDocTp, ClickTargetHdl_Impl, void *, EMPTYARG )
if ( GetPathType ( maStrURL ) == Type_ExistsFile || if ( GetPathType ( maStrURL ) == Type_ExistsFile ||
maStrURL == aEmptyStr || maStrURL == aEmptyStr ||
maStrURL.EqualsIgnoreCaseAscii( sFileScheme ) || maStrURL.EqualsIgnoreCaseAscii( sFileScheme ) ||
maStrURL.EqualsIgnoreCaseAscii( sPortalFileScheme ) ||
maStrURL.SearchAscii( sHash ) == 0 ) maStrURL.SearchAscii( sHash ) == 0 )
{ {
mpMarkWnd->SetError( LERR_NOERROR ); mpMarkWnd->SetError( LERR_NOERROR );
EnterWait(); EnterWait();
if ( maStrURL.EqualsIgnoreCaseAscii( sFileScheme ) || if ( maStrURL.EqualsIgnoreCaseAscii( sFileScheme ) )
maStrURL.EqualsIgnoreCaseAscii( sPortalFileScheme ) )
mpMarkWnd->RefreshTree ( aEmptyStr ); mpMarkWnd->RefreshTree ( aEmptyStr );
else else
mpMarkWnd->RefreshTree ( maStrURL ); mpMarkWnd->RefreshTree ( maStrURL );
@ -308,8 +303,7 @@ IMPL_LINK ( SvxHyperlinkDocTp, TimeoutHdl_Impl, Timer *, EMPTYARG )
{ {
EnterWait(); EnterWait();
if ( maStrURL.EqualsIgnoreCaseAscii( sFileScheme ) || if ( maStrURL.EqualsIgnoreCaseAscii( sFileScheme ) )
maStrURL.EqualsIgnoreCaseAscii( sPortalFileScheme ) )
mpMarkWnd->RefreshTree ( aEmptyStr ); mpMarkWnd->RefreshTree ( aEmptyStr );
else else
mpMarkWnd->RefreshTree ( maStrURL ); mpMarkWnd->RefreshTree ( maStrURL );