vcl/opengl/win/WinDeviceInfo.cxx | 36 ------------------------------------
1 file changed, 36 deletions(-)
New commits:
commit 2ebca292f96494a13a0d0baa8b19dd9010616abe
Author: Thorsten Behrens <thorsten.behr...@cib.de>
Date: Fri Nov 27 11:41:48 2015 +0100
Revert "write a log file about OpenGL driver"
Caused enduring build breakage on Windows for gallery contents.
This reverts commit c0772f7037794e1cea578a8833c79730fbe448c2.
Change-Id: I4cd0d51b5dc88426cfef458e1b889c9d8abf9932
diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index 7d1c837..5fa5aac 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -542,30 +542,6 @@ bool WinOpenGLDeviceInfo::FindBlocklistedDeviceInList()
return match;
}
-namespace {
-
-OUString getCacheFolder()
-{
- OUString url("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/"
SAL_CONFIGFILE("bootstrap") ":UserInstallation}/cache/");
- rtl::Bootstrap::expandMacros(url);
-
- osl::Directory::create(url);
-
- return url;
-}
-
-OUString aCacheFolder = getCacheFolder();
-
-void writeToLog(SvStream& rStrm, const char* pKey, const OUString rVal)
-{
- rStrm.WriteCharPtr(pKey);
- rStrm.WriteCharPtr(": ");
- rStrm.WriteOString(OUStringToOString(rVal, RTL_TEXTENCODING_UTF8));
- rStrm.WriteChar('\n');
-}
-
-}
-
bool WinOpenGLDeviceInfo::isDeviceBlocked()
{
SAL_INFO("vcl.opengl", maDriverVersion);
@@ -577,18 +553,6 @@ bool WinOpenGLDeviceInfo::isDeviceBlocked()
SAL_INFO("vcl.opengl", maDeviceKey);
SAL_INFO("vcl.opengl", maDeviceString);
- OUString aCacheFile(aCacheFolder + "/opengl_device.log");
- SvFileStream aOpenGLLogFile(aCacheFile, StreamMode::WRITE);
-
- writeToLog(aOpenGLLogFile, "DriverVersion", maDriverVersion);
- writeToLog(aOpenGLLogFile, "DriverDate", maDriverDate);
- writeToLog(aOpenGLLogFile, "DeviceID", maDeviceID);
- writeToLog(aOpenGLLogFile, "AdapterVendorID", maAdapterVendorID);
- writeToLog(aOpenGLLogFile, "AdapterDeviceID", maAdapterDeviceID);
- writeToLog(aOpenGLLogFile, "AdapterSubsysID", maAdapterSubsysID);
- writeToLog(aOpenGLLogFile, "DeviceKey", maDeviceKey);
- writeToLog(aOpenGLLogFile, "DeviceString", maDeviceString);
-
// Check if the device is blocked from the downloaded blocklist. If not,
check
// the static list after that. This order is used so that we can later
escape
// out of static blocks (i.e. if we were wrong or something was patched, we
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
