diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-11-26 10:41:07 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-11-26 10:59:38 +0200 |
| commit | 4664dc52d990f6baab3f66f56dd3950dd6f7da8d (patch) | |
| tree | 064f8a3c43bce57424b9cb3c9f877364dca9844c /filter | |
| parent | 4d160f28b510ce9277b5d6f85eb83b87beb717fe (diff) | |
More DISABLE_EXPORT tweaks
Change-Id: I23652e60de720af4da13f29f221001813b927eb2
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/Library_svgfilter.mk | 7 | ||||
| -rw-r--r-- | filter/Module_filter.mk | 21 | ||||
| -rw-r--r-- | filter/source/svg/svgfilter.hxx | 3 |
3 files changed, 17 insertions, 14 deletions
diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk index 43a890ad43a0..07b6ea4fb3f1 100644 --- a/filter/Library_svgfilter.mk +++ b/filter/Library_svgfilter.mk @@ -60,14 +60,15 @@ $(eval $(call gb_Library_add_exception_objects,svgfilter,\ filter/source/svg/impsvgdialog \ filter/source/svg/parserfragments \ filter/source/svg/svgdialog \ - filter/source/svg/svgexport \ filter/source/svg/svgfilter \ - filter/source/svg/svgfontexport \ filter/source/svg/svgimport \ filter/source/svg/svgreader \ - filter/source/svg/svgwriter \ filter/source/svg/tokenmap \ filter/source/svg/units \ + $(if $(filter EXPORT,$(BUILD_TYPE)), \ + filter/source/svg/svgexport \ + filter/source/svg/svgfontexport \ + filter/source/svg/svgwriter) \ )) # vim: set noet sw=4 ts=4: diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk index 2f02504ddd48..ef3f5ec9ab63 100644 --- a/filter/Module_filter.mk +++ b/filter/Module_filter.mk @@ -26,16 +26,17 @@ $(eval $(call gb_Module_add_targets,filter,\ AllLangResTarget_xsltdlg \ Configuration_filter \ CustomTarget_svg \ - Library_egi \ - Library_eme \ - Library_epb \ - Library_epg \ - Library_epp \ - Library_eps \ - Library_ept \ - Library_era \ - Library_eti \ - Library_exp \ + $(if $(filter EXPORT,$(BUILD_TYPE)), \ + Library_egi \ + Library_eme \ + Library_epb \ + Library_epg \ + Library_epp \ + Library_eps \ + Library_ept \ + Library_era \ + Library_eti \ + Library_exp) \ Library_filterconfig \ Library_flash \ Library_icd \ diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index 9624614c26f3..975b7c6f226e 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -293,9 +293,10 @@ private: UCharSetMapMap mTextFieldCharSets; Reference< XInterface > mCreateOjectsCurrentMasterPage; UOStringMap mTextShapeIdListMap; +#ifndef DISABLE_EXPORT MetaBitmapActionSet mEmbeddedBitmapActionSet; ObjectMap mEmbeddedBitmapActionMap; - +#endif ObjectMap* mpObjects; Reference< XComponent > mxSrcDoc; Reference< XComponent > mxDstDoc; |