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

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Thu Aug 20 11:45:59 UTC 2020


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

New commits:
commit c22f194479185423b773f5ffc5881bb9ccf722ba
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Aug 20 14:24:33 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Aug 20 13:45:27 2020 +0200

    Fix iOS build error
    
    Change-Id: Ic272d1b7e91662e8da212f18d52e063ae5ab9d00
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101047
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 6ff536926829..303ee40f4da7 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -268,6 +268,8 @@ cairo_surface_t* get_underlying_cairo_surface(const VirtualDevice& rDevice)
     return static_cast<SvpSalVirtualDevice*>(rDevice.mpVirDev.get())->GetSurface();
 }
 
+#endif
+
 const cairo_font_options_t* SvpSalInstance::GetCairoFontOptions()
 {
     static cairo_font_options_t *gOptions = nullptr;
@@ -281,8 +283,6 @@ const cairo_font_options_t* SvpSalInstance::GetCairoFontOptions()
     return gOptions;
 }
 
-#endif
-
 SalTimer* SvpSalInstance::CreateSalTimer()
 {
     return new SvpSalTimer( this );


More information about the Libreoffice-commits mailing list