summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-12-09 07:00:10 +0000
committerOliver Bolte <obo@openoffice.org>2009-12-09 07:00:10 +0000
commitdf6c6fd40cd92185f4e421d5cf827166d3981f43 (patch)
treee2911a58eff90e506d7447a020ad1c52b25fd5df
parent236f74be7727f46bd245893c78ce02c0b766a28a (diff)
CWS-TOOLING: integrate CWS expat201
2009-11-16 09:53:37 +0100 cmc r277511 : #i106889# tweak api defs under windows 2009-11-13 12:06:34 +0100 cmc r277499 : #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 6080d4c5fd..6452d665dc 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 bc7af59f5e..d94d7f92ad 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>