[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 2 commits - libreofficekit/source sw/source

[Miklos Vajna]

 libreofficekit/source/gtk/lokdocview.c |    1 +
 sw/source/uibase/uno/unotxdoc.cxx      |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit cf38e076a4daf1b1775511b1603a231e677f6b96
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Jan 13 12:02:00 2015 +0100

    gtktiledviewer: missing initializeForRendering()
    
    Without that, we can't be sure we'll get pages in a single column.
    
    Change-Id: I18725607251b74bb81254c149fcc7e451de9359e

diff --git a/libreofficekit/source/gtk/lokdocview.c b/libreofficekit/source/gtk/lokdocview.c
index cf3169c..2e4226c 100644
--- a/libreofficekit/source/gtk/lokdocview.c
+++ b/libreofficekit/source/gtk/lokdocview.c
@@ -210,6 +210,7 @@ SAL_DLLPUBLIC_EXPORT gboolean lok_docview_open_document( LOKDocView* pDocView, c
     }
     else
     {
+        pDocView->pDocument->pClass->initializeForRendering(pDocView->pDocument);
         renderDocument( pDocView );
         pDocView->pDocument->pClass->registerCallback(pDocView->pDocument, &lok_docview_callback_worker, pDocView);
     }
commit 04053a2f8645a5cea6818e4dba882ae88901a8e3
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Jan 13 12:00:07 2015 +0100

    Missing guard in SwXTextDocument::initializeForTiledRendering()
    
    Change-Id: Ic0b09b13612e92ec069cb72a951431939b979715

diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 4bba535..4655298 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3148,6 +3148,7 @@ Size SwXTextDocument::getDocumentSize()
 
 void SwXTextDocument::initializeForTiledRendering()
 {
+    SolarMutexGuard aGuard;
     bool      bBookMode = false;
     sal_Int16 nColumns = 1;