[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - svx/source

[Michael Weghorn (via logerrit)]

 svx/source/sdr/contact/viewcontactofsdrpathobj.cxx |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit e49eb6c9968f3ccc4e24c3f0444221c20aefb7aa
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Thu Sep 5 19:09:09 2019 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Thu Sep 12 07:37:01 2019 +0200

    tdf#126184 Use max paper dimensions to calculate clip region
    
    Assuming at least A4 for the page size isn't enough if
    e.g. A2 or larger is used, so too much was clipped in that case.
    
    Therefore, use the the maximum paper width/height instead, which
    is 6 m by default. This is still far from the 19 km that caused
    tdf#63955 and I cannot reproduce tdf#63955 with that new limit.
    
    A big thanks to Regina Henschel for the great analysis in
    tdf#126184!
    
    (Side note: Comments 18 and 19 in tdf#63955 suggest to do the whole
     clipping elsewhere, so if anybody wants to take a look at this...)
    
    Change-Id: Iccacad621675df6c7b4477182d7332c4a3d67139
    Reviewed-on: https://gerrit.libreoffice.org/78690
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 1dccd6814f1fe7a06f3168d01d18d347269cd3c1)
    Reviewed-on: https://gerrit.libreoffice.org/78759
    (cherry picked from commit 859f49294ad95d3a6596e135e550253155d6517b)
    Reviewed-on: https://gerrit.libreoffice.org/78790
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
index 9005b67a3fb4..b9f3950772f2 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
@@ -19,6 +19,7 @@
 
 
 #include <sdr/contact/viewcontactofsdrpathobj.hxx>
+#include <svtools/optionsdrawinglayer.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/sdr/primitive2d/sdrattributecreator.hxx>
@@ -104,11 +105,14 @@ namespace sdr
                 //would not over flow into a tiny clip region
                 if (nPageWidth < SAL_MAX_INT32/2 && nPageHeight < SAL_MAX_INT32/2)
                 {
-                    //But, see tdf#97276 and tdf#98366. Don't clip too much if the
+                    //But, see tdf#97276, tdf#126184 and tdf#98366. Don't clip too much if the
                     //underlying page dimension is unknown or a paste document
                     //where the page sizes use the odd default of 10x10
-                    nPageWidth = std::max<sal_Int32>(21000, nPageWidth);
-                    nPageHeight = std::max<sal_Int32>(29700, nPageHeight);
+                    const SvtOptionsDrawinglayer aDrawinglayerOpt;
+                    const sal_Int32 nMaxPaperWidth = aDrawinglayerOpt.GetMaximumPaperWidth() * 1000;
+                    const sal_Int32 nMaxPaperHeight = aDrawinglayerOpt.GetMaximumPaperHeight() * 1000;
+                    nPageWidth = std::max<sal_Int32>(nPageWidth, nMaxPaperWidth);
+                    nPageHeight = std::max<sal_Int32>(nPageHeight, nMaxPaperHeight);
                     basegfx::B2DRange aClipRange(-nPageWidth, -nPageHeight,
                                                  nPageWidth*2, nPageHeight*2);