Kaydet (Commit) 5d00f1b0 authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud Kaydeden (comit) Stephan Bergmann

invoke sal_detail_deinitialized() on MacOSX too

LibreOffice.app on Mac, eventually call NSApplicationMain()
which never return.. so the sal_detail_deinitialize()
call intented by SAL_IMPLEMENT_MAIN*() is bypassed.
This will attempt to call it, as late as possible in the NSApplication
lifecycle.

Change-Id: I5cb63bfaeafb784a0fee356ff843b332d8e31932
Reviewed-on: https://gerrit.libreoffice.org/15684Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
Tested-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 9f8d11eb
...@@ -47,6 +47,7 @@ class AquaSalFrame; ...@@ -47,6 +47,7 @@ class AquaSalFrame;
-(BOOL)application: (NSApplication*) app printFile: (NSString*)file; -(BOOL)application: (NSApplication*) app printFile: (NSString*)file;
-(NSApplicationPrintReply)application: (NSApplication *) app printFiles:(NSArray *)files withSettings: (NSDictionary *)printSettings showPrintPanels:(BOOL)bShowPrintPanels; -(NSApplicationPrintReply)application: (NSApplication *) app printFiles:(NSArray *)files withSettings: (NSDictionary *)printSettings showPrintPanels:(BOOL)bShowPrintPanels;
-(NSApplicationTerminateReply)applicationShouldTerminate: (NSApplication *) app; -(NSApplicationTerminateReply)applicationShouldTerminate: (NSApplication *) app;
-(void)applicationWillTerminate: (NSNotification *) aNotification;
-(void)systemColorsChanged: (NSNotification*) pNotification; -(void)systemColorsChanged: (NSNotification*) pNotification;
-(void)screenParametersChanged: (NSNotification*) pNotification; -(void)screenParametersChanged: (NSNotification*) pNotification;
-(void)scrollbarVariantChanged: (NSNotification*) pNotification; -(void)scrollbarVariantChanged: (NSNotification*) pNotification;
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <config_features.h> #include <config_features.h>
#include "sal/config.h" #include "sal/config.h"
#include "sal/main.h"
#include <vector> #include <vector>
#include "vcl/window.hxx" #include "vcl/window.hxx"
...@@ -384,6 +384,12 @@ ...@@ -384,6 +384,12 @@
return NSPrintingSuccess; return NSPrintingSuccess;
} }
-(void)applicationWillTerminate: (NSNotification *) aNotification
{
(void)aNotification;
sal_detail_deinitialize();
}
-(NSApplicationTerminateReply)applicationShouldTerminate: (NSApplication *) app -(NSApplicationTerminateReply)applicationShouldTerminate: (NSApplication *) app
{ {
(void)app; (void)app;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment