[Libreoffice-commits] core.git: vcl/opengl

Stephan Bergmann sbergman at redhat.com
Wed Feb 24 15:29:11 UTC 2016


 vcl/opengl/win/WinDeviceInfo.cxx |   43 ---------------------------------------
 1 file changed, 43 deletions(-)

New commits:
commit cef666d8c376d06b4a32566f83496124472b2201
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Feb 24 16:28:06 2016 +0100

    -Werror,-Wunused-function
    
    since ce81a477d228277f44e96356e85d92467eb7a0b9 "tdf#97458 - remove unused intel
    opengl driver version special-casing."
    
    Change-Id: I4d1e804bef054db5a999b23c35c308e1a0c5ece3

diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index 161d29a..4f33453 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -27,49 +27,6 @@ std::vector<wgl::DriverInfo> WinOpenGLDeviceInfo::maDriverInfo;
 
 namespace {
 
-
-void GetDLLVersion(const sal_Unicode* aDLLPath, OUString& aVersion)
-{
-    DWORD versInfoSize, vers[4] = {0};
-    // version info not available case
-    aVersion = OUString("0.0.0.0");
-    versInfoSize = GetFileVersionInfoSizeW(aDLLPath, nullptr);
-    std::vector<char> versionInfo(512, 0);
-
-    if (versInfoSize == 0)
-    {
-        return;
-    }
-    versionInfo.resize(uint32_t(versInfoSize));
-
-    if (!GetFileVersionInfoW(aDLLPath, 0, versInfoSize,
-                LPBYTE(&versionInfo[0])))
-    {
-        return;
-    }
-
-    UINT len = 0;
-    VS_FIXEDFILEINFO *fileInfo = nullptr;
-    if (!VerQueryValue(LPBYTE(&versionInfo[0]), TEXT("\\"),
-                (LPVOID *)&fileInfo, &len) ||
-            len == 0 ||
-            fileInfo == nullptr)
-    {
-        return;
-    }
-
-    DWORD fileVersMS = fileInfo->dwFileVersionMS;
-    DWORD fileVersLS = fileInfo->dwFileVersionLS;
-
-    vers[0] = HIWORD(fileVersMS);
-    vers[1] = LOWORD(fileVersMS);
-    vers[2] = HIWORD(fileVersLS);
-    vers[3] = LOWORD(fileVersLS);
-
-    aVersion = OUString::number(vers[0]) + "." + OUString::number(vers[1])
-        + "." + OUString::number(vers[2]) + "." + OUString::number(vers[3]);
-}
-
 /*
  * Compute the length of an array with constant length.  (Use of this method
  * with a non-array pointer will not compile.)


More information about the Libreoffice-commits mailing list