Kaydet (Commit) 86edf1e3 authored tarafından jan Iversen's avatar jan Iversen Kaydeden (comit) Michael Meeks

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
Signed-off-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
üst 1bea09c7
......@@ -3756,7 +3756,6 @@ static bool initialize_uno(const OUString& aAppProgramURL)
return true;
}
#ifndef IOS
static void lo_startmain(void*)
{
osl_setThreadName("lo_startmain");
......@@ -3770,7 +3769,6 @@ static void lo_startmain(void*)
Application::ReleaseSolarMutex();
}
#endif
static bool bInitialized = false;
......@@ -4022,14 +4020,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";
......@@ -4095,16 +4085,12 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char
desktop::Desktop::CreateTemporaryDirectory();
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");
}
......
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