summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazunov <vg@openoffice.org>2009-12-11 17:45:42 +0100
committerVladimir Glazunov <vg@openoffice.org>2009-12-11 17:45:42 +0100
commitde3608d77ae36fbab64e7ba6fdb7fdcbb4767134 (patch)
treeef65bab912c977d47628a1b0df161c86aef4814a
parent10b3806edf987f4a642c9f0efd1373e699dbe42c (diff)
parent2f144f86f48f4bbe9b309e35ccac8810467c4416 (diff)
CWS-TOOLING: integrate CWS expat201_DEV300
-rw-r--r--sax/source/expatwrap/sax_expat.cxx4
-rw-r--r--sax/source/fastparser/fastparser.hxx4
-rw-r--r--transex3/inc/xmlparse.hxx4
-rw-r--r--transex3/source/help/HelpLinker.cxx4
4 files changed, 0 insertions, 16 deletions
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index e1f5161b7e3a..b1726f750127 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -46,11 +46,7 @@
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
-#ifdef SYSTEM_EXPAT
#include <expat.h>
-#else
-#include "expat/xmlparse.h"
-#endif
using namespace ::rtl;
using namespace ::std;
diff --git a/sax/source/fastparser/fastparser.hxx b/sax/source/fastparser/fastparser.hxx
index 07cb6afac77d..3e6220a0c782 100644
--- a/sax/source/fastparser/fastparser.hxx
+++ b/sax/source/fastparser/fastparser.hxx
@@ -42,11 +42,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase2.hxx>
-#ifdef SYSTEM_EXPAT
#include <expat.h>
-#else
-#include "expat/xmlparse.h"
-#endif
#include "xml2utf.hxx"
#include <sax/fastattribs.hxx>
diff --git a/transex3/inc/xmlparse.hxx b/transex3/inc/xmlparse.hxx
index a497355d6201..18b047ef75c1 100644
--- a/transex3/inc/xmlparse.hxx
+++ b/transex3/inc/xmlparse.hxx
@@ -32,11 +32,7 @@
#define BOOTSTRP_XMLPARSE_HXX
#include <signal.h>
-#ifdef SYSTEM_EXPAT
#include <expat.h>
-#else
-#include <external/expat/xmlparse.h>
-#endif
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
#include "tools/string.hxx"
diff --git a/transex3/source/help/HelpLinker.cxx b/transex3/source/help/HelpLinker.cxx
index 19b9ead8521e..47d9181a75a0 100644
--- a/transex3/source/help/HelpLinker.cxx
+++ b/transex3/source/help/HelpLinker.cxx
@@ -45,11 +45,7 @@
#include <osl/time.h>
#include <rtl/bootstrap.hxx>
-#ifdef SYSTEM_EXPAT
#include <expat.h>
-#else
-#include <expat/xmlparse.h>
-#endif
#define DBHELP_ONLY