sfx2/Library_sfx.mk | 17 +++++++++++++---- sfx2/util/sfx.component | 5 ----- sfx2/util/sfx.extended.component | 27 +++++++++++++++++++++++++++ solenv/bin/native-code.py | 2 +- 4 files changed, 41 insertions(+), 10 deletions(-)
New commits: commit 90d9a8dee35a6b14d5c994ace756da77b182238f Author: Armin Le Grand (Allotropia) <[email protected]> AuthorDate: Mon May 3 20:43:33 2021 +0200 Commit: Armin Le Grand (Allotropia) <[email protected]> CommitDate: Mon May 3 20:43:33 2021 +0200 BackingWindow (RecentDocsView) optional removal Change-Id: I8a47f879069efed5e89c6bc2b0c3e2da2e20fdd1 diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index f2fe7c708da7..7750e5247bdc 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -23,6 +23,10 @@ $(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots)) $(eval $(call gb_Library_set_componentfile,sfx,sfx2/util/sfx)) +ifneq ($(ENABLE_WASM_STRIP),TRUE) +$(eval $(call gb_Library_set_componentfile,sfx,sfx2/util/sfx.extended)) +endif + $(eval $(call gb_Library_set_precompiled_header,sfx,sfx2/inc/pch/precompiled_sfx)) $(eval $(call gb_Library_use_custom_headers,sfx,\ @@ -77,6 +81,15 @@ $(eval $(call gb_Library_use_externals,sfx,\ orcus-parser\ )) +ifneq ($(ENABLE_WASM_STRIP),TRUE) +$(eval $(call gb_Library_add_exception_objects,sfx,\ + sfx2/source/dialog/backingcomp \ + sfx2/source/dialog/backingwindow \ + sfx2/source/control/recentdocsview \ + sfx2/source/control/recentdocsviewitem \ +)) +endif + $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/accessibility/AccessibilityCheck \ sfx2/source/accessibility/AccessibilityIssue \ @@ -141,8 +154,6 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/control/msg \ sfx2/source/control/msgpool \ sfx2/source/control/objface \ - sfx2/source/control/recentdocsview \ - sfx2/source/control/recentdocsviewitem \ sfx2/source/control/request \ sfx2/source/control/sfxstatuslistener \ sfx2/source/control/shell \ @@ -170,8 +181,6 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/devtools/DocumentModelTreeHandler \ sfx2/source/devtools/ObjectInspectorTreeHandler \ sfx2/source/dialog/alienwarn \ - sfx2/source/dialog/backingcomp \ - sfx2/source/dialog/backingwindow \ sfx2/source/dialog/basedlgs \ sfx2/source/dialog/checkin \ sfx2/source/dialog/dialoghelper \ diff --git a/sfx2/util/sfx.component b/sfx2/util/sfx.component index a7c9930e0ec8..af29af66defd 100644 --- a/sfx2/util/sfx.component +++ b/sfx2/util/sfx.component @@ -19,11 +19,6 @@ <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" xmlns="http://openoffice.org/2010/uno-components";> - <implementation name="com.sun.star.comp.sfx2.BackingComp" - constructor="com_sun_star_comp_sfx2_BackingComp_get_implementation"> - <service name="com.sun.star.frame.StartModule"/> - <service name="com.sun.star.frame.ProtocolHandler"/> - </implementation> <implementation name="SfxDocumentMetaData" constructor="SfxDocumentMetaData_get_implementation"> <service name="com.sun.star.document.DocumentProperties"/> diff --git a/sfx2/util/sfx.extended.component b/sfx2/util/sfx.extended.component new file mode 100644 index 000000000000..f501c997cba5 --- /dev/null +++ b/sfx2/util/sfx.extended.component @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> + +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + xmlns="http://openoffice.org/2010/uno-components";> + <implementation name="com.sun.star.comp.sfx2.BackingComp" + constructor="com_sun_star_comp_sfx2_BackingComp_get_implementation"> + <service name="com.sun.star.frame.StartModule"/> + <service name="com.sun.star.frame.ProtocolHandler"/> + </implementation> +</component> diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 178d6f7fa47f..063c2729533b 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -770,7 +770,7 @@ desktop_constructor_list = [ "com_sun_star_comp_graphic_GraphicProvider_get_implementation", "com_sun_star_comp_office_FrameLoader_get_implementation", "com_sun_star_comp_sfx2_AppDispatchProvider_get_implementation", - "com_sun_star_comp_sfx2_BackingComp_get_implementation", + ("com_sun_star_comp_sfx2_BackingComp_get_implementation", "#ifndef ENABLE_WASM_STRIP"), "com_sun_star_comp_sfx2_GlobalEventBroadcaster_get_implementation", "com_sun_star_comp_sfx2_InsertSymbolToolBoxControl_get_implementation", "com_sun_star_comp_sfx2_InsertSymbolToolBoxControl_get_implementation", _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
