diff options
author | Hennes Rohling <hro@openoffice.org> | 2001-09-25 14:04:11 +0000 |
---|---|---|
committer | Hennes Rohling <hro@openoffice.org> | 2001-09-25 14:04:11 +0000 |
commit | 77cadf9b60350ff8ac9a07a427e6f88b7865a220 (patch) | |
tree | 07f4c3edea53765d9c41cdb73c1c697ae2aa1040 /unotools/source | |
parent | d869da74ab395253a59a83d2c74631351e1fcfaa (diff) |
#92406# Remove TF_FILEURL
Diffstat (limited to 'unotools/source')
-rw-r--r-- | unotools/source/ucbhelper/tempfile.cxx | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx index 97b62826dffe..7785f9083584 100644 --- a/unotools/source/ucbhelper/tempfile.cxx +++ b/unotools/source/ucbhelper/tempfile.cxx @@ -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; } |