vcl/opengl/win/blocklist_parser.cxx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
New commits: commit 0e717b13837e4494fb3be72920b50153a7b06613 Author: Markus Mohrhard <[email protected]> Date: Fri Jun 5 04:39:29 2015 +0200 fix a few bugs in blacklist parser Change-Id: Iaeaa568c24d6814bb696d040bef02470bd46e8e1 Reviewed-on: https://gerrit.libreoffice.org/16334 Tested-by: Jenkins <[email protected]> Reviewed-by: Markus Mohrhard <[email protected]> diff --git a/vcl/opengl/win/blocklist_parser.cxx b/vcl/opengl/win/blocklist_parser.cxx index 83bf490..ef4771a 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)); } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
