diff options
| author | jan Iversen <jani@libreoffice.org> | 2018-01-21 12:57:59 +0100 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2018-01-21 13:00:46 +0100 |
| commit | 57fd33408a5a3ae4d2a9ff68ee5513ff1192b6ad (patch) | |
| tree | c0c073d83b92459ca7dbe8ddf6f4b2c2d43b7d9b | |
| parent | d1bc14b318c9a412a761d243085da0895a1aed4a (diff) | |
iOS, removed iOS special handling in init()
Removed the need for the (limited) init() used earlier by iOS.
Due to problems solved below init() it is now posible to use
the standard init !!
init.cxx still have some special handling of paintTile, which we should try
to eliminate
Change-Id: I42234aea8ac6b8dfcf8c3c88b386b4d4a97bba74
| -rw-r--r-- | desktop/source/lib/init.cxx | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 468a145f31c6..b3631ba3ade7 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -3504,7 +3504,6 @@ static bool initialize_uno(const OUString& aAppProgramURL) return true; } -#ifndef IOS static void lo_startmain(void*) { osl_setThreadName("lo_startmain"); @@ -3516,7 +3515,6 @@ static void lo_startmain(void*) Application::ReleaseSolarMutex(); } -#endif static bool bInitialized = false; @@ -3651,14 +3649,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char // CommandLineArgs): desktop::Desktop::GetCommandLineArgs().setHeadless(); -#ifdef IOS - // mpDefInst need to be initialized, which only happens in InitVCL(), - // there might be more elegant ways to get InitVCL() called, but - // this one works :-) - InitVCL(); - SfxApplication::GetOrCreate(); -#endif - if (eStage == PRE_INIT) { std::cerr << "Init vcl\n"; @@ -3714,16 +3704,12 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char if (eStage != PRE_INIT) { SAL_INFO("lok", "Enabling RequestHandler"); -#ifdef IOS - RequestHandler::Enable(true); -#else RequestHandler::Enable(false); SAL_INFO("lok", "Starting soffice_main"); RequestHandler::SetReady(false); pLib->maThread = osl_createThread(lo_startmain, nullptr); SAL_INFO("lok", "Waiting for RequestHandler"); RequestHandler::WaitForReady(); -#endif SAL_INFO("lok", "RequestHandler ready -- continuing"); } |