openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1560739 - /openoffice/trunk/main/vcl/inc/aqua/salgdi.h
Date Thu, 23 Jan 2014 16:46:28 GMT
Author: hdu
Date: Thu Jan 23 16:46:28 2014
New Revision: 1560739

URL: http://svn.apache.org/r1560739
Log:
#i123840# on 64bit OSX NSRect is a CGRect but not on 32bit

Modified:
    openoffice/trunk/main/vcl/inc/aqua/salgdi.h

Modified: openoffice/trunk/main/vcl/inc/aqua/salgdi.h
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/aqua/salgdi.h?rev=1560739&r1=1560738&r2=1560739&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/inc/aqua/salgdi.h (original)
+++ openoffice/trunk/main/vcl/inc/aqua/salgdi.h Thu Jan 23 16:46:28 2014
@@ -174,7 +174,9 @@ public:
     bool                CheckContext();
     void                UpdateWindow( NSRect& ); // delivered in NSView coordinates
 	void				RefreshRect( const CGRect& );
+#ifndef __x86_64__ // on 64bit OSX NSRect is typedef'ed as CGRect
 	void				RefreshRect( const NSRect& );
+#endif
 	void				RefreshRect(float lX, float lY, float lWidth, float lHeight);
 
     void                SetState();
@@ -406,10 +408,12 @@ inline void AquaSalGraphics::RefreshRect
 	RefreshRect( rRect.origin.x, rRect.origin.y, rRect.size.width, rRect.size.height );
 }
 
+#ifndef __x86_64__ // on 64bit OSX NSRect is typedef'ed as CGRect
 inline void AquaSalGraphics::RefreshRect( const NSRect& rRect )
 {
 	RefreshRect( rRect.origin.x, rRect.origin.y, rRect.size.width, rRect.size.height );
 }
+#endif
 
 inline RGBAColor::RGBAColor( SalColor nSalColor )
 {



Mime
View raw message