Skip to content

C
core
Kaydet (Commit) 5820bb8d authored tarafından Ivo Hinkelmann's avatar Ivo Hinkelmann
Dosyalara gözat
Seçenekler

CWS-TOOLING: integrate CWS sg01

üst f4410925 28d847ff
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 10 deletions
cui/source/dialogs/hldoctp.cxx
Dosyayı görüntüle @ 5820bb8d
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,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;
...@@ -170,8 +169,7 @@ void SvxHyperlinkDocTp::GetCurentItemData ( String& aStrURL, String& aStrName, ...@@ -170,8 +169,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 );
...@@ -212,8 +210,7 @@ IMPL_LINK ( SvxHyperlinkDocTp, ClickFileopenHdl_Impl, void *, EMPTYARG ) ...@@ -212,8 +210,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 );
} }
...@@ -250,15 +247,13 @@ IMPL_LINK ( SvxHyperlinkDocTp, ClickTargetHdl_Impl, void *, EMPTYARG ) ...@@ -250,15 +247,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 );
...@@ -305,8 +300,7 @@ IMPL_LINK ( SvxHyperlinkDocTp, TimeoutHdl_Impl, Timer *, EMPTYARG ) ...@@ -305,8 +300,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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment