Repository.mk | 2 -
desktop/source/app/app.cxx | 6 +++++
postprocess/Rdb_services.mk | 2 -
solenv/bin/native-code.py | 2 -
solenv/gbuild/extensions/pre_MergedLibsList.mk | 2 -
svx/Library_svx.mk | 11 +++++++++-
svx/util/svx.component | 4 ---
svx/util/svx.extended.component | 26 +++++++++++++++++++++++++
vcl/Library_vcl.mk | 2 -
9 files changed, 47 insertions(+), 10 deletions(-)
New commits:
commit f82517838840383d3a67338f61c4d66d713c42ca
Author: Armin Le Grand (Allotropia) <armin.le.gr...@me.com>
AuthorDate: Sat May 1 14:03:32 2021 +0200
Commit: Armin Le Grand (Allotropia) <armin.le.gr...@me.com>
CommitDate: Sat May 1 14:03:32 2021 +0200
Remove RecoveryUI, correct spl stuff
Also removed components, learned a lot about
doing so, corrected spl stuff.
Also had to take a deep look at static linking
mechanism/native-code.py
Change-Id: I3ff9b29feba93f011f8699f6ae3f6e39061f9e81
diff --git a/Repository.mk b/Repository.mk
index 3541cf2854f0..1bbffc768dab 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -417,7 +417,7 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
slideshow \
sot \
spell \
- $(if $(DISABLE_GUI) || $(ENABLE_WASM_STRIP),,spl) \
+ $(if $(or $(DISABLE_GUI),$(ENABLE_WASM_STRIP)),,spl) \
storagefd \
$(call gb_Helper_optional,SCRIPTING,stringresource) \
svgio \
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index a76e6f80cb1b..af383bad1626 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -957,6 +957,7 @@ struct RefClearGuard
@param bEmergencySave
differs between EMERGENCY_SAVE and RECOVERY
*/
+#ifndef ENABLE_WASM_STRIP
bool impl_callRecoveryUI(bool bEmergencySave ,
bool bExistsRecoveryData)
{
@@ -988,6 +989,7 @@ bool impl_callRecoveryUI(bool bEmergencySave ,
aRet >>= bRet;
return bRet;
}
+#endif
bool impl_bringToFrontRecoveryUI()
{
@@ -1137,9 +1139,11 @@ void Desktop::Exception(ExceptionCategory nCategory)
// Save all open documents so they will be reopened
// the next time the application is started
// returns true if at least one document could be saved...
+#ifndef ENABLE_WASM_STRIP
bRestart = impl_callRecoveryUI(
true , // force emergency save
false);
+#endif
}
FlushConfiguration();
@@ -2007,6 +2011,7 @@ void Desktop::OpenClients()
impl_checkRecoveryState(bCrashed, bExistsRecoveryData,
bExistsSessionData);
+#ifndef ENABLE_WASM_STRIP
if ( !bDisableRecovery &&
(
bExistsRecoveryData || // => crash with files => recovery
@@ -2025,6 +2030,7 @@ void Desktop::OpenClients()
TOOLS_WARN_EXCEPTION( "desktop.app", "Error during recovery");
}
}
+#endif
Reference< XSessionManagerListener2 > xSessionListener;
try
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index c083034daf29..2c491f1401dd 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -268,7 +268,7 @@ $(eval $(call gb_Rdb_add_components,services,\
desktop/source/migration/services/migrationoo2 \
desktop/source/migration/services/migrationoo3 \
desktop/source/offacc/offacc \
- $(if $(DISABLE_GUI) || $(ENABLE_WASM_STRIP),,desktop/source/splash/spl)
\
+ $(if $(or
$(DISABLE_GUI),$(ENABLE_WASM_STRIP)),,desktop/source/splash/spl) \
$(if $(ENABLE_LDAP),extensions/source/config/ldap/ldapbe2) \
$(if $(filter WNT,$(OS)),\
extensions/source/config/WinUserInfo/WinUserInfoBe \
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index de59f7093023..178d6f7fa47f 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -784,7 +784,7 @@ desktop_constructor_list = [
"com_sun_star_comp_svx_Impl_FindbarDispatcher_get_implementation",
"com_sun_star_comp_svx_LineSpacingToolBoxControl_get_implementation",
"com_sun_star_comp_svx_NumberingToolBoxControl_get_implementation",
- "com_sun_star_comp_svx_RecoveryUI_get_implementation",
+ ("com_sun_star_comp_svx_RecoveryUI_get_implementation", "#ifndef
ENABLE_WASM_STRIP"),
"com_sun_star_comp_svx_StyleToolBoxControl_get_implementation",
"com_sun_star_comp_svx_TableToolBoxControl_get_implementation",
"com_sun_star_comp_svx_TableToolBoxControl_get_implementation",
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index dfd3ebdc227e..6679ed8af942 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -70,7 +70,7 @@ MERGE_LIBRARY_LIST := \
sofficeapp \
sot \
spell \
- $(if $(DISABLE_GUI),,spl) \
+ $(if $(or $(DISABLE_GUI),$(ENABLE_WASM_STRIP)),,spl) \
srtrs1 \
$(call gb_Helper_optional,SCRIPTING,stringresource) \
svgio \
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index c951d91169f3..61d9d39066c7 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -21,6 +21,10 @@ $(eval $(call gb_Library_Library,svx))
$(eval $(call gb_Library_set_componentfile,svx,svx/util/svx))
+ifneq ($(ENABLE_WASM_STRIP),TRUE)
+$(eval $(call gb_Library_set_componentfile,svx,svx/util/svx.extended))
+endif
+
$(eval $(call gb_Library_set_include,svx,\
-I$(SRCDIR)/svx/inc \
-I$(SRCDIR)/svx/source/inc \
@@ -79,6 +83,12 @@ $(eval $(call gb_Library_use_externals,svx,\
icu_headers \
))
+ifneq ($(ENABLE_WASM_STRIP),TRUE)
+$(eval $(call gb_Library_add_exception_objects,svx,\
+ svx/source/unodraw/recoveryui \
+))
+endif
+
$(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/accessibility/AccessibleControlShape \
svx/source/accessibility/AccessibleEmptyEditSource \
@@ -242,7 +252,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/tbxctrls/tbxdrctl \
svx/source/tbxctrls/verttexttbxctrl \
svx/source/uitest/uiobject \
- svx/source/unodraw/recoveryui \
svx/source/unodraw/unoctabl \
svx/source/unodraw/UnoNamespaceMap \
svx/source/unodraw/unopool \
diff --git a/svx/util/svx.component b/svx/util/svx.component
index ff8d802394ac..262e9d6b9bc9 100644
--- a/svx/util/svx.component
+++ b/svx/util/svx.component
@@ -28,10 +28,6 @@
<service name="com.sun.star.comp.svx.FindbarDispatcher"/>
<service name="com.sun.star.frame.ProtocolHandler"/>
</implementation>
- <implementation name="com.sun.star.comp.svx.RecoveryUI"
- constructor="com_sun_star_comp_svx_RecoveryUI_get_implementation">
- <service name="com.sun.star.dialog.RecoveryUI"/>
- </implementation>
<implementation name="com.sun.star.comp.svx.CrashReportUI"
constructor="com_sun_star_comp_svx_CrashReportUI_get_implementation">
<service name="com.sun.star.dialog.CrashReportUI"/>
diff --git a/svx/util/svx.extended.component b/svx/util/svx.extended.component
new file mode 100644
index 000000000000..fe07d346be18
--- /dev/null
+++ b/svx/util/svx.extended.component
@@ -0,0 +1,26 @@
+<?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.svx.RecoveryUI"
+ constructor="com_sun_star_comp_svx_RecoveryUI_get_implementation">
+ <service name="com.sun.star.dialog.RecoveryUI"/>
+ </implementation>
+</component>
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index a69a090cb3fa..f337c5731757 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -149,7 +149,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/window/dockwin \
vcl/source/window/event \
vcl/source/window/floatwin \
- vcl/source/window/introwin \
+ $(if $(ENABLE_WASM_STRIP),,vcl/source/window/introwin) \
vcl/source/window/keycod \
vcl/source/window/keyevent \
vcl/source/window/layout \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
