[Libreoffice-commits] core.git: 2 commits - bin/check-elf-dynamic-objects filter/source

[Stephan Bergmann (via logerrit)]

 bin/check-elf-dynamic-objects           |    2 +-
 filter/source/xsltfilter/XSLTFilter.cxx |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 63a320d9b42ae6729b144b4d1be376d1efe9e3c7
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Feb 13 16:51:18 2023 +0100
Commit:     Stephan Bergmann <sberg...@redhat.com>
CommitDate: Mon Feb 13 17:41:06 2023 +0000

    Adapt to renamed libcairo-lo.so.2
    
    ...following up on d552b4a549d614a03aa9328e017dec27bd3ff41e "Enable opening 
of
    downloaded fonts only in ForKit in Online" and
    9eaa1325a014ff76acd3290752f842ed6bad89ac "Only package the external/cairo
    library that is named the same as the SONAME"
    
    Change-Id: Ifec89813140dcca5eea13943a12883febb6c5cd1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146934
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index 3cb4d564a7ae..415dea8f46ee 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -118,7 +118,7 @@ local file="$1"
         */_uuid.cpython-*.so)
             allowlist="${allowlist} libuuid.so.1"
         ;;
-        */libcairo.so.2)
+        */libcairo-lo.so.2)
             allowlist="${allowlist} ${x11allowlist} libxcb-shm.so.0 
libxcb.so.1 libxcb-render.so.0"
         ;;
         */libcairocanvaslo.so)
commit 8589cfab808935fbcade39866145074bdfeaae81
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Feb 13 16:07:50 2023 +0100
Commit:     Stephan Bergmann <sberg...@redhat.com>
CommitDate: Mon Feb 13 17:40:55 2023 +0000

    Assume that only vnd.sun.star.expand URLs shall be macro-expanded here
    
    ...even though XSLTFilter::expandUrl did that unconditionally ever since the
    function's introduction in 3218e6592694da70760c1a42b7c562c6864799b2
    "INTEGRATION: CWS xsltfilter09".
    
    Change-Id: I08022091bc15048478c08e3f0f5cfffbb954df5d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146911
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/filter/source/xsltfilter/XSLTFilter.cxx 
b/filter/source/xsltfilter/XSLTFilter.cxx
index dd4b8551fce0..8fe3d767bd4b 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -212,11 +212,14 @@ namespace XSLT
             {
                 OUString sPreparedURL(sUrl);
                 if 
(sPreparedURL.startsWithIgnoreAsciiCase("vnd.sun.star.expand:", &sPreparedURL))
+                {
                     sPreparedURL = rtl::Uri::decode(sPreparedURL, 
rtl_UriDecodeWithCharset,
                                                     RTL_TEXTENCODING_UTF8);
-                css::uno::Reference<XMacroExpander>
+                    css::uno::Reference<XMacroExpander>
                         xMacroExpander = theMacroExpander::get(m_xContext);
-                return xMacroExpander->expandMacros(sPreparedURL);
+                    sPreparedURL = xMacroExpander->expandMacros(sPreparedURL);
+                }
+                return sPreparedURL;
             }
         catch (const Exception&)
             {