diff options
| author | Pascal Junck <pjunck@openoffice.org> | 2004-10-22 11:34:40 +0000 |
|---|---|---|
| committer | Pascal Junck <pjunck@openoffice.org> | 2004-10-22 11:34:40 +0000 |
| commit | cee7c69d9fba86b7621c4ab463ca808aa17df034 (patch) | |
| tree | 0818e4c7b8b0af4deaf63c238da63dca2c1e13f0 /svtools | |
| parent | e9efcc65c892c2bcf6be1b9df689191ba573f6f1 (diff) | |
INTEGRATION: CWS dba17 (1.57.58); FILE MERGED
2004/10/11 08:24:30 fs 1.57.58.2: RESYNC: (1.57-1.58); FILE MERGED
2004/09/17 08:23:32 fs 1.57.58.1: #b5008519# allow filling the view asynchronously (not used herein)
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/contnr/templwin.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index aed7bd8170cd..7d892465f89a 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: templwin.cxx,v $ * - * $Revision: 1.58 $ + * $Revision: 1.59 $ * - * last change: $Author: kz $ $Date: 2004-10-04 19:44:53 $ + * last change: $Author: pjunck $ $Date: 2004-10-22 12:34:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -845,14 +845,14 @@ void SvtFileViewWindow_Impl::OpenFolder( const String& rURL ) if ( eProt == INET_PROT_PRIVATE ) { aFileView.EnableNameReplacing( sal_False ); - aFileView.Initialize( rURL, GetNewDocContents() ); + aFileView.Initialize( GetNewDocContents() ); } else { xub_StrLen nSampFoldLen = aSamplesFolderURL.Len(); aFileView.EnableNameReplacing( nSampFoldLen? rURL.CompareTo( aSamplesFolderURL, nSampFoldLen ) == COMPARE_EQUAL : sal_False ); - aFileView.Initialize( rURL, String() ); + aFileView.Initialize( rURL, String(), NULL ); } aNewFolderLink.Call( this ); } @@ -860,7 +860,7 @@ void SvtFileViewWindow_Impl::OpenFolder( const String& rURL ) sal_Bool SvtFileViewWindow_Impl::HasPreviousLevel( String& rURL ) const { return ( INetURLObject( aFileView.GetViewURL() ) != INetURLObject( aCurrentRootURL ) && - aFileView.HasPreviousLevel( rURL ) ); + aFileView.GetParentURL( rURL ) ); } String SvtFileViewWindow_Impl::GetFolderTitle() const |