summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <cmc@openoffice.org>2009-11-13 11:06:34 +0000
committerCaolán McNamara <cmc@openoffice.org>2009-11-13 11:06:34 +0000
commit4903e0098d5328358cbe7b5c08f4b36209b9ce5d (patch)
tree4323d89c80234dfa1371162338d2af8fcba9297f
parent875ac20478f16e5107acb222c0b851b99d2e0f27 (diff)
#i106889# upgrade expat to 2.0.1
-rw-r--r--shell/inc/internal/xml_parser.hxx4
-rw-r--r--xmlhelp/source/treeview/tvread.cxx4
2 files changed, 0 insertions, 8 deletions
diff --git a/shell/inc/internal/xml_parser.hxx b/shell/inc/internal/xml_parser.hxx
index 5c52fcb7cd13..26eaf30dcf51 100644
--- a/shell/inc/internal/xml_parser.hxx
+++ b/shell/inc/internal/xml_parser.hxx
@@ -31,11 +31,7 @@
#ifndef _XML_PARSER_HXX_
#define _XML_PARSER_HXX_
-#ifdef SYSTEM_EXPAT
#include <expat.h>
-#else
-#include <external/expat/xmlparse.h>
-#endif
#include <stdexcept>
//-----------------------------------------------------
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index 62ec993e485d..d07fb75aaeb5 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -38,11 +38,7 @@
#include <vos/diagnose.hxx>
#endif
#include "tvread.hxx"
-#ifdef SYSTEM_EXPAT
#include <expat.h>
-#else
-#include <expat/xmlparse.h>
-#endif
#include <osl/file.hxx>
#include <unotools/configmgr.hxx>
#include <com/sun/star/frame/XConfigManager.hpp>