diff options
| -rw-r--r-- | filter/CppunitTest_filter_pict_test.mk | 5 | ||||
| -rw-r--r-- | filter/Library_ipt.mk | 4 | ||||
| -rw-r--r-- | filter/source/graphicfilter/ipict/ipict.cxx | 2 | ||||
| -rw-r--r-- | filter/source/graphicfilter/ipict/ipict.hxx | 11 |
4 files changed, 19 insertions, 3 deletions
diff --git a/filter/CppunitTest_filter_pict_test.mk b/filter/CppunitTest_filter_pict_test.mk index 174274570a65..1e4e0bec668a 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 68e913c3f0ac..bad878a4df47 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 8d3af9e71cd5..c0f1955068b1 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 1ba3dbef1cca..a7ca2bf381d5 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); } |