Bug#681185: libreoffice: Opening a document when LO is already running returns too early
On Wed, Apr 03, 2013 at 08:57:51PM +0200, Antos Andras wrote:
> I hope the fixed 3.6.2 version gets in testing or stable soon.
testing? Yes, when I upload it (well, 4.x most probably) after wheezy
release.
stable? For sure with jessie in ~3 years...
(but I might *try* to get the fix[1] into a stable update which is needed
anyway due to other stuff which missed the time in before it became
impossible to to do it (see #703602). And it'll be in wheezy-backports...
Regards,
Rene
[1] http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6-2&id=da329b8bb04f5d6a5c89afb7f083c7de679d5691:
rom da329b8bb04f5d6a5c89afb7f083c7de679d5691 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 06 Sep 2012 10:43:54 +0000
Subject: deb#681185: wait for InternalIPC::ProcessingDone in oosplash
Change-Id: I9606ec34ad0d8d24dca71d060bf5e1d37152903c
(cherry picked from commit 5c804dce946a928adcaf97533f5345b33e688ff5)
Reviewed-on: https://gerrit.libreoffice.org/569
Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Tested-by: Michael Meeks <michael.meeks@suse.com>
---
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index d1a09a7..8fe4774 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -512,6 +512,17 @@ send_args( int fd, rtl_uString *pCwdPath )
nLen = rtl_string_getLength( pOut ) + 1;
bResult = ( write( fd, rtl_string_getStr( pOut ), nLen ) == (ssize_t) nLen );
+ if ( bResult )
+ {
+ char resp[ strlen( "InternalIPC::ProcessingDone" ) ];
+ ssize_t n = read( fd, resp, SAL_N_ELEMENTS( resp ) );
+ bResult = n == (ssize_t) SAL_N_ELEMENTS( resp )
+ && (memcmp(
+ resp, "InternalIPC::ProcessingDone",
+ SAL_N_ELEMENTS( resp ) )
+ == 0);
+ }
+
/* cleanup */
rtl_uString_release( pEscapedCwdPath );
rtl_uString_release( pBuffer );
--
cgit v0.9.0.2-2-gbebe
Reply to: