lok: sd: slideshow render: some bug fixes

The suggested canvas size need to be passed to createSlideRenderer.
masterPageObjectsVisible -> masterPageObjectsVisibility as on client.
Last json message should be reset on each call to renderNextLayer.
In order to avoid to send empty layer check if the json message has
been set.
After rendering the background layer we need to return or the layer
is never received.

Change-Id: I9a83895d4f3895f3363c1b6a86fac9bd22c9fe87
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173728
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

1 files changed, 13 insertions, 3 deletions

diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index ce1043719168..6bb05bb874f6 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -370,25 +370,35 @@ void LOKSlideRenderer::renderNextLayer(unsigned char* pBuffer)
 {
     OSL_ASSERT(pBuffer);
 
+    msLastJsonMessage = ""_ostr;
+    mbIsBitmapLayer = false;
+
     if (mbRenderBackground && !isBackgroundRenderingDone())
+    {
         renderBackground(pBuffer);
+        if (!msLastJsonMessage.isEmpty())
+            return;
+    }
 
     if (!isTextFieldsRenderingDone())
     {
         renderTextFields(pBuffer);
-        return;
+        if (!msLastJsonMessage.isEmpty())
+            return;
     }
 
     if (mbRenderMasterPageObjects && !isMasterPageRenderingDone())
     {
         renderMasterPage(pBuffer);
-        return;
+        if (!msLastJsonMessage.isEmpty())
+            return;
     }
 
     if (!isDrawPageRenderingDone())
     {
         renderDrawPage(pBuffer);
-        return;
+        if (!msLastJsonMessage.isEmpty())
+            return;
     }
 
     mbSlideRenderingDone = true;