You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2014/02/06 15:14:27 UTC
svn commit: r1565259 - in /openoffice/trunk/main/vcl:
aqua/source/app/saldata.cxx aqua/source/app/salinst.cxx
aqua/source/app/vclnsapp.mm aqua/source/window/salmenu.cxx
inc/aqua/saldata.hxx
Author: hdu
Date: Thu Feb 6 14:14:27 2014
New Revision: 1565259
URL: http://svn.apache.org/r1565259
Log:
#i114728# set AOO's Mac baseline to OSX 10.7
Modified:
openoffice/trunk/main/vcl/aqua/source/app/saldata.cxx
openoffice/trunk/main/vcl/aqua/source/app/salinst.cxx
openoffice/trunk/main/vcl/aqua/source/app/vclnsapp.mm
openoffice/trunk/main/vcl/aqua/source/window/salmenu.cxx
openoffice/trunk/main/vcl/inc/aqua/saldata.hxx
Modified: openoffice/trunk/main/vcl/aqua/source/app/saldata.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/app/saldata.cxx?rev=1565259&r1=1565258&r2=1565259&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/app/saldata.cxx (original)
+++ openoffice/trunk/main/vcl/aqua/source/app/saldata.cxx Thu Feb 6 14:14:27 2014
@@ -53,7 +53,7 @@ SalData::SalData()
mxP50Pattern( NULL ),
maCursors( POINTER_COUNT, INVALID_CURSOR_PTR ),
mbIsScrollbarDoubleMax( false ),
- mnSystemVersion( VER_TIGER ),
+ mnSystemVersion( OSX_VER_LION ),
mpMainController( NULL ),
mpDockIconClickHandler( nil ),
mnDPIX( 0 ),
Modified: openoffice/trunk/main/vcl/aqua/source/app/salinst.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/app/salinst.cxx?rev=1565259&r1=1565258&r2=1565259&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/app/salinst.cxx (original)
+++ openoffice/trunk/main/vcl/aqua/source/app/salinst.cxx Thu Feb 6 14:14:27 2014
@@ -178,13 +178,13 @@ static void initNSApp()
object: nil ];
// get System Version and store the value in GetSalData()->mnSystemVersion
- OSErr err = noErr;
- SInt32 systemVersion = VER_TIGER; // Initialize with minimal requirement
- if( (err = Gestalt(gestaltSystemVersion, &systemVersion)) == noErr )
+ SInt32 systemVersion = OSX_VER_LION; // initialize with the minimal requirement
+ const OSErr err = Gestalt( gestaltSystemVersion, &systemVersion);
+ if( err == noErr )
{
GetSalData()->mnSystemVersion = systemVersion;
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "System Version %x\n", (unsigned int)systemVersion);
+ fprintf( stderr, "OSX System Version 0x%04x\n", (unsigned int)systemVersion);
#endif
}
else
Modified: openoffice/trunk/main/vcl/aqua/source/app/vclnsapp.mm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/app/vclnsapp.mm?rev=1565259&r1=1565258&r2=1565259&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/app/vclnsapp.mm (original)
+++ openoffice/trunk/main/vcl/aqua/source/app/vclnsapp.mm Thu Feb 6 14:14:27 2014
@@ -182,7 +182,7 @@
}
}
}
- else if( eType == NSScrollWheel && ( GetSalData()->mnSystemVersion < VER_LEOPARD /* fixed in Leopard and above */ ) )
+ else if( eType == NSScrollWheel && ( GetSalData()->mnSystemVersion < OSX_VER_LEOPARD /* fixed in Leopard and above */ ) )
{
NSWindow* pWin = [pEvent window];
Modified: openoffice/trunk/main/vcl/aqua/source/window/salmenu.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/window/salmenu.cxx?rev=1565259&r1=1565258&r2=1565259&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/window/salmenu.cxx (original)
+++ openoffice/trunk/main/vcl/aqua/source/window/salmenu.cxx Thu Feb 6 14:14:27 2014
@@ -868,7 +868,7 @@ void AquaSalMenu::RemoveMenuBarButton( s
Rectangle AquaSalMenu::GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame* i_pReferenceFrame )
{
- if( GetSalData()->mnSystemVersion < VER_LEOPARD )
+ if( GetSalData()->mnSystemVersion < OSX_VER_LEOPARD )
return Rectangle( Point( -1, -1 ), Size( 1, 1 ) );
if( ! i_pReferenceFrame || ! AquaSalFrame::isAlive( static_cast<AquaSalFrame*>(i_pReferenceFrame) ) )
Modified: openoffice/trunk/main/vcl/inc/aqua/saldata.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/aqua/saldata.hxx?rev=1565259&r1=1565258&r2=1565259&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/inc/aqua/saldata.hxx (original)
+++ openoffice/trunk/main/vcl/inc/aqua/saldata.hxx Thu Feb 6 14:14:27 2014
@@ -58,8 +58,12 @@ class SystemFontList;
#define SAL_CLIPRECT_COUNT 16
-#define VER_TIGER 0x1040
-#define VER_LEOPARD 0x1050
+#define OSX_VER_TIGER 0x1040
+#define OSX_VER_LEOPARD 0x1050
+#define OSX_VER_SNOW_LEO 0x1060
+#define OSX_VER_LION 0x1070
+#define OSX_VER_MOUNTLION 0x1080
+#define OSX_VER_MAVERICKS 0x1070
// -----------
// - SalData -