desktop/source/lib/init.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
New commits: commit ba819f90eb00451a542330a0b6948537bc085a2b Author: Tor Lillqvist <[email protected]> Date: Sat Mar 28 15:13:23 2015 +0200 Using LO code through LOKit should imply "console only", too, I think The "console only" mode, which apparently is intended to mean something stronger than merely "headless" mode (?), is not checked much currently. But I plan to start checking it to avoid doing things that make no sense when running LO code through LibreOfficeKit. (If overloading "console only" mode turns out to be a bad thing, we will have to introduce a third degree of headlessness then, "LOKit mode".) Change-Id: Id4cd16c4d68e2f1aba8a6b8fba83325b7262563a diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index bd596b4..07cad8a 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -888,6 +888,7 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath) desktop::Desktop::GetCommandLineArgs().setHeadless(); Application::EnableHeadlessMode(true); + Application::EnableConsoleOnly(); // We could use InitVCL() here -- and used to before using soffice_main, // however that now deals with the initialisation for us (and it's not commit 8fb68a54e554c797c7878e857ca269a6bad675c9 Author: Tor Lillqvist <[email protected]> Date: Sat Mar 28 14:57:44 2015 +0200 We already log successful UNO initialisation in initialize_uno() Change-Id: Id1315a35f84fee2a7c7a42df489237c2e641a189 diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 6c0fbdf..bd596b4 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -877,7 +877,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath) { return false; } - SAL_INFO("lok", "UNO successfully initalized"); force_c_locale(); // Force headless -- this is only for bitmap rendering. commit c6282e9bc42dcd1f85005db94416fcaf4caa50c1 Author: Tor Lillqvist <[email protected]> Date: Sat Mar 28 14:54:54 2015 +0200 Exclamation marks are unprofessional Change-Id: Ic75e73cf390872f4095d23a4388739330aeb1286 diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index d0ae29b..6c0fbdf 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -333,8 +333,8 @@ static LibreOfficeKitDocument* lo_documentLoadWithOptions(LibreOfficeKit* pThis, if (!xContext.is()) { - pLib->maLastExceptionMsg = "ComponentContext is not available!"; - SAL_INFO("lok", "ComponentContext is not available!"); + pLib->maLastExceptionMsg = "ComponentContext is not available"; + SAL_INFO("lok", "ComponentContext is not available"); return NULL; } @@ -342,8 +342,8 @@ static LibreOfficeKitDocument* lo_documentLoadWithOptions(LibreOfficeKit* pThis, if (!xComponentLoader.is()) { - pLib->maLastExceptionMsg = "ComponentLoader is not available!"; - SAL_INFO("lok", "ComponentLoader is not available!"); + pLib->maLastExceptionMsg = "ComponentLoader is not available"; + SAL_INFO("lok", "ComponentLoader is not available"); return NULL; } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
