diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2015-11-27 11:41:48 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-11-30 14:33:43 +0100 |
| commit | 6f391e7b80c5d76bc3888c9b21ca435e8263af60 (patch) | |
| tree | ef2f8f3ad6e4a8a14e104932ff2ecfb8030fda5a | |
| parent | e3a903fdedb6daa43decafb197029a7423fb3af8 (diff) | |
Revert+RevertRevert "write a log file about OpenGL driver"
Revert "write a log file about OpenGL driver"
Caused enduring build breakage on Windows for gallery contents.
This reverts commit c0772f7037794e1cea578a8833c79730fbe448c2.
(cherry picked from commit 2ebca292f96494a13a0d0baa8b19dd9010616abe)
Revert "Revert "write a log file about OpenGL driver""
This reverts commit 2ebca292f96494a13a0d0baa8b19dd9010616abe.
The build breakage in gengal was caused by the global variable
aCacheFolder, which is initialized by a call to
rtl::Bootstrap::expandMacros(), which initializes the global
FundamentalIni object before tools::extendApplicationEnvironment() gets
a chance to set URE_BOOTSTRAP, so FundamentalIni is empty.
Change-Id: I10d8652dab15ee6924ff4ceff17000963975e30f
Reviewed-on: https://gerrit.libreoffice.org/20232
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 47eaebc3b4234b7bcfa790fc2eb584044f1ed8f4)
| -rw-r--r-- | vcl/opengl/win/WinDeviceInfo.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx index 7d1c837d5a1f..99bc7a2b206b 100644 --- a/vcl/opengl/win/WinDeviceInfo.cxx +++ b/vcl/opengl/win/WinDeviceInfo.cxx @@ -554,8 +554,6 @@ OUString getCacheFolder() return url; } -OUString aCacheFolder = getCacheFolder(); - void writeToLog(SvStream& rStrm, const char* pKey, const OUString rVal) { rStrm.WriteCharPtr(pKey); @@ -577,6 +575,8 @@ bool WinOpenGLDeviceInfo::isDeviceBlocked() SAL_INFO("vcl.opengl", maDeviceKey); SAL_INFO("vcl.opengl", maDeviceString); + OUString aCacheFolder = getCacheFolder(); + OUString aCacheFile(aCacheFolder + "/opengl_device.log"); SvFileStream aOpenGLLogFile(aCacheFile, StreamMode::WRITE); |