sfx2/source/appl/appdata.cxx | 2 ++ sfx2/source/appl/appdde.cxx | 2 ++ solenv/bin/native-code.py | 8 ++++++-- 3 files changed, 10 insertions(+), 2 deletions(-)
New commits: commit e40757cd8b113f8a55c46c7386d86537e25a46d0 Author: Jan Holesovsky <[email protected]> Date: Mon Mar 16 22:41:43 2015 +0100 native-code.py: VBA related services. Change-Id: Ib1d4746d222c0a59a2ace0a97ce0fb1bac18f4ef diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 2a54d99..5664182 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -56,7 +56,6 @@ core_factory_list = [ ("libxolo.a", "xo_component_getFactory"), ("libxsec_xmlsec.a", "xsec_xmlsec_component_getFactory", "#ifndef ANDROID"), ("libxstor.a", "xstor_component_getFactory"), - ("libvbaeventslo.a", "vbaevents_component_getFactory", "#if HAVE_FEATURE_SCRIPTING"), ("libvclcanvaslo.a", "vclcanvas_component_getFactory"), ("libmtfrendererlo.a", "mtfrenderer_component_getFactory"), ] @@ -209,6 +208,9 @@ calc_constructor_list = [ # sc/util/scfilt.component "com_sun_star_comp_oox_xls_ExcelFilter_get_implementation", "com_sun_star_comp_oox_xls_FormulaParser_get_implementation", +# scripting/source/vbaevents/vbaevents.component -- TODO check if all of these are necessary + ("ooo_vba_EventListener_get_implementation", "#if HAVE_FEATURE_SCRIPTING"), + ("ooo_vba_VBAToOOEventDesc_get_implementation", "#if HAVE_FEATURE_SCRIPTING"), # svl/util/svl.component -- TODO check if all of these are necessary "com_sun_star_comp_svl_PathService_get_implementation", "com_sun_star_uno_util_numbers_SvNumberFormatsSupplierServiceObject_get_implementation", commit 15fb06f318bd4a90501bf6f9461240b2790f50d5 Author: Jan Holesovsky <[email protected]> Date: Mon Mar 16 21:21:34 2015 +0100 HAVE_FEATURE_SCRIPTING, but no config_features.h include. Change-Id: I46119fbae611a762930db9cccdd11c35788c9f9c diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx index 0d9e820..4e98840 100644 --- a/sfx2/source/appl/appdata.cxx +++ b/sfx2/source/appl/appdata.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> + #include <tools/config.hxx> #include <svl/stritem.hxx> diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index d2bf891..2ba4253 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> + #include <vcl/wrkwin.hxx> #include <svl/rectitem.hxx> #include <svl/eitem.hxx> commit f0664b5c9669f447cef40980d8a4b25fa4cc08ac Author: Jan Holesovsky <[email protected]> Date: Mon Mar 16 21:18:23 2015 +0100 native-code.py: Make the #if HAVE_FEATURE_SCRIPTING actually work. Change-Id: I992773c84eaf2dff63814e6223323fe99ae5a415 diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 2e2630b..2a54d99 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -352,9 +352,11 @@ if options.services: print ("""/* * This is a generated file. Do not edit. - * file generated by solenv/bin/native-code.py + * + * File generated by solenv/bin/native-code.py */ +#include <config_features.h> #include <osl/detail/component-mapping.h> extern "C" { _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
