sax: move xml2utf.cxx to libsax to prevent duplicate linkage warnings

4 files changed, 8 insertions, 13 deletions

diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk
index 0e35acd03e9c..f1104cbc6825 100644
--- a/sax/Library_expwrap.mk
+++ b/sax/Library_expwrap.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Library_add_linked_libs,expwrap,\
 	cppu \
 	cppuhelper \
 	sal \
+	sax \
     $(gb_STDLIBS) \
 ))
 
@@ -53,7 +54,6 @@ $(eval $(call gb_Library_add_exception_objects,expwrap,\
 	sax/source/expatwrap/attrlistimpl \
 	sax/source/expatwrap/sax_expat \
 	sax/source/expatwrap/saxwriter \
-	sax/source/expatwrap/xml2utf \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk
index 58886d6e5b60..b3557bd1192a 100644
--- a/sax/Library_fastsax.mk
+++ b/sax/Library_fastsax.mk
@@ -52,18 +52,9 @@ $(eval $(call gb_Library_use_external,fastsax,zlib))
 
 $(eval $(call gb_Library_use_external,fastsax,expat_utf8))
 
-# re-uses xml2utf object from sax.uno lib (see below)
 $(eval $(call gb_Library_add_exception_objects,fastsax,\
 	sax/source/fastparser/facreg \
 	sax/source/fastparser/fastparser \
-	sax/source/expatwrap/xml2utf \
 ))
 
-# mba: currently it's unclear whether xml2utf needs to be compiled with the
-# same compiler settings as in the sax.uno lib; in case not, we have to use 
-# a custom target
-#$(eval $(call gb_Library_add_generated_exception_objects,fastsax,\
-#	sax/source/expatwrap/xml2utf \
-#))
-
 # vim: set noet sw=4 ts=4:
diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk
index c2f5f9fb9b85..a7c9fdcac946 100644
--- a/sax/Library_sax.mk
+++ b/sax/Library_sax.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_Library_add_exception_objects,sax,\
 	sax/source/tools/fastattribs \
 	sax/source/tools/fastserializer \
 	sax/source/tools/fshelper \
+	sax/source/expatwrap/xml2utf \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sax/inc/xml2utf.hxx b/sax/inc/xml2utf.hxx
index 175894a9874b..2421442f780f 100644
--- a/sax/inc/xml2utf.hxx
+++ b/sax/inc/xml2utf.hxx
@@ -26,6 +26,9 @@
  *
  ************************************************************************/
 
+#include <sax/dllapi.h>
+
+
 // TODO: Woher?
 #define Max( a, b )     (((a)>(b)) ? (a) : (b) )
 #define Min( a, b )     (((a)<(b)) ? (a) : (b) )
@@ -37,7 +40,7 @@
 **/
 namespace sax_expatwrap {
 
-class Text2UnicodeConverter
+class SAX_DLLPUBLIC Text2UnicodeConverter
 {
 
 public:
@@ -63,7 +66,7 @@ private:
 * Unicode2TextConverter
 *
 **-----------------------------------------*/
-class Unicode2TextConverter
+class SAX_DLLPUBLIC Unicode2TextConverter
 {
 public:
     Unicode2TextConverter( rtl_TextEncoding encoding );
@@ -94,7 +97,7 @@ private:
 * XMLFile2UTFConverter
 *
 **-----------------------------------------*/
-class XMLFile2UTFConverter
+class SAX_DLLPUBLIC XMLFile2UTFConverter
 {
 public:
     XMLFile2UTFConverter( ):