summaryrefslogtreecommitdiff
path: root/vcl/source/app/svmain.cxx
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2018-09-13 12:44:24 +0200
committerJan-Marek Glogowski <glogow@fbihome.de>2018-09-18 11:43:30 +0200
commit925e2edb6f3f8fffcff9eddb31ed18bc77e2a690 (patch)
treeb7077dcf99051435d5de54146581b97fa6b6a33b /vcl/source/app/svmain.cxx
parent0c27134fb993b30e1a0ce827364c35f8fbaac359 (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/source/app/svmain.cxx')
-rw-r--r--vcl/source/app/svmain.cxx10
1 files changed, 1 insertions, 9 deletions
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 3ca22053452d..c9f3f056f7e9 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -271,10 +271,6 @@ int ImplSVMain()
bool bInit = isInitVCL() || InitVCL();
-#ifdef MACOSX
- postInitVCLinitNSApp();
-#endif
-
#ifdef IOS
testExceptions();
#endif
@@ -317,11 +313,7 @@ int ImplSVMain()
int SVMain()
{
- int nRet;
- if( !Application::IsConsoleOnly() && ImplSVMainHook( &nRet ) )
- return nRet;
- else
- return ImplSVMain();
+ return ImplSVMain();
}
// This variable is set when no Application object has been instantiated