diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-12 16:27:38 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-12 16:27:38 +0100 |
| commit | f965bc80986ecf8b5edd153cc8b072eddf916a03 (patch) | |
| tree | 2e5ad3615bd19263b1966ab30dc5ed4644f95697 /tools/source | |
| parent | a548924aece3dc99b2aa36b5c9b0fa52de9951ae (diff) | |
fix merge conflict
Change-Id: I015a0065a88022ad4ff93711f1faae2874ccf506
Diffstat (limited to 'tools/source')
| -rw-r--r-- | tools/source/fsys/tempfile.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/source/fsys/tempfile.cxx b/tools/source/fsys/tempfile.cxx index 9308d7a26846..e771849ede08 100644 --- a/tools/source/fsys/tempfile.cxx +++ b/tools/source/fsys/tempfile.cxx @@ -59,7 +59,7 @@ OUString ConstructTempDir_Impl() // use system directory ::rtl::OUString& rTempNameBase_Impl = TempNameBase_Impl::get(); if ( rTempNameBase_Impl.isEmpty() ) - rTempNameBase_Impl = GetSystemTempDirPath_Impl(); + osl::FileBase::getTempDirURL( rTempNameBase_Impl ); OUString aName = rTempNameBase_Impl; // Make sure that directory ends with a separator |