[Libreoffice-commits] core.git: include/editeng svx/Library_svxcore.mk

Stephan Bergmann sbergman at redhat.com
Mon Nov 24 01:52:15 PST 2014


 include/editeng/editobj.hxx |    4 +---
 svx/Library_svxcore.mk      |    1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit e548613a5bf49de2fce6cd9935cbbdf72a96dd2e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Nov 24 10:51:44 2014 +0100

    Do not depend on libxml include in widely included file
    
    ...and hope xmTextWriterPtr expanding to struct _xmlTextWriter * is a stable feature
    of the libxml2 API
    
    Change-Id: Ic5076df5a8b33f71c605b3aef737a99ea96b1753

diff --git a/include/editeng/editobj.hxx b/include/editeng/editobj.hxx
index 6226268..62263f1 100644
--- a/include/editeng/editobj.hxx
+++ b/include/editeng/editobj.hxx
@@ -33,8 +33,6 @@
 
 #include <vector>
 
-#include <libxml/xmlwriter.h>
-
 class SfxItemPool;
 class SfxStyleSheetPool;
 class SvxFieldItem;
@@ -148,7 +146,7 @@ public:
 #if DEBUG_EDIT_ENGINE
     void Dump() const;
 #endif
-    void dumpAsXml(xmlTextWriterPtr pWriter) const;
+    void dumpAsXml(struct _xmlTextWriter * pWriter) const;
 };
 
 #endif // INCLUDED_EDITENG_EDITOBJ_HXX
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 39d6be5..420a6b8 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -87,7 +87,6 @@ $(eval $(call gb_Library_use_externals,svxcore,\
 	icu_headers \
 	mesa_headers \
 	glew \
-	libxml2 \
 ))
 
 ifeq ($(OS),MACOSX)


More information about the Libreoffice-commits mailing list