diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-08-19 10:43:19 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-08-19 10:48:42 +0200 |
| commit | 236714e86c1c517d84d38395efabaf6e3793d196 (patch) | |
| tree | 32c17d639ef464fba371d7d3a02afac18af8bfdb /connectivity | |
| parent | e87c08babed9e3ac34908771fc95cab5386f01a2 (diff) | |
Clean up remaining utl::LocalFileHelper::Convert...
together with 58d68a1bc9146334376206ae7ba8b1a6594a1040
"ConvertURLToSystemPath->getSystemPathFromFileURL" and
28f3464a571a23a2c16bd0980e9021b95d011511
"ConvertSystemPathToURL->getFileURLFromSystemPath," this replaces all those
Convert... functionality with direct calls to the corresponding osl::FileBase
functions.
Change-Id: I2876171cd337a5eb939d25d8cf1e0c1253ff73a7
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/dbase/DIndex.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index c904e1743d69..57ee565a3f4a 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -24,6 +24,7 @@ #include <comphelper/sequence.hxx> #include "dbase/DTable.hxx" #include "dbase/DIndexIter.hxx" +#include <osl/file.hxx> #include <tools/config.hxx> #include <connectivity/CommonTools.hxx> #include <com/sun/star/sdbc/XResultSetMetaData.hpp> @@ -31,7 +32,6 @@ #include <com/sun/star/sdbcx/XRowLocate.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <comphelper/extract.hxx> -#include <unotools/localfilehelper.hxx> #include <unotools/ucbhelper.hxx> #include <comphelper/types.hxx> #include <connectivity/dbexception.hxx> @@ -388,7 +388,7 @@ void ODbaseIndex::createINFEntry() ".inf"); OUString sPhysicalPath; - LocalFileHelper::ConvertURLToPhysicalName(sCfgFile, sPhysicalPath); + osl::FileBase::getSystemPathFromFileURL(sCfgFile, sPhysicalPath); Config aInfFile(sPhysicalPath); aInfFile.SetGroup(dBASE_III_GROUP); @@ -430,7 +430,8 @@ bool ODbaseIndex::DropImpl() m_pTable->getName() + ".inf"; OUString sPhysicalPath; - OSL_VERIFY_RES( LocalFileHelper::ConvertURLToPhysicalName(sCfgFile, sPhysicalPath), + OSL_VERIFY_RES( osl::FileBase::getSystemPathFromFileURL(sCfgFile, sPhysicalPath) + == osl::FileBase::E_None, "Can not convert Config Filename into Physical Name!"); Config aInfFile(sPhysicalPath); |