diff options
Diffstat (limited to 'padmin/source')
| -rw-r--r-- | padmin/source/helper.cxx | 8 | ||||
| -rw-r--r-- | padmin/source/newppdlg.cxx | 10 |
2 files changed, 7 insertions, 11 deletions
diff --git a/padmin/source/helper.cxx b/padmin/source/helper.cxx index 24dc29f95d12..38e9a53679c5 100644 --- a/padmin/source/helper.cxx +++ b/padmin/source/helper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: helper.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: pl $ $Date: 2001-05-08 11:56:35 $ + * last change: $Author: rt $ $Date: 2001-05-22 14:59:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -119,15 +119,13 @@ void padmin::FindFiles( const String& rDirectory, ::std::list< String >& rResult rResult.clear(); OUString aDirPath; - ::osl::FileBase::normalizePath( rDirectory, aDirPath ); + ::osl::FileBase::getFileURLFromSystemPath( rDirectory, aDirPath ); Directory aDir( aDirPath ); aDir.open(); DirectoryItem aItem; while( aDir.getNextItem( aItem ) == FileBase::E_None ) { FileStatus aStatus( FileStatusMask_FileName | - FileStatusMask_FilePath | - FileStatusMask_NativePath | FileStatusMask_Type ); if( aItem.getFileStatus( aStatus ) == FileBase::E_None && diff --git a/padmin/source/newppdlg.cxx b/padmin/source/newppdlg.cxx index 31ff9ce51ad3..ff6c71e97034 100644 --- a/padmin/source/newppdlg.cxx +++ b/padmin/source/newppdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: newppdlg.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: pl $ $Date: 2001-05-08 11:56:35 $ + * last change: $Author: rt $ $Date: 2001-05-22 14:59:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -237,16 +237,14 @@ IMPL_LINK( PPDImportDialog, ClickBtnHdl, PushButton*, pButton ) INetURLObject aFile( *(String*)m_aDriverLB.GetEntryData( m_aDriverLB.GetSelectEntryPos( i ) ), INET_PROT_FILE, INetURLObject::ENCODE_ALL ); - OUString aFromUni; - FileBase::normalizePath( aFile.PathToFileName(), aFromUni ); + OUString aFromUni( aFile.GetMainURL() ); do { INetURLObject aToFile( *writeDir, INET_PROT_FILE, INetURLObject::ENCODE_ALL ); aToFile.Append( aFile.GetName() ); aToFile.setExtension( String::CreateFromAscii( "PPD" ) ); - OUString aToUni; - FileBase::normalizePath( aToFile.PathToFileName(), aToUni ); + OUString aToUni( aToFile.GetMainURL() ); if( ! File::copy( aFromUni, aToUni ) ) break; ++writeDir; |