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

#92406# Remove TF_FILEURL

Browse source
This commit is contained in:
Hennes Rohling 2001-09-25 14:04:11 +00:00
parent d869da74ab
commit 77cadf9b60
1 changed files with 2 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
unotools/source/ucbhelper/tempfile.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: tempfile.cxx,v $
*
* $Revision: 1.11 $
* $Revision: 1.12 $
*
* last change: $Author: hro $ $Date: 2001-05-11 13:46:48 $
* last change: $Author: hro $ $Date: 2001-09-25 15:04:11 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -108,15 +108,9 @@ String ConstructTempDir_Impl( const String* pParent )
// test for valid filename
rtl::OUString aRet;
#ifdef TF_FILEURL
::osl::FileBase::getFileURLFromSystemPath(
::ucb::getSystemPathFromFileURL( xManager, aTmp ),
aRet );
#else
::osl::FileBase::normalizePath(
::ucb::getSystemPathFromFileURL( xManager, aTmp ),
aRet );
#endif
if ( aRet.getLength() )
{
::osl::DirectoryItem aItem;
@ -225,11 +219,7 @@ String TempFile::CreateTempName( const String* pParent )
// convert to file URL
rtl::OUString aTmp;
if ( aName.Len() )
#ifdef TF_FILEURL
FileBase::getSystemPathFromFileURL( aName, aTmp );
#else
FileBase::getSystemPathFromNormalizedPath( aName, aTmp );
#endif
return aTmp;
}
@ -321,11 +311,7 @@ sal_Bool TempFile::IsValid() const
String TempFile::GetFileName() const
{
rtl::OUString aTmp;
#ifdef TF_FILEURL
FileBase::getSystemPathFromFileURL( pImp->aName, aTmp );
#else
FileBase::getSystemPathFromNormalizedPath( pImp->aName, aTmp );
#endif
return aTmp;
}
@ -370,11 +356,7 @@ String TempFile::SetTempNameBaseDirectory( const String &rBaseName )
}
rtl::OUString aTmp;
#ifdef TF_FILEURL
FileBase::getSystemPathFromFileURL( aTempNameBase_Impl, aTmp );
#else
FileBase::getSystemPathFromNormalizedPath( aTempNameBase_Impl, aTmp );
#endif
return aTmp;
}
@ -384,11 +366,7 @@ String TempFile::GetTempNameBaseDirectory()
return String();
rtl::OUString aTmp;
#ifdef TF_FILEURL
FileBase::getSystemPathFromFileURL( aTempNameBase_Impl, aTmp );
#else
FileBase::getSystemPathFromNormalizedPath( aTempNameBase_Impl, aTmp );
#endif
return aTmp;
}