diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-01-26 15:33:40 +0000 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2016-02-02 22:20:29 +0000 |
| commit | b10af3417cb3cf8d99f30ff67661fa615f3bd56c (patch) | |
| tree | a784e7c46cbbe0939d89ccca305adb53390da380 | |
| parent | Resolves: tdf#93151 handle ExpandRefs and mnColDelta the same as mnRowDelta (diff) | |
| download | core-b10af3417cb3cf8d99f30ff67661fa615f3bd56c.tar.gz core-b10af3417cb3cf8d99f30ff67661fa615f3bd56c.zip | |
Resolves: tdf#97276 don't clip out line if the underlying page size is unknown
Change-Id: I77d88d8020e9ac26bd6b7277e6d8afefed5e3ee7
(cherry picked from commit ad99c633908f7c70d06812ebfb4e0696666f0158)
(cherry picked from commit 38b362c58abd0df654665956ffc751d40cfb67ab)
Reviewed-on: https://gerrit.libreoffice.org/21814
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 5f9a61e877d79cce1f99c05a9c1598a029bf2c1c)
Reviewed-on: https://gerrit.libreoffice.org/22058
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
| -rw-r--r-- | svx/source/sdr/contact/viewcontactofsdrpathobj.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx index c44c6a25ab5a..f09a78d9c6bd 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx @@ -91,15 +91,17 @@ namespace sdr if(bIsLine) { const SdrPage* pPage = GetPathObj().GetPage(); - if (pPage) + double fPageWidth = pPage ? pPage->GetWdt() : 0.0; + double fPageHeight = pPage ? pPage->GetHgt() : 0.0; + if (fPageWidth && fPageHeight) { //tdf#63955 if we have an extremely long line then clip it //to a very generous range of -1 page width/height vs +1 //page width/height to avoid oom and massive churn //generating a huge polygon chain to cover the length in //applyLineDashing if this line is dashed - double fPageWidth = pPage->GetWdt(); - double fPageHeight = pPage->GetHgt(); + //tdf#97276 don't clip if the underlying page dimension + //is unknown basegfx::B2DRange aClipRange(-fPageWidth, -fPageHeight, fPageWidth*2, fPageHeight*2); aUnitPolyPolygon = basegfx::tools::clipPolyPolygonOnRange(aUnitPolyPolygon, |