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

[Jan-Marek Glogowski (via logerrit)]

 sd/source/ui/slidesorter/view/SlideSorterView.cxx |    3 +++
 sd/source/ui/slidesorter/view/SlsLayouter.cxx     |    4 ++++
 2 files changed, 7 insertions(+)

New commits:
commit d6ee728dfe2b346217acc5a0d231c7b62e8e61ae
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Tue Jun 11 19:41:37 2019 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Wed Jun 12 02:28:34 2019 +0200

    Fix assert on loading a video presentation in gtk3
    
    Regression from commit a46a257794f1 ("improve empty
    tools::Rectangle (width)").
    
    Change-Id: I2d6d5bc140fe4012a5b17bb01fd325225cb776b8
    Reviewed-on: https://gerrit.libreoffice.org/73844
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 2616e93eee60..36cd90066363 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -638,6 +638,9 @@ void SlideSorterView::Paint (
     OutputDevice& rDevice,
     const ::tools::Rectangle& rRepaintArea)
 {
+    if (rRepaintArea.IsEmpty())
+        return;
+
     if ( ! mpPageObjectPainter)
         if ( ! GetPageObjectPainter())
             return;
diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
index c2332a69c56e..ac16ea895050 100644
--- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
@@ -814,6 +814,10 @@ Range Layouter::Implementation::GetValidVerticalSizeRange() const
 
 Range Layouter::Implementation::GetRangeOfVisiblePageObjects (const ::tools::Rectangle& aVisibleArea) const
 {
+    // technically that's not empty, but it's the default, so...
+    if (aVisibleArea.IsEmpty())
+        return Range(-1, -1);
+
     const sal_Int32 nRow0 (GetRowAtPosition(aVisibleArea.Top(), true, GM_NEXT));
     const sal_Int32 nCol0 (GetColumnAtPosition(aVisibleArea.Left(),true, GM_NEXT));
     const sal_Int32 nRow1 (GetRowAtPosition(aVisibleArea.Bottom(), true, GM_PREVIOUS));