diff --git a/apple_remote/Module_apple_remote.mk b/apple_remote/Module_apple_remote.mk index 68cc7f1d47ff..5313df39ae4b 100644 --- a/apple_remote/Module_apple_remote.mk +++ b/apple_remote/Module_apple_remote.mk @@ -10,10 +10,12 @@ $(eval $(call gb_Module_Module,apple_remote)) ifeq ($(OS),MACOSX) +ifneq ($(ENABLE_MACOSX_SANDBOX),YES) $(eval $(call gb_Module_add_targets,apple_remote,\ Library_AppleRemote \ )) endif +endif # vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index ed9a0bd070b0..cc1a21d0a3b9 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -443,9 +443,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/aqua/source/window/salmenu \ vcl/aqua/source/window/salobj \ )) -$(eval $(call gb_Library_use_libraries,vcl,\ - AppleRemote \ -)) $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ $(if $(filter X86_64,$(CPUNAME)),,QuickTime) \ Cocoa \ @@ -453,11 +450,14 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ CoreFoundation \ )) +ifneq ($(ENABLE_MACOSX_SANDBOX),YES) $(eval $(call gb_Library_use_libraries,vcl,\ AppleRemote \ )) endif +endif + vcl_really_generic_code= \ vcl/generic/app/gensys \ vcl/generic/app/geninst \ diff --git a/vcl/aqua/source/app/saldata.cxx b/vcl/aqua/source/app/saldata.cxx index 185dd0b59c4a..4ec95066e2fe 100644 --- a/vcl/aqua/source/app/saldata.cxx +++ b/vcl/aqua/source/app/saldata.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include #include "aqua/saldata.hxx" #include "aqua/salnsmenu.h" @@ -47,7 +48,9 @@ SalData::SalData() mxP50Pattern( NULL ), maCursors( POINTER_COUNT, INVALID_CURSOR_PTR ), mbIsScrollbarDoubleMax( false ), +#if !HAVE_FEATURE_MACOSX_SANDBOX mpMainController( NULL ), +#endif mpDockIconClickHandler( nil ), mnDPIX( 0 ), mnDPIY( 0 ) @@ -82,8 +85,10 @@ SalData::~SalData() osl_destroyThreadKey( s_aAutoReleaseKey ); s_aAutoReleaseKey = 0; } +#if !HAVE_FEATURE_MACOSX_SANDBOX if ( mpMainController ) [mpMainController release]; +#endif } void SalData::ensureThreadAutoreleasePool() diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx index 89ce263b3690..999a19f77ce1 100644 --- a/vcl/aqua/source/app/salinst.cxx +++ b/vcl/aqua/source/app/salinst.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include #include @@ -167,7 +168,7 @@ static void initNSApp() selector: @selector(scrollbarSettingsChanged:) name: @"AppleNoRedisplayAppearancePreferenceChanged" object: nil ]; - +#if !HAVE_FEATURE_MACOSX_SANDBOX // Initialize Apple Remote GetSalData()->mpMainController = [[MainController alloc] init]; @@ -180,6 +181,7 @@ static void initNSApp() selector: @selector(applicationWillResignActive:) name: @"AppleRemoteWillResignActive" object: nil ]; +#endif } sal_Bool ImplSVMainHook( int * pnInit ) diff --git a/vcl/aqua/source/app/vclnsapp.mm b/vcl/aqua/source/app/vclnsapp.mm index e211642d91ae..738db9e252a6 100644 --- a/vcl/aqua/source/app/vclnsapp.mm +++ b/vcl/aqua/source/app/vclnsapp.mm @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include + #include "sal/config.h" #include @@ -439,8 +441,7 @@ // for Apple Remote implementation -#pragma mark - -#pragma mark NSApplication Delegates +#if !HAVE_FEATURE_MACOSX_SANDBOX - (void)applicationWillBecomeActive:(NSNotification *)pNotification { (void)pNotification; @@ -490,6 +491,7 @@ [(*it)->mpWindow setLevel: NSNormalWindowLevel]; } } +#endif - (BOOL)applicationShouldHandleReopen: (NSApplication*)pApp hasVisibleWindows: (BOOL) bWinVisible { diff --git a/vcl/inc/aqua/saldata.hxx b/vcl/inc/aqua/saldata.hxx index b0f91d89b76b..ef6c8d292646 100644 --- a/vcl/inc/aqua/saldata.hxx +++ b/vcl/inc/aqua/saldata.hxx @@ -20,6 +20,8 @@ #ifndef _SV_SALDATA_HXX #define _SV_SALDATA_HXX +#include + #include "premac.h" #include #include "postmac.h" @@ -89,8 +91,9 @@ public: static oslThreadKey s_aAutoReleaseKey; bool mbIsScrollbarDoubleMax; // TODO: support DoubleMin and DoubleBoth too +#if !HAVE_FEATURE_MACOSX_SANDBOX MainController* mpMainController; // Apple Remote - +#endif NSObject* mpDockIconClickHandler; long mnDPIX; // #i100617# read DPI only once per office life long mnDPIY; // #i100617# read DPI only once per office life diff --git a/vcl/inc/aqua/vclnsapp.h b/vcl/inc/aqua/vclnsapp.h index eeb8376d7669..18114c203e73 100644 --- a/vcl/inc/aqua/vclnsapp.h +++ b/vcl/inc/aqua/vclnsapp.h @@ -20,6 +20,8 @@ #ifndef _VCL_VCLNSAPP_H #define _VCL_VCLNSAPP_H +#include + #include "premac.h" #include "Cocoa/Cocoa.h" #include "postmac.h" @@ -51,8 +53,10 @@ class AquaSalFrame; -(void)addFallbackMenuItem: (NSMenuItem*)pNewItem; -(void)removeFallbackMenuItem: (NSMenuItem*)pOldItem; -(void)addDockMenuItem: (NSMenuItem*)pNewItem; +#if !HAVE_FEATURE_MACOSX_SANDBOX -(void)applicationWillBecomeActive: (NSNotification *)pNotification; -(void)applicationWillResignActive: (NSNotification *)pNotification; +#endif -(BOOL)applicationShouldHandleReopen: (NSApplication*)pApp hasVisibleWindows: (BOOL)bWinVisible; -(void)setDockIconClickHandler: (NSObject*)pHandler; -(void)cycleFrameForward: (AquaSalFrame*)pCurFrame;