cppuhelper/Library_cppuhelper.mk | 6 ++++++
cppuhelper/source/shlib.cxx | 12 ++++++++++++
solenv/bin/native-code.py | 9 +++++++++
3 files changed, 27 insertions(+)
New commits:
commit e37c97bc1d698c94ed6736dbe4642a784e79eeff
Author: Tor Lillqvist <t...@iki.fi>
AuthorDate: Mon Sep 27 18:47:15 2021 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Tue Sep 28 10:59:20 2021 +0200
Warn harder about unknown constructors and factories on iOS in Xcode
Use NSLog() and not just SAL_WARN(). There are so many irrelevant
SAL_WARN() warnings displayed that these ones that can be extremely
relevant are easily missed. I typically run the app in Xcode with
SAL_LOG=-WARN.
(Such warnings are typically caused by something missing from the
solenv/bin/native-code.py.)
Change-Id: I4ab16f4f652ac34319021c9427e2e9f911ee29e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122721
Tested-by: Tor Lillqvist <t...@collabora.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122756
Tested-by: Jenkins
diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk
index 5e131cb6c43e..e9caf2dfd6d6 100644
--- a/cppuhelper/Library_cppuhelper.mk
+++ b/cppuhelper/Library_cppuhelper.mk
@@ -39,6 +39,12 @@ $(eval $(call gb_Library_use_static_libraries,cppuhelper,\
findsofficepath \
))
+ifeq ($(OS),iOS)
+$(eval $(call gb_Library_add_cxxflags,cppuhelper,\
+ $(gb_OBJCXXFLAGS) \
+))
+endif
+
$(eval $(call gb_Library_add_exception_objects,cppuhelper,\
cppuhelper/source/access_control \
cppuhelper/source/bootstrap \
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index b0a938a4abac..41af3dd80ebc 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -23,6 +23,12 @@
#include <cstdlib>
#include <string_view>
+#ifdef IOS
+#include <premac.h>
+#include <Foundation/Foundation.h>
+#include <postmac.h>
+#endif
+
#include <com/sun/star/loader/CannotActivateFactoryException.hpp>
#include <com/sun/star/registry/CannotRegisterImplementationException.hpp>
#include <com/sun/star/registry/XRegistryKey.hpp>
@@ -267,6 +273,9 @@ void cppuhelper::detail::loadSharedLibComponentFactory(
}
if (fp == 0) {
SAL_WARN("cppuhelper", "unknown factory name \"" << uri << "\"");
+#ifdef IOS
+ NSLog(@"Unknown factory %s", uri.toUtf8().getStr());
+#endif
throw css::loader::CannotActivateFactoryException(
"unknown factory name \"" + uri + "\"",
css::uno::Reference<css::uno::XInterface>());
@@ -287,6 +296,9 @@ void cppuhelper::detail::loadSharedLibComponentFactory(
}
}
SAL_WARN("cppuhelper", "unknown constructor name \"" << constructor <<
"\"");
+#ifdef IOS
+ NSLog(@"Unknown constructor %s", constructor.toUtf8().getStr());
+#endif
throw css::loader::CannotActivateFactoryException(
"unknown constructor name \"" + constructor + "\"",
css::uno::Reference<css::uno::XInterface>());
commit 10e809e1393d65f8864b6b7a5176f0b60cc1ec8c
Author: Tor Lillqvist <t...@iki.fi>
AuthorDate: Mon Sep 27 18:23:39 2021 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Tue Sep 28 10:59:05 2021 +0200
More constructors needed for the DISABLE_DYNLOADING case
Fixes https://github.com/CollaboraOnline/online/issues/3293.
Change-Id: I3c0eaedf47321f0e81be4ac52c66f8e55381ac32
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122720
Tested-by: Tor Lillqvist <t...@collabora.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122755
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 8efa9c19936c..9e035ddc1b87 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -90,6 +90,7 @@ core_constructor_list = [
"com_sun_star_comp_chart2_ChartDocumentWrapper_get_implementation",
"com_sun_star_comp_chart2_ChartFrameLoader_get_implementation",
"com_sun_star_comp_chart2_WizardDialog_get_implementation",
+ "org_libreoffice_chart2_Chart2ToolboxController",
"org_libreoffice_comp_chart2_sidebar_ChartPanelFactory",
# comphelper/util/comphelp.component
"com_sun_star_comp_MemoryStream",
@@ -371,8 +372,12 @@ core_constructor_list = [
# svgio/svgio.component
"svgio_XSvgParser_get_implementation",
# svx/util/svx.component
+ "com_sun_star_comp_svx_CharacterSpacingToolBoxControl_get_implementation",
+ "com_sun_star_comp_svx_CTLToolBoxControl_get_implementation",
+ "com_sun_star_comp_svx_LineSpacingToolBoxControl_get_implementation",
"com_sun_star_comp_svx_NumberingToolBoxControl_get_implementation",
"com_sun_star_comp_svx_SmartTagMenuController_get_implementation",
+ "com_sun_star_comp_svx_UnderlineToolBoxControl_get_implementation",
"com_sun_star_drawing_EnhancedCustomShapeEngine_get_implementation",
"com_sun_star_drawing_SvxShapeCollection_get_implementation",
"com_sun_star_svx_FontHeightToolBoxController_get_implementation",
@@ -380,10 +385,14 @@ core_constructor_list = [
# svx/util/svxcore.component
"com_sun_star_comp_graphic_PrimitiveFactory2D_get_implementation",
"com_sun_star_comp_Draw_GraphicExporter_get_implementation",
+ "com_sun_star_comp_svx_CharacterSpacingToolBoxControl_get_implementation",
"com_sun_star_comp_svx_ColorToolBoxControl_get_implementation",
"com_sun_star_comp_svx_FontNameToolBoxControl_get_implementation",
+ "com_sun_star_comp_svx_FrameToolBoxControl_get_implementation",
"com_sun_star_comp_Svx_GraphicExportHelper_get_implementation",
"com_sun_star_comp_Svx_GraphicImportHelper_get_implementation",
+ "com_sun_star_comp_svx_LineEndToolBoxControl_get_implementation",
+ "com_sun_star_comp_svx_LineStyleToolBoxControl_get_implementation",
"com_sun_star_comp_svx_StyleToolBoxControl_get_implementation",
"com_sun_star_comp_svx_StylesPreviewToolBoxControl_get_implementation",
# toolkit/util/tk.component
