[Libreoffice-commits] core.git: filter/CppunitTest_filter_pict_test.mk filter/Library_ipt.mk filter/source

[Jan Holesovsky]

 filter/CppunitTest_filter_pict_test.mk      |    5 ++++-
 filter/Library_ipt.mk                       |    4 ++++
 filter/source/graphicfilter/ipict/ipict.cxx |    2 +-
 filter/source/graphicfilter/ipict/ipict.hxx |   11 ++++++++++-
 4 files changed, 19 insertions(+), 3 deletions(-)

New commits:
commit ad2cc2323fb887c438031d863ab16df7afd49fb8
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Jun 10 20:17:53 2014 +0200

    pct import: Fix build on Windows.
    
    Change-Id: Iddd0299f2229383c0d8368d117e6175887931978

diff --git a/filter/CppunitTest_filter_pict_test.mk b/filter/CppunitTest_filter_pict_test.mk
index 1742745..1e4e0be 100644
--- a/filter/CppunitTest_filter_pict_test.mk
+++ b/filter/CppunitTest_filter_pict_test.mk
@@ -8,7 +8,10 @@
 #
 $(eval $(call gb_CppunitTest_CppunitTest,filter_pict_test))
 
-$(eval $(call gb_CppunitTest_use_external,filter_pict_test,boost_headers))
+$(eval $(call gb_CppunitTest_use_externals,filter_pict_test,\
+	boost_headers \
+	libxml2 \
+))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,filter_pict_test, \
     filter/qa/cppunit/filters-pict-test \
diff --git a/filter/Library_ipt.mk b/filter/Library_ipt.mk
index 68e913c..bad878a 100644
--- a/filter/Library_ipt.mk
+++ b/filter/Library_ipt.mk
@@ -23,6 +23,10 @@ $(eval $(call gb_Library_use_external,ipt,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,ipt))
 
+$(eval $(call gb_Library_add_defs,ipt,\
+	-DPCT_DLLIMPLEMENTATION \
+))
+
 $(eval $(call gb_Library_use_libraries,ipt,\
 	vcl \
 	tl \
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index 8d3af9e..c0f1955 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -1942,7 +1942,7 @@ GraphicImport( SvStream& rIStm, Graphic & rGraphic, FilterConfigItem* )
 
 namespace pict {
 
-SAL_DLLPUBLIC_EXPORT void ReadPictFile(SvStream &rStreamPict, GDIMetaFile& rGDIMetaFile)
+void ReadPictFile(SvStream &rStreamPict, GDIMetaFile& rGDIMetaFile)
 {
     PictReader aPictReader;
     aPictReader.ReadPict(rStreamPict, rGDIMetaFile);
diff --git a/filter/source/graphicfilter/ipict/ipict.hxx b/filter/source/graphicfilter/ipict/ipict.hxx
index 1ba3dbe..a7ca2bf 100644
--- a/filter/source/graphicfilter/ipict/ipict.hxx
+++ b/filter/source/graphicfilter/ipict/ipict.hxx
@@ -10,13 +10,22 @@
 #ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_IPICT_HXX
 #define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_IPICT_HXX
 
+#include <sal/config.h>
+#include <sal/types.h>
+
+#if defined PCT_DLLIMPLEMENTATION
+#define PCT_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define PCT_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
 class GDIMetaFile;
 class SvStream;
 
 namespace pict {
 
 /// Function to access PictReader::ReadPict for unit testing.
-void ReadPictFile(SvStream &rStreamPict, GDIMetaFile& rGDIMetaFile);
+PCT_DLLPUBLIC void ReadPictFile(SvStream &rStreamPict, GDIMetaFile& rGDIMetaFile);
 
 }