Replace DISABLE_SCRIPTING with HAVE_FEATURE_SCRIPTING

Desktop / LibreOffice - Tor Lillqvist [collabora.com] - 22 October 2014 01:30 UTC

Feature test macros that govern conditional compilation should be defined in config_*.h include files, not on the compilation command line.

9ecac38 Replace DISABLE_SCRIPTING with HAVE_FEATURE_SCRIPTING
Repository.mk | 26 ++++++++------
basctl/Module_basctl.mk | 2 +-
basic/Library_sb.mk | 2 +-
basic/Module_basic.mk | 2 +-
basic/source/runtime/methods.cxx | 14 ++++----
basic/source/runtime/methods1.cxx | 8 +++--
basic/source/sbx/sbxarray.cxx | 4 ++-
basic/source/sbx/sbxdbl.cxx | 6 ++--
basic/source/sbx/sbxscan.cxx | 4 ++-
basic/source/sbx/sbxstr.cxx | 4 ++-
basic/source/sbx/sbxvalue.cxx | 11 +++---
basic/source/sbx/sbxvar.cxx | 10 +++---
chart2/CppunitTest_chart2_export.mk | 2 +-
chart2/CppunitTest_chart2_import.mk | 2 +-
chart2/CppunitTest_chart2_xshape.mk | 2 +-
config_host.mk.in | 1 -
config_host/config_features.h.in | 10 ++++++
configure.ac | 2 +-
cui/Library_cui.mk | 2 +-
cui/source/options/treeopt.cxx | 4 ++-
.../source/core/dataaccess/databasecontext.cxx | 8 +++--
desktop/source/app/app.cxx | 2 +-
filter/source/msfilter/msvbahelper.cxx | 10 +++---
filter/source/msfilter/svxmsbas2.cxx | 3 +-
librelogo/Module_librelogo.mk | 2 +-
postprocess/Rdb_services.mk | 2 +-
sc/CppunitTest_sc_annotationobj.mk | 2 +-
sc/CppunitTest_sc_annotationshapeobj.mk | 2 +-
sc/CppunitTest_sc_annotationsobj.mk | 2 +-
sc/CppunitTest_sc_cellrangeobj.mk | 2 +-
sc/CppunitTest_sc_chart_regression_test.mk | 2 +-
sc/CppunitTest_sc_datapilotfieldobj.mk | 2 +-
sc/CppunitTest_sc_datapilottableobj.mk | 2 +-
sc/CppunitTest_sc_editfieldobj_cell.mk | 2 +-
sc/CppunitTest_sc_editfieldobj_header.mk | 2 +-
sc/CppunitTest_sc_html_export_test.mk | 2 +-
sc/CppunitTest_sc_macros_test.mk | 2 +-
sc/CppunitTest_sc_modelobj.mk | 2 +-
sc/CppunitTest_sc_namedrangeobj.mk | 2 +-
sc/CppunitTest_sc_namedrangesobj.mk | 2 +-
sc/CppunitTest_sc_outlineobj.mk | 2 +-
sc/CppunitTest_sc_rangelst_test.mk | 2 +-
sc/CppunitTest_sc_styleloaderobj.mk | 2 +-
sc/CppunitTest_sc_tablesheetobj.mk | 2 +-
sc/CppunitTest_sc_tablesheetsobj.mk | 2 +-
sc/Library_sc.mk | 2 +-
sc/Module_sc.mk | 2 +-
sc/source/core/data/validat.cxx | 4 ++-
sc/source/core/tool/compiler.cxx | 4 ++-
sc/source/core/tool/interpr4.cxx | 8 +++--
sc/source/filter/excel/excimp8.cxx | 4 ++-
sc/source/ui/docshell/docsh4.cxx | 6 ++--
sc/source/ui/unoobj/servuno.cxx | 4 ++-
sc/source/ui/view/cellsh1.cxx | 6 ++--
sc/source/ui/view/cellsh2.cxx | 4 ++-
sc/source/ui/view/tabvwshf.cxx | 6 ++--
sc/source/ui/view/tabvwshh.cxx | 4 ++-
scripting/Module_scripting.mk | 2 +-
sd/source/ui/slideshow/slideshowimpl.cxx | 6 ++--
sd/source/ui/view/ViewShellImplementation.cxx | 6 ++--
sd/source/ui/view/drviews2.cxx | 14 ++++----
sd/source/ui/view/drviews3.cxx | 8 +++--
sd/source/ui/view/drviews9.cxx | 38 ++++++++++----------
sd/source/ui/view/viewshe3.cxx | 6 ++--
sfx2/source/appl/app.cxx | 18 +++++-----
sfx2/source/appl/appbas.cxx | 13 +++----
sfx2/source/appl/appbaslib.cxx | 11 +++---
sfx2/source/appl/appdata.cxx | 10 +++---
sfx2/source/appl/appdde.cxx | 2 +-
sfx2/source/appl/appinit.cxx | 5 +--
sfx2/source/appl/appquit.cxx | 10 +++---
sfx2/source/appl/appserv.cxx | 18 +++++-----
sfx2/source/appl/macroloader.cxx | 4 ++-
sfx2/source/doc/docmacromode.cxx | 3 +-
sfx2/source/doc/objserv.cxx | 4 ++-
sfx2/source/doc/objstor.cxx | 6 ++--
sfx2/source/doc/objxtor.cxx | 24 ++++++-------
sfx2/source/doc/sfxbasemodel.cxx | 10 +++---
sfx2/source/inc/appdata.hxx | 6 ++--
sfx2/source/view/viewfrm.cxx | 2 +-
solenv/gbuild/extensions/pre_MergedLibsList.mk | 2 +-
solenv/gbuild/gbuild.mk | 1 -
svx/source/form/fmscriptingenv.cxx | 4 ++-
sw/Library_sw.mk | 2 +-
sw/Module_sw.mk | 2 +-
sw/source/core/doc/doc.cxx | 4 ++-
sw/source/core/unocore/unocoll.cxx | 12 ++++---
sw/source/filter/html/htmlbas.cxx | 4 ++-
sw/source/filter/ww8/ww8par.cxx | 4 ++-
sw/source/uibase/app/docsh.cxx | 4 ++-
sw/source/uibase/app/docsh2.cxx | 4 ++-
sw/source/uibase/shells/frmsh.cxx | 4 ++-
vbahelper/Module_vbahelper.mk | 2 +-
93 files changed, 303 insertions(+), 209 deletions(-)

Upstream: cgit.freedesktop.org

  • Share