diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-09-13 12:44:24 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-09-18 11:43:30 +0200 |
| commit | 925e2edb6f3f8fffcff9eddb31ed18bc77e2a690 (patch) | |
| tree | b7077dcf99051435d5de54146581b97fa6b6a33b /vcl/osx/saldata.cxx | |
| parent | 0c27134fb993b30e1a0ce827364c35f8fbaac359 (diff) | |
Drop NSApplicationMain usage
Allows to drop all the special SVMain handling introduced for
MacOSX. This way LO can also be build via SSH, because gengal
won't abort / fail because of the missing window system.
Currently this just implements the global menu. I don't know
what else is missing. Eventually we want to reimplement the
Cocoa debug option forwarding (NSAccessibilityDebugLogLevel).
Change-Id: I359c46fd03e2436a8a37fd211e59e4e305f8aba0
Reviewed-on: https://gerrit.libreoffice.org/60571
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/osx/saldata.cxx')
| -rw-r--r-- | vcl/osx/saldata.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/vcl/osx/saldata.cxx b/vcl/osx/saldata.cxx index 3357adbcd60a..033114dae7e1 100644 --- a/vcl/osx/saldata.cxx +++ b/vcl/osx/saldata.cxx @@ -54,6 +54,7 @@ SalData::SalData() mnDPIX( 0 ), mnDPIY( 0 ) { + SetSalData(this); maCursors.fill( INVALID_CURSOR_PTR ); if( s_aAutoReleaseKey == nullptr ) s_aAutoReleaseKey = osl_createThreadKey( releasePool ); @@ -85,6 +86,13 @@ SalData::~SalData() if ( mpAppleRemoteMainController ) [mpAppleRemoteMainController release]; #endif + + if( mpStatusItem ) + { + [mpStatusItem release]; + mpStatusItem = nil; + } + SetSalData( nullptr ); } void SalData::ensureThreadAutoreleasePool() |