[Libreoffice-commits] libvisio.git: src/lib

[Libreoffice Gerrit user]

 src/lib/VDXParser.cpp     |    2 +-
 src/lib/VSDXMLHelper.cpp  |    2 +-
 src/lib/VSDXMetaData.cpp  |    2 +-
 src/lib/VSDXParser.cpp    |    2 +-
 src/lib/VSDXTheme.cpp     |    2 +-
 src/lib/VisioDocument.cpp |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit b480f8f038e2bc6556023b08d7ad4c617a11ed94
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Aug 1 10:04:24 2019 +0100
Commit:     David Tardon <dtardon at redhat.com>
CommitDate: Wed Aug 7 21:39:32 2019 +0200

    drop XML_PARSE_NOENT and default to not expanding entities
    
    Change-Id: I3c3f143b97df19227e274a1591471faa3dd3ed5f
    Reviewed-on: https://gerrit.libreoffice.org/76779
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/src/lib/VDXParser.cpp b/src/lib/VDXParser.cpp
index c305ab8..aecdf20 100644
--- a/src/lib/VDXParser.cpp
+++ b/src/lib/VDXParser.cpp
@@ -76,7 +76,7 @@ bool libvisio::VDXParser::processXmlDocument(librevenge::RVNGInputStream *input)
     return false;
 
   const std::shared_ptr<xmlTextReader> reader(
-    xmlReaderForStream(input, nullptr, nullptr, XML_PARSE_NOBLANKS|XML_PARSE_NOENT|XML_PARSE_NONET|XML_PARSE_RECOVER),
+    xmlReaderForStream(input, nullptr, nullptr, XML_PARSE_NOBLANKS|XML_PARSE_NONET|XML_PARSE_RECOVER),
     xmlFreeTextReader);
   if (!reader)
     return false;
diff --git a/src/lib/VSDXMLHelper.cpp b/src/lib/VSDXMLHelper.cpp
index 6f483b8..aa6a595 100644
--- a/src/lib/VSDXMLHelper.cpp
+++ b/src/lib/VSDXMLHelper.cpp
@@ -92,7 +92,7 @@ libvisio::VSDXRelationships::VSDXRelationships(librevenge::RVNGInputStream *inpu
   if (input)
   {
     const std::shared_ptr<xmlTextReader> reader(
-      xmlReaderForStream(input, nullptr, nullptr, XML_PARSE_NOBLANKS|XML_PARSE_NOENT|XML_PARSE_NONET|XML_PARSE_RECOVER),
+      xmlReaderForStream(input, nullptr, nullptr, XML_PARSE_NOBLANKS|XML_PARSE_NONET|XML_PARSE_RECOVER),
       xmlFreeTextReader);
     if (reader)
     {
diff --git a/src/lib/VSDXMetaData.cpp b/src/lib/VSDXMetaData.cpp
index 9b3d3cf..33a6679 100644
--- a/src/lib/VSDXMetaData.cpp
+++ b/src/lib/VSDXMetaData.cpp
@@ -121,7 +121,7 @@ bool libvisio::VSDXMetaData::parse(librevenge::RVNGInputStream *input)
   XMLErrorWatcher watcher;
 
   const std::shared_ptr<xmlTextReader> reader(
-    xmlReaderForStream(input, nullptr, nullptr, XML_PARSE_NOBLANKS|XML_PARSE_NOENT|XML_PARSE_NONET, &watcher),
+    xmlReaderForStream(input, nullptr, nullptr, XML_PARSE_NOBLANKS|XML_PARSE_NONET, &watcher),
     xmlFreeTextReader);
   if (!reader)
     return false;
diff --git a/src/lib/VSDXParser.cpp b/src/lib/VSDXParser.cpp
index 1bb46cf..a7f40db 100644
--- a/src/lib/VSDXParser.cpp
+++ b/src/lib/VSDXParser.cpp
@@ -305,7 +305,7 @@ void libvisio::VSDXParser::processXmlDocument(librevenge::RVNGInputStream *input
   XMLErrorWatcher watcher;
 
   const std::shared_ptr<xmlTextReader> reader(
-    xmlReaderForStream(input, nullptr, nullptr, XML_PARSE_NOBLANKS|XML_PARSE_NOENT|XML_PARSE_NONET, &watcher),
+    xmlReaderForStream(input, nullptr, nullptr, XML_PARSE_NOBLANKS|XML_PARSE_NONET, &watcher),
     xmlFreeTextReader);
   if (!reader)
     return;
diff --git a/src/lib/VSDXTheme.cpp b/src/lib/VSDXTheme.cpp
index 8db16e9..f2c5660 100644
--- a/src/lib/VSDXTheme.cpp
+++ b/src/lib/VSDXTheme.cpp
@@ -84,7 +84,7 @@ bool libvisio::VSDXTheme::parse(librevenge::RVNGInputStream *input)
     return false;
 
   const shared_ptr<xmlTextReader> reader(
-    xmlReaderForStream(input, nullptr, nullptr, XML_PARSE_NOBLANKS|XML_PARSE_NOENT|XML_PARSE_NONET),
+    xmlReaderForStream(input, nullptr, nullptr, XML_PARSE_NOBLANKS|XML_PARSE_NONET),
     xmlFreeTextReader);
   if (!reader)
     return false;
diff --git a/src/lib/VisioDocument.cpp b/src/lib/VisioDocument.cpp
index accb5d1..5b76be1 100644
--- a/src/lib/VisioDocument.cpp
+++ b/src/lib/VisioDocument.cpp
@@ -164,7 +164,7 @@ static bool isXmlVisioDocument(librevenge::RVNGInputStream *input) try
 {
   input->seek(0, librevenge::RVNG_SEEK_SET);
   const std::shared_ptr<xmlTextReader> reader(
-    libvisio::xmlReaderForStream(input, nullptr, nullptr, XML_PARSE_NOBLANKS|XML_PARSE_NOENT|XML_PARSE_NONET|XML_PARSE_RECOVER),
+    libvisio::xmlReaderForStream(input, nullptr, nullptr, XML_PARSE_NOBLANKS|XML_PARSE_NONET|XML_PARSE_RECOVER),
     xmlFreeTextReader);
   if (!reader)
     return false;