diff --git a/0001-Resolves-tdf-42873-videos-in-presenter-console-mispl.patch b/0001-Resolves-tdf-42873-videos-in-presenter-console-mispl.patch new file mode 100644 index 0000000..827b831 --- /dev/null +++ b/0001-Resolves-tdf-42873-videos-in-presenter-console-mispl.patch @@ -0,0 +1,53 @@ +From b12be8bcddf71b969c97580bd631a6a851a2ad43 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Thu, 28 Sep 2017 10:28:44 +0100 +Subject: [PATCH] Resolves: tdf#42873 videos in presenter console misplaced + +Change-Id: Ib7559246f6f3173acea72268db0489b79df38ae3 +--- + slideshow/source/engine/shapes/viewmediashape.cxx | 18 +++++++++++++----- + 1 file changed, 13 insertions(+), 5 deletions(-) + +diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx +index dcc14b9..99bc019 100644 +--- a/slideshow/source/engine/shapes/viewmediashape.cxx ++++ b/slideshow/source/engine/shapes/viewmediashape.cxx +@@ -50,15 +50,16 @@ + #include + #endif + +-#include +-#include +-#include ++#include + #include ++#include + #include + #include +-#include ++#include ++#include ++#include ++#include + #include +-#include + + #include "viewmediashape.hxx" + #include "mediashape.hxx" +@@ -473,6 +474,13 @@ namespace slideshow + { + mpMediaWindow.disposeAndClear(); + mpMediaWindow = VclPtr::Create( pWindow, WB_CLIPCHILDREN ); ++ UnoViewSharedPtr xUnoView(std::dynamic_pointer_cast(mpViewLayer)); ++ if (xUnoView) ++ { ++ awt::Rectangle aCanvasArea = xUnoView->getUnoView()->getCanvasArea(); ++ aAWTRect.X += aCanvasArea.X; ++ aAWTRect.Y += aCanvasArea.Y; ++ } + mpMediaWindow->SetPosSizePixel( Point( aAWTRect.X, aAWTRect.Y ), + Size( aAWTRect.Width, aAWTRect.Height ) ); + } +-- +2.9.5 + diff --git a/libreoffice.spec b/libreoffice.spec index 702f23b..d8e2950 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -248,6 +248,7 @@ Patch3: 0001-rename-IsAutoCapitalizeWordDelim-to-NonFieldWordDeli.patch Patch4: 0002-consider-field-marks-as-text-for-auto-quotes.patch Patch5: 0001-gtk3-only-for-3.20.patch Patch6: 0001-Improve-resizing-chevrons-so-the-control-point-is-a-.patch +Patch7: 0001-Resolves-tdf-42873-videos-in-presenter-console-mispl.patch %if 0%{?rhel} # not upstreamed