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

#80204# Test first if file names are already file URLs

Browse source
This commit is contained in:
Andreas Bregas 2000-12-13 15:30:21 +00:00
parent 2bc27b1e6e
commit cd8e0794ba
1 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
basic/source/runtime/methods.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: methods.cxx,v $
*
* $Revision: 1.12 $
* $Revision: 1.13 $
*
* last change: $Author: ab $ $Date: 2000-12-08 16:35:54 $
* last change: $Author: ab $ $Date: 2000-12-13 16:30:21 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -241,12 +241,20 @@ static long GetDayDiff( const Date& rDate )
// according to the setting done by ChDir/ChDrive
String getFullPath( const String& aRelPath )
{
//return aRelPath;
String aUNCStr = getFullPathUNC( aRelPath );
OUString aFileURL;
FileBase::RC nRet = File::getFileURLFromNormalizedPath( aUNCStr, aFileURL );
// #80204 Try first if it already is a file URL
INetURLObject aURLObj( aRelPath );
if( aURLObj.GetProtocol() == INET_PROT_FILE )
{
aFileURL = aURLObj.GetMainURL();
}
else
{
OUString aUNCStr;
FileBase::RC nRet = File::normalizePath( aRelPath, aUNCStr );
nRet = File::getFileURLFromNormalizedPath( aUNCStr, aFileURL );
}
return aFileURL;
}
@ -255,13 +263,24 @@ String getFullPath( const String& aRelPath )
// according to the setting done by ChDir/ChDrive
String getFullPathUNC( const String& aRelPath )
{
OUString aNormPath;
// TODO: Use CurDir to build full path
// First step: Return given path unchanged
//static inline RC getAbsolutePath( const ::rtl::OUString& strDirBase, const ::rtl::OUString& strRelative, ::rtl::OUString& strAbsolute )
OUString aNormPath;
// #80204 Try first if it already is a file URL
INetURLObject aURLObj( aRelPath );
if( aURLObj.GetProtocol() == INET_PROT_FILE )
{
OUString aFileURL = aURLObj.GetMainURL();
FileBase::RC nRet = File::getNormalizedPathFromFileURL( aFileURL, aNormPath );
}
else
{
FileBase::RC nRet = File::normalizePath( aRelPath, aNormPath );
}
return aNormPath;
}