summaryrefslogtreecommitdiffstats
path: root/kxsldbg/kxsldbgpart
diff options
context:
space:
mode:
authorFrancois Andriot <[email protected]>2013-01-28 22:47:09 +0100
committerSlávek Banko <[email protected]>2013-01-28 22:47:09 +0100
commitc1c8adb7fbbbe7be18f5f6652357e1ad1d0aeddd (patch)
tree3eb0779ae1d5b88e589fb237b095687d9d769a19 /kxsldbg/kxsldbgpart
parent0f2cdace57937e42849449167138a1672ef1d867 (diff)
downloadtdewebdev-c1c8adb7fbbbe7be18f5f6652357e1ad1d0aeddd.tar.gz
tdewebdev-c1c8adb7fbbbe7be18f5f6652357e1ad1d0aeddd.zip
Fix docbook support with libxml2 >= 2.6.x
Diffstat (limited to 'kxsldbg/kxsldbgpart')
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
index d333c737..88f811b4 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
@@ -975,9 +975,13 @@ xsldbgLoadXmlData(void)
#endif
#ifdef LIBXML_DOCB_ENABLED
if (optionsGetIntOption(OPTIONS_DOCBOOK))
+# if LIBXML_VERSION >= 20600
+ doc = xmlParseFile((char *) optionsGetStringOption(OPTIONS_DATA_FILE_NAME));
+# else
doc = docbParseFile((char *)
optionsGetStringOption(OPTIONS_DATA_FILE_NAME),
NULL);
+# endif
else
#endif
@@ -1027,7 +1031,11 @@ xsldbgLoadXmlTemporary(const xmlChar * path)
#endif
#ifdef LIBXML_DOCB_ENABLED
if (optionsGetIntOption(OPTIONS_DOCBOOK))
+# if LIBXML_VERSION >= 20600
+ doc = xmlParseFile((char *) path);
+# else
doc = docbParseFile((char *) path, NULL);
+# endif
else
#endif
doc = xmlSAXParseFile(&mySAXhdlr, (char *) path, 0);