[Libreoffice-commits] core.git: vcl/quartz

Tor Lillqvist tml at collabora.com
Sat Nov 15 22:46:06 PST 2014


 vcl/quartz/salgdi.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 1defd9aeb9c051dc3b719bade5edb58462b4b817
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Nov 16 08:31:16 2014 +0200

    Avoid error: redefinition of 'GetImpl' for iOS
    
    Whether this stuff actually works at all for iOS any more I have no
    idea, and can't be bothered to check in my own time. Why do I bother
    fixing compilation errors then? Good question.
    
    Change-Id: If0ec4fbde42536d3d90e8c5337948815b5f47cef

diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index f133dfd..0b1ffef 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -315,11 +315,15 @@ AquaSalGraphics::~AquaSalGraphics()
     }
 }
 
+#ifndef IOS
+
 SalGraphicsImpl* AquaSalGraphics::GetImpl() const
 {
     return NULL;
 }
 
+#endif
+
 void AquaSalGraphics::SetTextColor( SalColor nSalColor )
 {
     maTextColor = RGBAColor( nSalColor );


More information about the Libreoffice-commits mailing list