diff options
| author | Hennes Rohling <hro@openoffice.org> | 2001-05-11 12:34:09 +0000 |
|---|---|---|
| committer | Hennes Rohling <hro@openoffice.org> | 2001-05-11 12:34:09 +0000 |
| commit | 192ef1d0d50bbbe3781e10cbb1d2ad34d8eeef82 (patch) | |
| tree | 792f0b798bbbe85ba6a9e80de293562dfeb1f79f /unotools | |
| parent | 3fe30dc014c8778b6a4cdd808894400dd26fb7ea (diff) | |
#TFU630#
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/ucbhelper/localfilehelper.cxx | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx index 5d9a07afc06f..820bc18aa9d1 100644 --- a/unotools/source/ucbhelper/localfilehelper.cxx +++ b/unotools/source/ucbhelper/localfilehelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: localfilehelper.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: mba $ $Date: 2000-12-18 08:20:10 $ + * last change: $Author: hro $ $Date: 2001-05-11 13:34:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,9 +92,14 @@ sal_Bool LocalFileHelper::ConvertSystemPathToURL( const String& rName, const Str ::ucb::ContentBroker* pBroker = ::ucb::ContentBroker::get(); if ( !pBroker ) { +#ifdef TF_FILEURL + FileBase::getFileURLFromSystemPath( rName, aRet ); +#else ::rtl::OUString aTmp; + FileBase::normalizePath( rName, aTmp ); FileBase::getFileURLFromNormalizedPath( aTmp, aRet ); +#endif } else { @@ -113,9 +118,13 @@ sal_Bool LocalFileHelper::ConvertURLToSystemPath( const String& rName, String& r ::ucb::ContentBroker* pBroker = ::ucb::ContentBroker::get(); if ( !pBroker ) { +#ifdef TF_FILEURL + FileBase::getSystemPathFromFileURL( rName, aRet ); +#else ::rtl::OUString aTmp; FileBase::getNormalizedPathFromFileURL( rName, aTmp ); FileBase::getSystemPathFromNormalizedPath( aTmp, aRet ); +#endif } else { @@ -135,9 +144,13 @@ sal_Bool LocalFileHelper::ConvertPhysicalNameToURL( const String& rName, String& ::ucb::ContentBroker* pBroker = ::ucb::ContentBroker::get(); if ( !pBroker ) { +#ifdef TF_FILEURL + FileBase::getFileURLFromSystemPath( rName, aRet ); +#else ::rtl::OUString aTmp; FileBase::normalizePath( rName, aTmp ); FileBase::getFileURLFromNormalizedPath( aTmp, aRet ); +#endif } else { @@ -158,10 +171,15 @@ sal_Bool LocalFileHelper::ConvertURLToPhysicalName( const String& rName, String& ::ucb::ContentBroker* pBroker = ::ucb::ContentBroker::get(); if ( !pBroker ) { +#ifdef TF_FILEURL + FileBase::getSystemPathFromFileURL( rName, aRet ); +#else ::rtl::OUString aTmp; FileBase::getNormalizedPathFromFileURL( rName, aTmp ); FileBase::getSystemPathFromNormalizedPath( aTmp, aRet ); + aRet = aTmp; +#endif } else { |