[Libreoffice-commits] core.git: Branch 'feature/cib_contract57' - sal/osl

[Katarina Behrens]

 sal/osl/all/log.cxx |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 7358ba8f65251f117c1be34e855a33674f403d5e
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Tue Jan 17 09:56:52 2017 +0100

    This code wouldn't otherwise build on 5.0.7 at Linux
    
    Change-Id: I106c1a286ff5ad710a54cabc873cc5356f0a3123

diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index 777d22c..e7b2283 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -25,6 +25,7 @@
 #include "osl/thread.hxx"
 #include "osl/process.h"
 #include "rtl/string.h"
+#include "rtl/ustring.hxx"
 #include "sal/detail/log.h"
 #include "sal/log.hxx"
 #include "sal/types.h"
@@ -103,12 +104,12 @@ char const * getEnvironmentVariable_(const char* env) {
 }
 
 bool getValueFromLoggingIniFile(const char* key, char* value) {
-    OUString programDirectoryURL;
-    OUString programDirectoryPath;
+    rtl::OUString programDirectoryURL;
+    rtl::OUString programDirectoryPath;
     osl_getProcessWorkingDir(&(programDirectoryURL.pData));
     osl_getSystemPathFromFileURL(programDirectoryURL.pData, &programDirectoryPath.pData);
-    OUString aLogFile(programDirectoryPath + "/" + "logging.ini");
-    std::ifstream logFileStream(OUStringToOString( aLogFile, RTL_TEXTENCODING_ASCII_US).getStr());
+    rtl::OUString aLogFile(programDirectoryPath + "/" + "logging.ini");
+    std::ifstream logFileStream(rtl::OUStringToOString( aLogFile, RTL_TEXTENCODING_ASCII_US).getStr());
     if (!logFileStream.good())
         return false;