diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-03-23 20:24:55 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-03-23 23:02:56 +0100 |
| commit | 1a777d4387589d36918d4f71cd7413fc79d518c4 (patch) | |
| tree | 78f21e0202681d7ff9ef37dd9f61a6548a0a5d74 /tools | |
| parent | 99120b7ddc8ede9108d4a45a5605ac191fe22bc9 (diff) | |
tools: move some code around so there is less of it
Change-Id: Ib93ce32cbdceae959989f9575899be0519db8377
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/fsys/dirent.cxx | 8 | ||||
| -rw-r--r-- | tools/source/fsys/tempfile.cxx | 16 |
2 files changed, 7 insertions, 17 deletions
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx index 624cac03650c..5c392e0690e9 100644 --- a/tools/source/fsys/dirent.cxx +++ b/tools/source/fsys/dirent.cxx @@ -57,7 +57,13 @@ using namespace osl; using ::rtl::OUString; -extern rtl::OUString GetSystemTempDirPath_Impl(); +static rtl::OUString GetSystemTempDirPath_Impl() +{ + rtl::OUString aTmpURL, aPath; + osl::FileBase::getTempDirURL( aTmpURL ); + osl::FileBase::getSystemPathFromFileURL( aTmpURL, aPath ); + return aPath; +} int Sys2SolarError_Impl( int nSysErr ) { diff --git a/tools/source/fsys/tempfile.cxx b/tools/source/fsys/tempfile.cxx index e771849ede08..bb68187cf563 100644 --- a/tools/source/fsys/tempfile.cxx +++ b/tools/source/fsys/tempfile.cxx @@ -29,10 +29,6 @@ #include <stdio.h> -#ifdef UNX -#define _MAX_PATH 260 -#endif - using namespace osl; namespace { struct TempNameBase_Impl : public rtl::Static< ::rtl::OUString, TempNameBase_Impl > {}; } @@ -42,18 +38,6 @@ struct TempFile_Impl String aName; }; -extern rtl::OUString GetSystemTempDirPath_Impl(); - -rtl::OUString GetSystemTempDirPath_Impl() -{ - rtl::OUString aTmpURL, aPath; - osl::FileBase::getTempDirURL( aTmpURL ); - osl::FileBase::getSystemPathFromFileURL( aTmpURL, aPath ); - return aPath; -} - -#define TMPNAME_SIZE ( 1 + 5 + 5 + 4 + 1 ) - OUString ConstructTempDir_Impl() { // use system directory |