diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2017-09-13 10:29:29 +0200 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@cib.de> | 2017-09-15 12:58:04 +0200 |
| commit | 1f02af4dbd13d79647549e1269722e2c0b67fa90 (patch) | |
| tree | 24632e03b0b188a24f3cb4f748bd07c49b20f8f7 /drawinglayer | |
| parent | 53599a9a183878cdf435f80939f8d301a3909d78 (diff) | |
borderline: Added merge BorderLinePrimitive2D
Added BorderLinePrimitive2D merges for Writer and fixes.
Diffstat (limited to 'drawinglayer')
| -rw-r--r-- | drawinglayer/source/primitive2d/borderlineprimitive2d.cxx | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx index 5fc3b57fbbda..eba1f7f0d996 100644 --- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx @@ -439,7 +439,15 @@ namespace drawinglayer return Primitive2DReference(); } - if(!rBT.isGap()) + if(rBT.isGap()) + { + // when gap, width has to be equal + if(!rtl::math::approxEqual(rBT.getLineAttribute().getWidth(), rBC.getLineAttribute().getWidth())) + { + return Primitive2DReference(); + } + } + else { // when not gap, the line extends have at least reach to the center ( > 0.0), // else there is a extend usage. When > 0.0 they just overlap, no problem @@ -465,11 +473,18 @@ namespace drawinglayer const BorderLine& rBT(pCandidateA->getBorderLines()[a]); const BorderLine& rBC(pCandidateB->getBorderLines()[a]); - aMergedBorderLines.push_back( - BorderLine( - rBT.getLineAttribute(), - rBT.getStartLeft(), rBT.getStartRight(), - rBC.getEndLeft(), rBC.getEndRight())); + if(rBT.isGap()) + { + aMergedBorderLines.push_back(rBT); + } + else + { + aMergedBorderLines.push_back( + BorderLine( + rBT.getLineAttribute(), + rBT.getStartLeft(), rBT.getStartRight(), + rBC.getEndLeft(), rBC.getEndRight())); + } } return Primitive2DReference( |