filter/Library_egi.mk | 1 + filter/Library_eme.mk | 1 + filter/Library_epb.mk | 1 + filter/Library_epg.mk | 1 + filter/Library_epp.mk | 1 + filter/Library_eps.mk | 1 + filter/Library_ept.mk | 1 + filter/Library_era.mk | 1 + filter/Library_eti.mk | 1 + filter/Library_exp.mk | 1 + filter/Library_filterconfig.mk | 1 + filter/Library_flash.mk | 1 + filter/Library_icd.mk | 1 + filter/Library_icg.mk | 1 + filter/Library_idx.mk | 1 + filter/Library_ime.mk | 1 + filter/Library_ipb.mk | 1 + filter/Library_ipd.mk | 1 + filter/Library_ips.mk | 1 + filter/Library_ipt.mk | 1 + filter/Library_ipx.mk | 1 + filter/Library_ira.mk | 1 + filter/Library_itg.mk | 1 + filter/Library_iti.mk | 1 + filter/Library_msfilter.mk | 1 + filter/Library_pdffilter.mk | 1 + filter/Library_placeware.mk | 1 + filter/Library_svgfilter.mk | 8 +++++--- filter/Library_t602filter.mk | 1 + filter/Library_xmlfa.mk | 1 + filter/Library_xmlfd.mk | 1 + filter/Library_xsltdlg.mk | 1 + filter/Library_xsltfilter.mk | 1 + filter/Module_filter.mk | 21 +++++++++++---------- filter/source/svg/svgfilter.hxx | 3 ++- oox/Library_oox.mk | 13 +++++++------ 36 files changed, 57 insertions(+), 20 deletions(-)
New commits: commit 215b2f5e599c308d3b0f0e118fe15e131adec03f Author: Tor Lillqvist <t...@iki.fi> Date: Mon Nov 26 10:47:05 2012 +0200 Add Emacs mode lines Change-Id: I01be3f5438ccbe5afc0b35bbb44911d665cc19d0 diff --git a/filter/Library_egi.mk b/filter/Library_egi.mk index 21bfacd..f45d61f 100644 --- a/filter/Library_egi.mk +++ b/filter/Library_egi.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_eme.mk b/filter/Library_eme.mk index 603dd60..8d32f2f 100644 --- a/filter/Library_eme.mk +++ b/filter/Library_eme.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_epb.mk b/filter/Library_epb.mk index ef5cf03..84e7bc6 100644 --- a/filter/Library_epb.mk +++ b/filter/Library_epb.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_epg.mk b/filter/Library_epg.mk index 4f0bf50..268fd8f 100644 --- a/filter/Library_epg.mk +++ b/filter/Library_epg.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_epp.mk b/filter/Library_epp.mk index 7ff57d7..3c16074 100644 --- a/filter/Library_epp.mk +++ b/filter/Library_epp.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_eps.mk b/filter/Library_eps.mk index ca66486..ac699af 100644 --- a/filter/Library_eps.mk +++ b/filter/Library_eps.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_ept.mk b/filter/Library_ept.mk index 7e798f5..c8229c1 100644 --- a/filter/Library_ept.mk +++ b/filter/Library_ept.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_era.mk b/filter/Library_era.mk index 80d576a..d5e2ed5 100644 --- a/filter/Library_era.mk +++ b/filter/Library_era.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_eti.mk b/filter/Library_eti.mk index 1bdf01f..47f113f 100644 --- a/filter/Library_eti.mk +++ b/filter/Library_eti.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_exp.mk b/filter/Library_exp.mk index b9e8bfb..d2c184b 100644 --- a/filter/Library_exp.mk +++ b/filter/Library_exp.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_filterconfig.mk b/filter/Library_filterconfig.mk index 358239e..0b7b047 100644 --- a/filter/Library_filterconfig.mk +++ b/filter/Library_filterconfig.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_flash.mk b/filter/Library_flash.mk index 8bf5c32..1f30909 100644 --- a/filter/Library_flash.mk +++ b/filter/Library_flash.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_icd.mk b/filter/Library_icd.mk index 0edc312..29080f5 100644 --- a/filter/Library_icd.mk +++ b/filter/Library_icd.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_icg.mk b/filter/Library_icg.mk index da26358..21bd077 100644 --- a/filter/Library_icg.mk +++ b/filter/Library_icg.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_idx.mk b/filter/Library_idx.mk index 9b02248..0ec557d 100644 --- a/filter/Library_idx.mk +++ b/filter/Library_idx.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_ime.mk b/filter/Library_ime.mk index 3de90ce..1fa0bae 100644 --- a/filter/Library_ime.mk +++ b/filter/Library_ime.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_ipb.mk b/filter/Library_ipb.mk index cf2a577..a50df6f 100644 --- a/filter/Library_ipb.mk +++ b/filter/Library_ipb.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_ipd.mk b/filter/Library_ipd.mk index 844bd34..ba1fad8 100644 --- a/filter/Library_ipd.mk +++ b/filter/Library_ipd.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_ips.mk b/filter/Library_ips.mk index feed47a..9ca7b23 100644 --- a/filter/Library_ips.mk +++ b/filter/Library_ips.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_ipt.mk b/filter/Library_ipt.mk index 86722c6..ffb3e69 100644 --- a/filter/Library_ipt.mk +++ b/filter/Library_ipt.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_ipx.mk b/filter/Library_ipx.mk index 50c87ec..708e49f 100644 --- a/filter/Library_ipx.mk +++ b/filter/Library_ipx.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_ira.mk b/filter/Library_ira.mk index 80e2231..61f0b35 100644 --- a/filter/Library_ira.mk +++ b/filter/Library_ira.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_itg.mk b/filter/Library_itg.mk index 2e64888..eb2690a 100644 --- a/filter/Library_itg.mk +++ b/filter/Library_itg.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_iti.mk b/filter/Library_iti.mk index d186dc0..2fa9101 100644 --- a/filter/Library_iti.mk +++ b/filter/Library_iti.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk index 098d72a..410e9e8 100644 --- a/filter/Library_msfilter.mk +++ b/filter/Library_msfilter.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_pdffilter.mk b/filter/Library_pdffilter.mk index a94c32c..d20e33d 100644 --- a/filter/Library_pdffilter.mk +++ b/filter/Library_pdffilter.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_placeware.mk b/filter/Library_placeware.mk index 742be65..8c63643 100644 --- a/filter/Library_placeware.mk +++ b/filter/Library_placeware.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk index 07b6ea4..4d54c10 100644 --- a/filter/Library_svgfilter.mk +++ b/filter/Library_svgfilter.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_t602filter.mk b/filter/Library_t602filter.mk index 12c7af6..b9db721 100644 --- a/filter/Library_t602filter.mk +++ b/filter/Library_t602filter.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_xmlfa.mk b/filter/Library_xmlfa.mk index 54f9894..141e105 100644 --- a/filter/Library_xmlfa.mk +++ b/filter/Library_xmlfa.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_xmlfd.mk b/filter/Library_xmlfd.mk index af18c64..8972f7b 100644 --- a/filter/Library_xmlfd.mk +++ b/filter/Library_xmlfd.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_xsltdlg.mk b/filter/Library_xsltdlg.mk index 1819177..24c05a1 100644 --- a/filter/Library_xsltdlg.mk +++ b/filter/Library_xsltdlg.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # diff --git a/filter/Library_xsltfilter.mk b/filter/Library_xsltfilter.mk index 1563c14..e3be0d7 100644 --- a/filter/Library_xsltfilter.mk +++ b/filter/Library_xsltfilter.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # commit 421c8febe88920bb6ebdfb05ce85568f241ddd0e Author: Tor Lillqvist <t...@iki.fi> Date: Mon Nov 26 10:42:42 2012 +0200 Skip a bunch of files in the disable-export case Change-Id: I58237ce2fdfc55a564e2cf9f00a5eeebed48c046 diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index b1b8164..a50e25b 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -207,12 +207,13 @@ $(eval $(call gb_Library_add_exception_objects,oox,\ oox/source/dump/dumperbase \ oox/source/dump/oledumper \ oox/source/dump/pptxdumper \ - oox/source/export/chartexport \ - oox/source/export/ColorPropertySet \ - oox/source/export/drawingml \ - oox/source/export/SchXMLSeriesHelper \ - oox/source/export/shapes \ - oox/source/export/vmlexport \ + $(if $(filter EXPORT,$(BUILD_TYPE)), \ + oox/source/export/chartexport \ + oox/source/export/ColorPropertySet \ + oox/source/export/drawingml \ + oox/source/export/SchXMLSeriesHelper \ + oox/source/export/shapes \ + oox/source/export/vmlexport) \ oox/source/helper/attributelist \ oox/source/helper/binaryinputstream \ oox/source/helper/binaryoutputstream \ commit 4664dc52d990f6baab3f66f56dd3950dd6f7da8d Author: Tor Lillqvist <t...@iki.fi> Date: Mon Nov 26 10:41:07 2012 +0200 More DISABLE_EXPORT tweaks Change-Id: I23652e60de720af4da13f29f221001813b927eb2 diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk index 43a890a..07b6ea4 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 2f02504..ef3f5ec 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 9624614..975b7c6 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; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits