[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - vcl/headless

Luboš Luňák (via logerrit) logerrit at kemper.freedesktop.org
Thu Sep 2 06:52:45 UTC 2021


 vcl/headless/svpinst.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d67c5320f660135215392a82d6831e61907a8f04
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Mar 22 19:06:15 2021 +0100
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Thu Sep 2 08:52:08 2021 +0200

    do not enable mbSupportsBitmap32 for headless (tdf#141171)
    
    As said e.g. in 994b8e52fc02c7468a24 and 84f84f59ce7c83a99e4e340071d,
    LO code is not yet fully ready for 32bit bitmaps and e.g. PDF export
    code mishandles it.
    
    Change-Id: Ib24a0edfc82785309915132a19bd6d25ee773066
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112936
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
    (cherry picked from commit cd09fc9451897e6efedbf9f5e1d5b9bd96e65cb5)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121455
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index e4b67140ace8..62df0642b1d1 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -591,9 +591,11 @@ void SvpSalInstance::AddToRecentDocumentList(const OUString&, const OUString&, c
 std::shared_ptr<vcl::BackendCapabilities> SvpSalInstance::GetBackendCapabilities()
 {
     auto pBackendCapabilities = SalInstance::GetBackendCapabilities();
+#if 0 // LO code is not yet bitmap32-ready.
 #ifndef IOS
     // Note: This code is used for iOS, too. Let's not use 32-bit bitmaps with included alpha on iOS for now.
     pBackendCapabilities->mbSupportsBitmap32 = true;
+#endif
 #endif
     return pBackendCapabilities;
 }


More information about the Libreoffice-commits mailing list