Kaydet (Commit) 6f391e7b authored tarafından Thorsten Behrens's avatar Thorsten Behrens Kaydeden (comit) Michael Stahl

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 c0772f70.
(cherry picked from commit 2ebca292)

Revert "Revert "write a log file about OpenGL driver""

This reverts commit 2ebca292.

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/20232Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 47eaebc3)
üst e3a903fd
...@@ -554,8 +554,6 @@ OUString getCacheFolder() ...@@ -554,8 +554,6 @@ OUString getCacheFolder()
return url; return url;
} }
OUString aCacheFolder = getCacheFolder();
void writeToLog(SvStream& rStrm, const char* pKey, const OUString rVal) void writeToLog(SvStream& rStrm, const char* pKey, const OUString rVal)
{ {
rStrm.WriteCharPtr(pKey); rStrm.WriteCharPtr(pKey);
...@@ -577,6 +575,8 @@ bool WinOpenGLDeviceInfo::isDeviceBlocked() ...@@ -577,6 +575,8 @@ bool WinOpenGLDeviceInfo::isDeviceBlocked()
SAL_INFO("vcl.opengl", maDeviceKey); SAL_INFO("vcl.opengl", maDeviceKey);
SAL_INFO("vcl.opengl", maDeviceString); SAL_INFO("vcl.opengl", maDeviceString);
OUString aCacheFolder = getCacheFolder();
OUString aCacheFile(aCacheFolder + "/opengl_device.log"); OUString aCacheFile(aCacheFolder + "/opengl_device.log");
SvFileStream aOpenGLLogFile(aCacheFile, StreamMode::WRITE); SvFileStream aOpenGLLogFile(aCacheFile, StreamMode::WRITE);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment