diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-06-05 04:39:29 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-06-17 12:48:14 +0000 |
| commit | 0e717b13837e4494fb3be72920b50153a7b06613 (patch) | |
| tree | 8fde52e7b70654b2c2dda195e1f2d49d93907ce8 /vcl/opengl | |
| parent | 60e2be1b664b290df891fcef1e7f29773f8f8ee6 (diff) | |
fix a few bugs in blacklist parser
Change-Id: Iaeaa568c24d6814bb696d040bef02470bd46e8e1
Reviewed-on: https://gerrit.libreoffice.org/16334
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'vcl/opengl')
| -rw-r--r-- | vcl/opengl/win/blocklist_parser.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/vcl/opengl/win/blocklist_parser.cxx b/vcl/opengl/win/blocklist_parser.cxx index 83bf490f4d95..ef4771ab37f9 100644 --- a/vcl/opengl/win/blocklist_parser.cxx +++ b/vcl/opengl/win/blocklist_parser.cxx @@ -122,6 +122,10 @@ void WinBlocklistParser::handleDevice(wgl::DriverInfo& rDriver, xmlreader::XmlRe { rDriver.mbWhitelisted = true; } + else if (meBlockType == BlockType::BLACKLIST) + { + rDriver.mbWhitelisted = false; + } else if (meBlockType == BlockType::UNKNOWN) { throw InvalidFileException(); @@ -173,7 +177,8 @@ void WinBlocklistParser::handleDevice(wgl::DriverInfo& rDriver, xmlreader::XmlRe } else { - SAL_WARN("vcl.opengl.win", "unsupported attribute"); + OString aAttrName(name.begin, name.length); + SAL_WARN("vcl.opengl.win", "unsupported attribute: " << aAttrName); } } @@ -185,7 +190,7 @@ void WinBlocklistParser::handleDevice(wgl::DriverInfo& rDriver, xmlreader::XmlRe int nsId; xmlreader::XmlReader::Result res = rReader.nextItem( - xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + xmlreader::XmlReader::TEXT_NORMALIZED, &name, &nsId); if (res == xmlreader::XmlReader::RESULT_BEGIN) { @@ -203,6 +208,7 @@ void WinBlocklistParser::handleDevice(wgl::DriverInfo& rDriver, xmlreader::XmlRe if (!bSuccess || !name.equals("id")) throw InvalidFileException(); + name = rReader.getAttributeValue(false); OString aDeviceId(name.begin, name.length); rDriver.maDevices.push_back(OStringToOUString(aDeviceId, RTL_TEXTENCODING_UTF8)); } |