[Libreoffice-commits] core.git: sd/source

[Michael Weghorn (via logerrit)]

 sd/source/ui/framework/factories/FullScreenPane.cxx |    9 ++++-----
 sd/source/ui/presenter/PresenterHelper.cxx          |    9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

New commits:
commit 6855e41d308e14bc207d84953ff6df7e4c842434
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Thu Oct 17 10:49:11 2019 +0200
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Thu Oct 17 11:53:14 2019 +0200

    tdf#128166 sd: Fix canvas initialization args
    
    Commit 5926b22b5dc33490d23d594b129eb8a70b94ffb0
    ("The SystemEnvData passed into the canvas factories appears to
    be unused") removed previous arg at index 1, so adapt here, too.
    
    This makes the presenter console shown again (tdf#128166).
    A visible result of FullScreenPane::CreateCanvas passing wrong
    args was that an Impress presentation shown in presentation mode
    in dual screen using the qt5/kf5 VCL plugin wouldn't terminate
    properly and crash Impress on close.
    
    Change-Id: I3933864d4bb007cfdefb0a20378ff3d75ea6cd85
    Reviewed-on: https://gerrit.libreoffice.org/80933
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    Tested-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx
index 652930c6ce86..46795e792187 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.cxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.cxx
@@ -189,14 +189,13 @@ Reference<rendering::XCanvas> FullScreenPane::CreateCanvas()
     if (!pWindow)
         throw RuntimeException();
 
-    Sequence<Any> aArg (5);
+    Sequence<Any> aArg(4);
 
     // common: first any is VCL pointer to window (for VCL canvas)
     aArg[0] <<= reinterpret_cast<sal_Int64>(pWindow.get());
-    aArg[1] = Any();
-    aArg[2] <<= css::awt::Rectangle();
-    aArg[3] <<= false;
-    aArg[4] <<= mxWindow;
+    aArg[1] <<= css::awt::Rectangle();
+    aArg[2] <<= false;
+    aArg[3] <<= mxWindow;
 
     Reference<lang::XMultiServiceFactory> xFactory (
         mxComponentContext->getServiceManager(), UNO_QUERY_THROW);
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx
index 6d621b8af4a9..9e5e54cca907 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -139,14 +139,13 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createCanvas (
     if (!pWindow)
         throw RuntimeException();
 
-    Sequence<Any> aArg (5);
+    Sequence<Any> aArg(4);
 
     // common: first any is VCL pointer to window (for VCL canvas)
     aArg[0] <<= reinterpret_cast<sal_Int64>(pWindow.get());
-    aArg[1] = Any();
-    aArg[2] <<= css::awt::Rectangle();
-    aArg[3] <<= false;
-    aArg[4] <<= rxWindow;
+    aArg[1] <<= css::awt::Rectangle();
+    aArg[2] <<= false;
+    aArg[3] <<= rxWindow;
 
     Reference<lang::XMultiServiceFactory> xFactory (
         mxComponentContext->getServiceManager(), UNO_QUERY_THROW);