[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - libreofficekit/source

[Tor Lillqvist (via logerrit)]

 libreofficekit/source/gtk/lokdocview.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 2db82d345145b0e568e1d0ac141849ef4246533f
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Jun 4 15:06:24 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Jun 16 10:06:10 2020 +0200

    tdf#128502: Add a FIXME comment
    
    The view id concept is badly broken. Way too many wild assumptions
    that the "current" view is the one we expect here and there. For
    instance here.
    
    Change-Id: Icf36808b2c09f0b3fd8070deecf175ba7f52b5f7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95508
    Tested-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96363
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index 867166585b12..e77e0ddc8e9d 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -878,6 +878,8 @@ static gboolean postDocumentLoad(gpointer pData)
 
     std::unique_lock<std::mutex> aGuard(g_aLOKMutex);
     priv->m_pDocument->pClass->initializeForRendering(priv->m_pDocument, priv->m_aRenderingArguments.c_str());
+    // FIXME: This returns the view id of the "current" view, but sadly if you load multiple
+    // documents that is apparently not a view showing the most recently loaded document.
     priv->m_nViewId = priv->m_pDocument->pClass->getView(priv->m_pDocument);
     g_aAuthorViews[getAuthorRenderingArgument(priv)] = priv->m_nViewId;
     priv->m_pDocument->pClass->registerCallback(priv->m_pDocument, callbackWorker, pLOKDocView);