desktop/source/lib/init.cxx | 7 +++++++
svx/source/sdr/contact/objectcontactofpageview.cxx | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 2accef3fe63121d98b866e814e74492d0fae8647
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Fri Sep 26 09:11:53 2014 +0100
Don't use this quick hack on Android.
It *seems* to cause missing areas (at least in Impress).
(i.e. the bottom half or right side of headers on slides can sometimes
go missing, not using this hack fixes the problem for me).
Change-Id: I205531666e0ad12470020e5ff2568ebf16bc2f01
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx
b/svx/source/sdr/contact/objectcontactofpageview.cxx
index dbd43d3..2eb55f7 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -236,7 +236,7 @@ namespace sdr
updateViewInformation2D(aNewViewInformation2D);
drawinglayer::primitive2d::Primitive2DSequence xPrimitiveSequence;
-#if HAVE_FEATURE_DESKTOP
+#if defined( HAVE_FEATURE_DESKTOP ) || defined( ANDROID )
// get whole Primitive2DSequence; this will already make use of
updated ViewInformation2D
// and may use the MapMode from the Target OutDev in the
DisplayInfo
xPrimitiveSequence =
rDrawPageVOContact.getPrimitive2DSequenceHierarchy(rDisplayInfo);
commit a79846ab296a40310af798bb42f0c590c3b87ed8
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Fri Sep 26 09:12:56 2014 +0100
Add more lok debug output.
This should allow as at least to see if soffice_main thread
initialisation gets stuck (which we'd otherwise have a hard time
determining if we are trying to debug e.g. on Android).
Change-Id: I0baa211c015318c4e0fcf78a4e86a0ba8b895d5f
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 89c8168..9613514 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -700,9 +700,12 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath)
// to LOK in an external program).
if (!osl_areCommandArgsSet())
{
+ SAL_INFO("lok", "commandArgs not previously set");
osl_setCommandArgs(2, pArgs);
}
+ SAL_INFO("lok", "attempting to initalize UNO");
initialize_uno(aAppURL);
+ SAL_INFO("lok", "uno successfully initalized");
force_c_locale();
// Force headless -- this is only for bitmap rendering.
@@ -724,9 +727,13 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath)
// the Thread from wherever (it's done again in Desktop::Main), and can
// then use it to wait until we're definitely ready to continue.
+ SAL_INFO("lok", "enabling OfficeIPCThread");
OfficeIPCThread::EnableOfficeIPCThread();
+ SAL_INFO("lok", "starting soffice_main");
pthread_create(&(pLib->maThread), 0, lo_startmain, NULL);
+ SAL_INFO("lok", "waiting for OfficeIPCThread");
OfficeIPCThread::WaitForReady();
+ SAL_INFO("lok", "OfficeIPCThread ready -- continuing");
// If the Thread has been disabled again that indicates that a
// restart is required (or in any case we don't have a useable
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
