[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - desktop/source

[Tor Lillqvist (via logerrit)]

 desktop/source/lib/init.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 5ef2aa0f4a129374a5808038d86e8f405af58acd
Author:     Tor Lillqvist <t...@collabora.com>
AuthorDate: Tue Jan 24 15:43:15 2023 +0200
Commit:     Tor Lillqvist <t...@collabora.com>
CommitDate: Thu Feb 23 18:29:16 2023 +0000

    Surround recently added code that breaks on COWASM with ifdef
    
    After 7a6324ea0d81bbe2bba09f8a7f5230342a4f4e85 I started getting UNO
    exceptions with the message "component context fails to supply service
    com.sun.star.xml.crypto.SEInitializer of type
    com.sun.star.xml.crypto.XSEInitializer".
    
    It is likely that it breaks in the iOS and Android apps, too, so
    bypass for those, too.
    
    Change-Id: Id08afbf6bea071c8b0b6564342716e0b064cb712
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146071
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <t...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147525
    Tested-by: Tor Lillqvist <t...@collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 3304b4468409..d0e899b124f4 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3435,6 +3435,7 @@ static void doc_iniUnoCommands ()
         return;
     }
 
+#if !defined IOS && !defined ANDROID && !defined __EMSCRIPTEN__
     uno::Reference<xml::crypto::XSEInitializer> xSEInitializer = 
xml::crypto::SEInitializer::create(xContext);
     if (!xSEInitializer.is())
     {
@@ -3448,6 +3449,7 @@ static void doc_iniUnoCommands ()
     {
         SAL_WARN("lok", "iniUnoCommands: failed to create security context");
     }
+#endif
 
     SfxSlotPool& rSlotPool = SfxSlotPool::GetSlotPool(pViewFrame);
     uno::Reference<util::XURLTransformer> 
xParser(util::URLTransformer::create(xContext));