diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2017-09-18 12:31:45 +0200 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@cib.de> | 2017-09-18 15:42:33 +0200 |
| commit | b86a3aa00dbaf94398cccfe3af312f123edc6093 (patch) | |
| tree | 4a526fc430bc8f82463354cb0ee879ed867ea300 /sw | |
| parent | 89879b0051529cb8d16da6c8b4b1203679f8f734 (diff) | |
borderline: restuctured used classes
Restructuring for more efficcient usage of helper
values, some obstacles removed with that
Change-Id: Ia8c4b2d4c423db9500cda507107d87913b79e23c
Reviewed-on: https://gerrit.libreoffice.org/42409
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
Tested-by: Armin Le Grand <Armin.Le.Grand@cib.de>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 4098b2add8f4..351ac1a8ba35 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -2549,24 +2549,27 @@ void SwTabFramePainter::PaintLines(OutputDevice& rDev, const SwRect& rRect) cons if(!aX.equalZero()) { const basegfx::B2DVector aY(basegfx::getNormalizedPerpendicular(aX)); - svx::frame::StyleVectorTable aStartTable; - svx::frame::StyleVectorTable aEndTable; + svx::frame::StyleVectorTable aStartVector; - if(aStyles[ 1 ].IsUsed()) aStartTable.push_back(svx::frame::StyleVectorCombination(aStyles[ 1 ], -aY, true)); // aLFromT - if(aStyles[ 2 ].IsUsed()) aStartTable.push_back(svx::frame::StyleVectorCombination(aStyles[ 2 ], -aX, true)); // aLFromL - if(aStyles[ 3 ].IsUsed()) aStartTable.push_back(svx::frame::StyleVectorCombination(aStyles[ 3 ], aY, false)); // aLFromB + aStartVector.add(aStyles[ 1 ], aX, -aY, true); // aLFromT + aStartVector.add(aStyles[ 2 ], aX, -aX, true); // aLFromL + aStartVector.add(aStyles[ 3 ], aX, aY, false); // aLFromB + aStartVector.sort(); - if(aStyles[ 4 ].IsUsed()) aEndTable.push_back(svx::frame::StyleVectorCombination(aStyles[ 4 ], -aY, true)); // aRFromT - if(aStyles[ 5 ].IsUsed()) aEndTable.push_back(svx::frame::StyleVectorCombination(aStyles[ 5 ], aX, false)); // aRFromR - if(aStyles[ 6 ].IsUsed()) aEndTable.push_back(svx::frame::StyleVectorCombination(aStyles[ 6 ], aY, false)); // aRFromB + svx::frame::StyleVectorTable aEndVector; + + aEndVector.add(aStyles[ 4 ], -aX, -aY, true); // aRFromT + aEndVector.add(aStyles[ 5 ], -aX, aX, false); // aRFromR + aEndVector.add(aStyles[ 6 ], -aX, aY, false); // aRFromB + aEndVector.sort(); CreateBorderPrimitives( aHorizontalSequence, aOrigin, aX, aStyles[ 0 ], - aStartTable, - aEndTable, + aStartVector, + aEndVector, pTmpColor ); } @@ -2579,24 +2582,27 @@ void SwTabFramePainter::PaintLines(OutputDevice& rDev, const SwRect& rRect) cons if(!aX.equalZero()) { const basegfx::B2DVector aY(basegfx::getNormalizedPerpendicular(aX)); - svx::frame::StyleVectorTable aStartTable; - svx::frame::StyleVectorTable aEndTable; + svx::frame::StyleVectorTable aStartVector; + + aStartVector.add(aStyles[ 3 ], aX, -aY, false); // aTFromR + aStartVector.add(aStyles[ 2 ], aX, -aX, true); // aTFromT + aStartVector.add(aStyles[ 1 ], aX, aY, true); // aTFromL + aStartVector.sort(); - if(aStyles[ 3 ].IsUsed()) aStartTable.push_back(svx::frame::StyleVectorCombination(aStyles[ 3 ], -aY, false)); // aTFromR - if(aStyles[ 2 ].IsUsed()) aStartTable.push_back(svx::frame::StyleVectorCombination(aStyles[ 2 ], -aX, true)); // aTFromT - if(aStyles[ 1 ].IsUsed()) aStartTable.push_back(svx::frame::StyleVectorCombination(aStyles[ 1 ], aY, true)); // aTFromL + svx::frame::StyleVectorTable aEndVector; - if(aStyles[ 6 ].IsUsed()) aEndTable.push_back(svx::frame::StyleVectorCombination(aStyles[ 6 ], -aY, false)); // aBFromR - if(aStyles[ 5 ].IsUsed()) aEndTable.push_back(svx::frame::StyleVectorCombination(aStyles[ 5 ], aX, false)); // aBFromB - if(aStyles[ 4 ].IsUsed()) aEndTable.push_back(svx::frame::StyleVectorCombination(aStyles[ 4 ], aY, true)); // aBFromL + aEndVector.add(aStyles[ 6 ], -aX, -aY, false); // aBFromR + aEndVector.add(aStyles[ 5 ], -aX, aX, false); // aBFromB + aEndVector.add(aStyles[ 4 ], -aX, aY, true); // aBFromL + aEndVector.sort(); CreateBorderPrimitives( aVerticalSequence, aOrigin, aX, aStyles[ 0 ], - aStartTable, - aEndTable, + aStartVector, + aEndVector, pTmpColor ); } |