tools/source/fsys/tempfile.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f965bc80986ecf8b5edd153cc8b072eddf916a03
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Tue Mar 12 16:27:38 2013 +0100
fix merge conflict
Change-Id: I015a0065a88022ad4ff93711f1faae2874ccf506
diff --git a/tools/source/fsys/tempfile.cxx b/tools/source/fsys/tempfile.cxx
index 9308d7a..e771849 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
