diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-06-02 15:21:39 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-06-02 15:25:03 +0300 |
| commit | 44e89fa6151434be24dca38c32b8cb952455f372 (patch) | |
| tree | 7d26288f79ace0ee61d6c3870c02f812d6b2982a /vcl/opengl | |
| parent | adf7df9c021bd0291eb80d1f9e6596d5b9b090c8 (diff) | |
Accept also hex vendor id in hex in opengl_blacklist_windows.xml
(And not just names from the hardcoded list.) Surely we want it to be
possible to add a blacklist entry for a hitherto unhandled vendor to
the file at a user site without having to modify the parsing code and
rebuilding LO.
Change-Id: I01ca45cb91df06e1634a565b3e469fb85fe4e116
Diffstat (limited to 'vcl/opengl')
| -rw-r--r-- | vcl/opengl/win/blocklist_parser.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vcl/opengl/win/blocklist_parser.cxx b/vcl/opengl/win/blocklist_parser.cxx index 7c4a526f57ba..eb140a1c47d7 100644 --- a/vcl/opengl/win/blocklist_parser.cxx +++ b/vcl/opengl/win/blocklist_parser.cxx @@ -131,8 +131,12 @@ OUString getVendor(const OString& rString) { return "0x1414"; } - - throw InvalidFileException(); + else + { + // Allow having simply the hex number as such there, too. After all, it's hex numbers that + // are output to opengl_device.log. + return OStringToOUString(rString, RTL_TEXTENCODING_UTF8); + } } uint64_t getVersion(const OString& rString) |