[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - include/svx svx/source sw/source
Armin Le Grand
Armin.Le.Grand at cib.de
Mon Sep 25 15:17:40 UTC 2017
include/svx/framelink.hxx | 33 --
svx/source/dialog/framelink.cxx | 362 ++++++++++++++---------------
svx/source/dialog/framelinkarray.cxx | 44 ++-
svx/source/table/viewcontactoftableobj.cxx | 7
sw/source/core/layout/paintfrm.cxx | 14 -
5 files changed, 225 insertions(+), 235 deletions(-)
New commits:
commit de512d3c6a95884e4b7c95d38e434f1652c359a0
Author: Armin Le Grand <Armin.Le.Grand at cib.de>
Date: Sun Sep 24 17:40:16 2017 +0200
borderline: Refinement of line end overlaps
Change-Id: Ifb1a061ed39f92a13ad5c7b2daf103f3a48938a5
Reviewed-on: https://gerrit.libreoffice.org/42712
Reviewed-by: Armin Le Grand <Armin.Le.Grand at cib.de>
Tested-by: Armin Le Grand <Armin.Le.Grand at cib.de>
diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx
index a851e39c6e44..8a8f3a6bfb16 100644
--- a/include/svx/framelink.hxx
+++ b/include/svx/framelink.hxx
@@ -232,35 +232,25 @@ private:
double mfRefModeOffset;
basegfx::B2DVector maB2DVector;
+ double mfAngle;
std::vector< OffsetAndHalfWidthAndColor > maOffsets;
public:
StyleVectorCombination(
const Style& rStyle,
const basegfx::B2DVector& rB2DVector,
+ const double fAngle,
bool bMirrored,
const Color* pForceColor = nullptr);
double getRefModeOffset() const { return mfRefModeOffset; }
const basegfx::B2DVector& getB2DVector() const { return maB2DVector; }
-
+ double getAngle() const { return mfAngle; }
bool empty() const { return maOffsets.empty(); }
size_t size() const { return maOffsets.size(); }
+ bool operator<( const StyleVectorCombination& rOther) const { return mfAngle < rOther.mfAngle; }
- void getColorAndOffsetAndHalfWidth(size_t nIndex, Color& rColor, double& rfOffset, double& rfHalfWidth) const
- {
- if(nIndex >= maOffsets.size())
- return;
- const OffsetAndHalfWidthAndColor& rCandidate(maOffsets[nIndex]);
- rfOffset = rCandidate.mfOffset;
- rfHalfWidth = rCandidate.mfHalfWidth;
- rColor = rCandidate.maColor;
- }
-
- bool operator<(const StyleVectorCombination& rOther) const
- {
- return getB2DVector().cross(rOther.getB2DVector()) < 0.0;
- }
+ void getColorAndOffsetAndHalfWidth(size_t nIndex, Color& rColor, double& rfOffset, double& rfHalfWidth) const;
};
class SAL_WARN_UNUSED SVX_DLLPUBLIC StyleVectorTable
@@ -278,18 +268,9 @@ public:
const Style& rStyle,
const basegfx::B2DVector& rMyVector,
const basegfx::B2DVector& rOtherVector,
- bool bMirrored)
- {
- if(rStyle.IsUsed() && !basegfx::areParallel(rMyVector, rOtherVector))
- {
- maEntries.emplace_back(rStyle, rOtherVector, bMirrored);
- }
- }
+ bool bMirrored);
- void sort()
- {
- std::sort(maEntries.begin(), maEntries.end());
- }
+ void sort();
bool empty() const { return maEntries.empty(); }
size_t size() const { return maEntries.size(); }
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index 147be36167aa..e8429bc6801e 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -344,7 +344,21 @@ struct CutSet
double mfORML;
double mfOLMR;
double mfORMR;
-};
+
+ CutSet() : mfOLML(0.0), mfORML(0.0), mfOLMR(0.0), mfORMR(0.0)
+ {
+ }
+
+ bool operator<( const CutSet& rOther) const
+ {
+ const double fA(mfOLML + mfORML + mfOLMR + mfORMR);
+ const double fB(rOther.mfOLML + rOther.mfORML + rOther.mfOLMR + rOther.mfORMR);
+
+ return fA < fB;
+ }
+
+ double getSum() const { return mfOLML + mfORML + mfOLMR + mfORMR; }
+ } ;
struct ExtendSet
{
@@ -396,218 +410,171 @@ void getCutSet(
&rCutSet.mfORMR);
}
-void getAllCutSets(
- std::vector< CutSet >& rCutSets,
- const basegfx::B2DPoint& rOrigin,
- const basegfx::B2DPoint& rLeft,
- const basegfx::B2DPoint& rRight,
- const basegfx::B2DVector& rX,
- const StyleVectorTable& rStyleVectorTable,
- bool bUpper,
- bool bLower)
+void getExtends(
+ std::vector<ExtendSet>& rExtendSet, // target Left/Right values to fill
+ const basegfx::B2DPoint& rOrigin, // own vector start
+ const StyleVectorCombination& rCombination, // own vector and offstets for lines
+ const basegfx::B2DVector& rPerpendX, // normalized perpendicular to own vector
+ const std::vector< StyleVectorCombination >& rStyleVector) // other vectors emerging in this point
{
- for(const auto& rCombination : rStyleVectorTable.getEntries())
+ if(!rCombination.empty() && !rStyleVector.empty() && rCombination.size() == rExtendSet.size())
{
- if(bUpper || bLower)
- {
- // use only upper or lower vectors compared to rX
- const double fCross(rX.cross(rCombination.getB2DVector()));
+ const size_t nOffsetA(rCombination.size());
- if(bUpper && fCross > 0.0)
- {
- // upper vectors wanted, but is lower
- continue;
- }
-
- if(bLower && fCross < 0.0)
- {
- // lower vectors wanted, but is upper
- continue;
- }
- }
-
- if(!rCombination.empty())
+ if(1 == nOffsetA)
{
- const basegfx::B2DVector aOtherPerpend(basegfx::getNormalizedPerpendicular(rCombination.getB2DVector()));
- const size_t nOffsets(rCombination.size());
+ Color aMyColor; double fMyOffset(0.0); double fMyHalfWidth(0.0);
+ rCombination.getColorAndOffsetAndHalfWidth(0, aMyColor, fMyOffset, fMyHalfWidth);
- for(size_t a(0); a < nOffsets; a++)
+ if(0xff != aMyColor.GetTransparency())
{
- Color aOtherColor;
- double fOtherOffset(0.0);
- double fOtherHalfWidth(0.0);
- rCombination.getColorAndOffsetAndHalfWidth(a, aOtherColor, fOtherOffset, fOtherHalfWidth);
+ const basegfx::B2DPoint aLeft(rOrigin + (rPerpendX * (fMyOffset - fMyHalfWidth)));
+ const basegfx::B2DPoint aRight(rOrigin + (rPerpendX * (fMyOffset + fMyHalfWidth)));
+ std::vector< CutSet > aCutSets;
- if(0xff != aOtherColor.GetTransparency())
+ for(const auto& rStyleCandidate : rStyleVector)
{
- const basegfx::B2DPoint aOtherLeft(rOrigin + (aOtherPerpend * (fOtherOffset - fOtherHalfWidth)));
- const basegfx::B2DPoint aOtherRight(rOrigin + (aOtherPerpend * (fOtherOffset + fOtherHalfWidth)));
- CutSet aCutSet;
+ const basegfx::B2DVector aOtherPerpend(basegfx::getNormalizedPerpendicular(rStyleCandidate.getB2DVector()));
+ const size_t nOffsetB(rStyleCandidate.size());
+
+ for(size_t other(0); other < nOffsetB; other++)
+ {
+ Color aOtherColor; double fOtherOffset(0.0); double fOtherHalfWidth(0.0);
+ rStyleCandidate.getColorAndOffsetAndHalfWidth(other, aOtherColor, fOtherOffset, fOtherHalfWidth);
+
+ if(0xff != aOtherColor.GetTransparency())
+ {
+ const basegfx::B2DPoint aOtherLeft(rOrigin + (aOtherPerpend * (fOtherOffset - fOtherHalfWidth)));
+ const basegfx::B2DPoint aOtherRight(rOrigin + (aOtherPerpend * (fOtherOffset + fOtherHalfWidth)));
- getCutSet(aCutSet, rLeft, rRight, rX, aOtherLeft, aOtherRight, rCombination.getB2DVector());
- rCutSets.push_back(aCutSet);
+ CutSet aNewCutSet;
+ getCutSet(aNewCutSet, aLeft, aRight, rCombination.getB2DVector(), aOtherLeft, aOtherRight, rStyleCandidate.getB2DVector());
+ aCutSets.push_back(aNewCutSet);
+ }
+ }
}
- }
- }
- }
-}
-CutSet getMinMaxCutSet(
- bool bMin,
- const std::vector< CutSet >& rCutSets)
-{
- if(rCutSets.empty())
- {
- CutSet aRetval;
- aRetval.mfOLML = aRetval.mfORML = aRetval.mfOLMR = aRetval.mfORMR = 0.0;
- return aRetval;
- }
+ if(!aCutSets.empty())
+ {
+ CutSet aCutSet(aCutSets[0]);
+ const size_t nNumCutSets(aCutSets.size());
- const size_t aSize(rCutSets.size());
+ if(1 != nNumCutSets)
+ {
+ double fCutSet(aCutSet.getSum());
- if(1 == aSize)
- {
- return rCutSets[0];
- }
+ for(size_t a(1); a < nNumCutSets; a++)
+ {
+ const CutSet& rCandidate(aCutSets[a]);
+ const double fCandidate(rCandidate.getSum());
- CutSet aRetval(rCutSets[0]);
- double fRetval(aRetval.mfOLML + aRetval.mfORML + aRetval.mfOLMR + aRetval.mfORMR);
+ if(basegfx::fTools::equalZero(fCandidate - fCutSet))
+ {
+ // both have equal center point, use medium cut
+ const double fNewOLML(std::max(std::min(rCandidate.mfOLML, rCandidate.mfORML), std::min(aCutSet.mfOLML, aCutSet.mfORML)));
+ const double fNewORML(std::min(std::max(rCandidate.mfOLML, rCandidate.mfORML), std::max(aCutSet.mfOLML, aCutSet.mfORML)));
+ const double fNewOLMR(std::max(std::min(rCandidate.mfOLMR, rCandidate.mfORMR), std::min(aCutSet.mfOLMR, aCutSet.mfORMR)));
+ const double fNewORMR(std::min(std::max(rCandidate.mfOLMR, rCandidate.mfORMR), std::max(aCutSet.mfOLMR, aCutSet.mfORMR)));
+ aCutSet.mfOLML = fNewOLML;
+ aCutSet.mfORML = fNewORML;
+ aCutSet.mfOLMR = fNewOLMR;
+ aCutSet.mfORMR = fNewORMR;
+ fCutSet = aCutSet.getSum();
+ }
+ else if(fCandidate < fCutSet)
+ {
+ // get minimum
+ fCutSet = fCandidate;
+ aCutSet = rCandidate;
+ }
+ }
+ }
- for(size_t a(1); a < aSize; a++)
- {
- const CutSet& rCandidate(rCutSets[a]);
- const double fCandidate(rCandidate.mfOLML + rCandidate.mfORML + rCandidate.mfOLMR + rCandidate.mfORMR);
+ ExtendSet& rExt(rExtendSet[0]);
- if(bMin)
- {
- if(fCandidate < fRetval)
- {
- fRetval = fCandidate;
- aRetval = rCandidate;
+ rExt.mfExtLeft = std::min(aCutSet.mfOLML, aCutSet.mfORML);
+ rExt.mfExtRight = std::min(aCutSet.mfOLMR, aCutSet.mfORMR);
+ }
}
}
else
{
- if(fCandidate > fRetval)
- {
- fRetval = fCandidate;
- aRetval = rCandidate;
- }
- }
- }
-
- return aRetval;
-}
-
-void getExtends(
- std::vector<ExtendSet>& rExtendSet, // target Left/Right values to fill
- const basegfx::B2DPoint& rOrigin, // own vector start
- const StyleVectorCombination& rCombination, // own vector and offstets for lines
- const basegfx::B2DVector& rPerpendX, // normalized perpendicular to own vector
- const StyleVectorTable& rStyleVectorTable) // other vectors emerging in this point
-{
- if(!rCombination.empty() && rCombination.size() == rExtendSet.size())
- {
- const size_t nOffsets(rCombination.size());
-
- for(size_t a(0); a < nOffsets; a++)
- {
- Color aMyColor;
- double fMyOffset(0.0);
- double fMyHalfWidth(0.0);
- rCombination.getColorAndOffsetAndHalfWidth(a, aMyColor, fMyOffset, fMyHalfWidth);
+ size_t nVisEdgeUp(0);
+ size_t nVisEdgeDn(0);
- if(0xff != aMyColor.GetTransparency())
+ for(size_t my(0); my < nOffsetA; my++)
{
- const basegfx::B2DPoint aLeft(rOrigin + (rPerpendX * (fMyOffset - fMyHalfWidth)));
- const basegfx::B2DPoint aRight(rOrigin + (rPerpendX * (fMyOffset + fMyHalfWidth)));
- std::vector< CutSet > aCutSets;
- CutSet aResult;
- bool bResultSet(false);
+ Color aMyColor; double fMyOffset(0.0); double fMyHalfWidth(0.0);
+ rCombination.getColorAndOffsetAndHalfWidth(my, aMyColor, fMyOffset, fMyHalfWidth);
- if(1 == nOffsets)
+ if(0xff != aMyColor.GetTransparency())
{
- // single line:
- // - get all CutSets
- // - get minimum values as extension (biggest possible overlap)
- getAllCutSets(aCutSets, rOrigin, aLeft, aRight, rCombination.getB2DVector(), rStyleVectorTable, false, false);
-
- if(!aCutSets.empty())
+ const basegfx::B2DPoint aLeft(rOrigin + (rPerpendX * (fMyOffset - fMyHalfWidth)));
+ const basegfx::B2DPoint aRight(rOrigin + (rPerpendX * (fMyOffset + fMyHalfWidth)));
+ const bool bUpper(my <= (nOffsetA >> 1));
+ const StyleVectorCombination& rStyleCandidate(bUpper ? rStyleVector.front() : rStyleVector.back());
+ const basegfx::B2DVector aOtherPerpend(basegfx::getNormalizedPerpendicular(rStyleCandidate.getB2DVector()));
+ const size_t nOffsetB(rStyleCandidate.size());
+ std::vector< CutSet > aCutSets;
+
+ for(size_t other(0); other < nOffsetB; other++)
{
- aResult = getMinMaxCutSet(true, aCutSets);
- bResultSet = true;
- }
- }
- else
- {
- // multiple lines
- const bool bUpper(a < (nOffsets >> 1));
- const bool bLower(a > (nOffsets >> 1));
-
- if(bUpper)
- {
- getAllCutSets(aCutSets, rOrigin, aLeft, aRight, rCombination.getB2DVector(), rStyleVectorTable, true, false);
+ Color aOtherColor; double fOtherOffset(0.0); double fOtherHalfWidth(0.0);
+ rStyleCandidate.getColorAndOffsetAndHalfWidth(other, aOtherColor, fOtherOffset, fOtherHalfWidth);
- if(!aCutSets.empty())
+ if(0xff != aOtherColor.GetTransparency())
{
- aResult = getMinMaxCutSet(false, aCutSets);
- bResultSet = true;
- }
- else
- {
- getAllCutSets(aCutSets, rOrigin, aLeft, aRight, rCombination.getB2DVector(), rStyleVectorTable, false, true);
-
- if(!aCutSets.empty())
- {
- aResult = getMinMaxCutSet(true, aCutSets);
- bResultSet = true;
- }
+ const basegfx::B2DPoint aOtherLeft(rOrigin + (aOtherPerpend * (fOtherOffset - fOtherHalfWidth)));
+ const basegfx::B2DPoint aOtherRight(rOrigin + (aOtherPerpend * (fOtherOffset + fOtherHalfWidth)));
+ CutSet aCutSet;
+ getCutSet(aCutSet, aLeft, aRight, rCombination.getB2DVector(), aOtherLeft, aOtherRight, rStyleCandidate.getB2DVector());
+ aCutSets.push_back(aCutSet);
}
}
- else if(bLower)
- {
- getAllCutSets(aCutSets, rOrigin, aLeft, aRight, rCombination.getB2DVector(), rStyleVectorTable, false, true);
- if(!aCutSets.empty())
+ if(!aCutSets.empty())
+ {
+ // sort: min to start, max to end
+ std::sort(aCutSets.begin(), aCutSets.end());
+ const bool bOtherUpper(rStyleCandidate.getAngle() > F_PI);
+
+ // check if we need min or max
+ // bUpper bOtherUpper MinMax
+ // t t max
+ // t f min
+ // f f max
+ // f t min
+ const bool bMax(bUpper == bOtherUpper);
+ size_t nBaseIndex(0);
+ const size_t nNumCutSets(aCutSets.size());
+
+ if(bMax)
{
- aResult = getMinMaxCutSet(false, aCutSets);
- bResultSet = true;
+ // access at end
+ nBaseIndex = nNumCutSets - 1 - (bUpper ? nVisEdgeUp : nVisEdgeDn);
}
else
{
- getAllCutSets(aCutSets, rOrigin, aLeft, aRight, rCombination.getB2DVector(), rStyleVectorTable, true, false);
-
- if(!aCutSets.empty())
- {
- aResult = getMinMaxCutSet(true, aCutSets);
- bResultSet = true;
- }
+ // access at start
+ nBaseIndex = bUpper ? nVisEdgeUp : nVisEdgeDn;
}
- }
- else // middle line
- {
- getAllCutSets(aCutSets, rOrigin, aLeft, aRight, rCombination.getB2DVector(), rStyleVectorTable, false, false);
- if(!aCutSets.empty())
- {
- const CutSet aResultMin(getMinMaxCutSet(true, aCutSets));
- const CutSet aResultMax(getMinMaxCutSet(false, aCutSets));
-
- aResult.mfOLML = (aResultMin.mfOLML + aResultMax.mfOLML) * 0.5;
- aResult.mfORML = (aResultMin.mfORML + aResultMax.mfORML) * 0.5;
- aResult.mfOLMR = (aResultMin.mfOLMR + aResultMax.mfOLMR) * 0.5;
- aResult.mfORMR = (aResultMin.mfORMR + aResultMax.mfORMR) * 0.5;
- bResultSet = true;
- }
- }
- }
+ const size_t nSecuredIndex(std::min(nNumCutSets - 1, std::max(nBaseIndex, static_cast< size_t >(0))));
+ const CutSet& rCutSet(aCutSets[nSecuredIndex]);
+ ExtendSet& rExt(rExtendSet[my]);
- if(bResultSet)
- {
- ExtendSet& rExt(rExtendSet[a]);
+ rExt.mfExtLeft = std::min(rCutSet.mfOLML, rCutSet.mfORML);
+ rExt.mfExtRight = std::min(rCutSet.mfOLMR, rCutSet.mfORMR);
+ }
- rExt.mfExtLeft = std::min(aResult.mfOLML, aResult.mfORML);
- rExt.mfExtRight = std::min(aResult.mfOLMR, aResult.mfORMR);
+ if(bUpper)
+ {
+ nVisEdgeUp++;
+ }
+ else
+ {
+ nVisEdgeDn++;
+ }
}
}
}
@@ -617,10 +584,12 @@ void getExtends(
StyleVectorCombination::StyleVectorCombination(
const Style& rStyle,
const basegfx::B2DVector& rB2DVector,
+ double fAngle,
bool bMirrored,
const Color* pForceColor)
: mfRefModeOffset(0.0),
maB2DVector(rB2DVector),
+ mfAngle(fAngle),
maOffsets()
{
if (rStyle.IsUsed())
@@ -684,7 +653,7 @@ StyleVectorCombination::StyleVectorCombination(
fPrim * 0.5,
nullptr != pForceColor ? *pForceColor : aPrim));
- maOffsets.push_back(
+ maOffsets.push_back(
OffsetAndHalfWidthAndColor(
(b + c) * 0.5,
rStyle.Dist() * 0.5,
@@ -692,7 +661,7 @@ StyleVectorCombination::StyleVectorCombination(
? (nullptr != pForceColor ? *pForceColor : rStyle.GetColorGap())
: Color(COL_TRANSPARENT)));
- maOffsets.push_back(
+ maOffsets.push_back(
OffsetAndHalfWidthAndColor(
(c + d) * 0.5,
fSecn * 0.5,
@@ -714,6 +683,37 @@ StyleVectorCombination::StyleVectorCombination(
}
}
+void StyleVectorCombination::getColorAndOffsetAndHalfWidth(size_t nIndex, Color& rColor, double& rfOffset, double& rfHalfWidth) const
+{
+ if(nIndex >= maOffsets.size())
+ return;
+ const OffsetAndHalfWidthAndColor& rCandidate(maOffsets[nIndex]);
+ rfOffset = rCandidate.mfOffset;
+ rfHalfWidth = rCandidate.mfHalfWidth;
+ rColor = rCandidate.maColor;
+}
+
+void StyleVectorTable::add(
+ const Style& rStyle,
+ const basegfx::B2DVector& rMyVector,
+ const basegfx::B2DVector& rOtherVector,
+ bool bMirrored)
+{
+ if(rStyle.IsUsed() && !basegfx::areParallel(rMyVector, rOtherVector))
+ {
+ // create angle between both. angle() needs vectors pointing away from the same point,
+ // so take the mirrored one. Add F_PI to get from -pi..+pi to [0..F_PI2] for sorting
+ const double fAngle(basegfx::B2DVector(-rMyVector.getX(), -rMyVector.getY()).angle(rOtherVector) + F_PI);
+ maEntries.emplace_back(rStyle, rOtherVector, fAngle, bMirrored);
+ }
+}
+
+void StyleVectorTable::sort()
+{
+ // sort inverse fom highest to lowest
+ std::sort(maEntries.begin(), maEntries.end(), [](const StyleVectorCombination& a, const StyleVectorCombination& b) { return a.getAngle() > b.getAngle(); });
+}
+
void CreateBorderPrimitives(
drawinglayer::primitive2d::Primitive2DContainer& rTarget,
const basegfx::B2DPoint& rOrigin,
@@ -724,7 +724,7 @@ void CreateBorderPrimitives(
const Color* pForceColor)
{
// get offset color pairs for style, one per visible line
- const StyleVectorCombination aCombination(rBorder, rX, false, pForceColor);
+ const StyleVectorCombination aCombination(rBorder, rX, 0.0, false, pForceColor);
if(!aCombination.empty())
{
@@ -738,15 +738,15 @@ void CreateBorderPrimitives(
if(bHasStartStyles)
{
// create extends for line starts, use given point/vector and offsets
- getExtends(aExtendSetStart, rOrigin, aCombination, aPerpendX, rStartStyleVectorTable);
+ getExtends(aExtendSetStart, rOrigin, aCombination, aPerpendX, rStartStyleVectorTable.getEntries());
}
if(bHasEndStyles)
{
// Create extends for line ends, create inverse point/vector and inverse offsets.
- const StyleVectorCombination aMirroredCombination(rBorder, -rX, true, pForceColor);
+ const StyleVectorCombination aMirroredCombination(rBorder, -rX, 0.0, true, pForceColor);
- getExtends(aExtendSetEnd, rOrigin + rX, aMirroredCombination, -aPerpendX, rEndStyleVectorTable);
+ getExtends(aExtendSetEnd, rOrigin + rX, aMirroredCombination, -aPerpendX, rEndStyleVectorTable.getEntries());
// also need to inverse the result to apply to the correct lines
std::reverse(aExtendSetEnd.begin(), aExtendSetEnd.end());
diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx
index f9a2322cd4ce..093031c3f062 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -967,12 +967,13 @@ void HelperCreateHorizontalEntry(
const Style& rEndRFromB(rArray.GetCellStyleRight( col, row ));
const Style& rEndFromBL(rArray.GetCellStyleTR( col, row ));
StyleVectorTable aEnd;
+ const basegfx::B2DVector aAxis(-rX);
- aEnd.add(rEndFromTL, -rX, -rX -rY, true);
- aEnd.add(rEndRFromT, -rX, -rY, true);
- aEnd.add(rEndRFromR, -rX, rX, false);
- aEnd.add(rEndRFromB, -rX, rY, false);
- aEnd.add(rEndFromBL, -rX, rY - rX, true);
+ aEnd.add(rEndFromTL, aAxis, aAxis - rY, true);
+ aEnd.add(rEndRFromT, aAxis, -rY, true);
+ aEnd.add(rEndRFromR, aAxis, rX, false);
+ aEnd.add(rEndRFromB, aAxis, rY, false);
+ aEnd.add(rEndFromBL, aAxis, rY - rX, true);
aEnd.sort();
CreateBorderPrimitives(
@@ -1014,12 +1015,13 @@ void HelperCreateVerticalEntry(
const Style& rEndBFromR(rArray.GetCellStyleBottom( col, row ));
const Style& rEndFromTR(rArray.GetCellStyleBL( col, row ));
StyleVectorTable aEnd;
+ const basegfx::B2DVector aAxis(-rY);
- aEnd.add(rEndFromTR, -rY, rX - rY, false);
- aEnd.add(rEndBFromR, -rY, rX, false);
- aEnd.add(rEndBFromB, -rY, rY, false);
- aEnd.add(rEndBFromL, -rY, -rX, true);
- aEnd.add(rEndFromTL, -rY, -rX - rY, true);
+ aEnd.add(rEndFromTR, aAxis, rX - rY, false);
+ aEnd.add(rEndBFromR, aAxis, rX, false);
+ aEnd.add(rEndBFromB, aAxis, rY, false);
+ aEnd.add(rEndBFromL, aAxis, -rX, true);
+ aEnd.add(rEndFromTL, aAxis, aAxis - rX, true);
aEnd.sort();
CreateBorderPrimitives(
@@ -1200,18 +1202,20 @@ drawinglayer::primitive2d::Primitive2DContainer Array::CreateB2DPrimitiveRange(
const Style& rTLFromRight(GetCellStyleTop(_nFirstCol, _nFirstRow));
const Style& rTLFromBottom(GetCellStyleLeft(_nFirstCol, _nFirstRow));
StyleVectorTable aStart;
+ const basegfx::B2DVector aAxisA(aX + aY);
- aStart.add(rTLFromRight, aX + aY, aX, false);
- aStart.add(rTLFromBottom, aX + aY, aY, false);
+ aStart.add(rTLFromRight, aAxisA, aX, false);
+ aStart.add(rTLFromBottom, aAxisA, aY, false);
aStart.sort();
/// Fill bottom-right Style Table
const Style& rBRFromBottom(GetCellStyleRight(_nLastCol, _nLastRow));
const Style& rBRFromLeft(GetCellStyleBottom(_nLastCol, _nLastRow));
StyleVectorTable aEnd;
+ const basegfx::B2DVector aAxisB(-aX -aY);
- aEnd.add(rBRFromBottom, -aX -aY, -aY, true);
- aEnd.add(rBRFromLeft, -aX -aY, -aX, true);
+ aEnd.add(rBRFromBottom, aAxisB, -aY, true);
+ aEnd.add(rBRFromLeft, aAxisB, -aX, true);
aEnd.sort();
CreateBorderPrimitives(
@@ -1233,18 +1237,20 @@ drawinglayer::primitive2d::Primitive2DContainer Array::CreateB2DPrimitiveRange(
const Style& rBLFromTop(GetCellStyleLeft(_nFirstCol, _nLastRow));
const Style& rBLFromBottom(GetCellStyleBottom(_nFirstCol, _nLastRow));
StyleVectorTable aStart;
+ const basegfx::B2DVector aAxisA(aX - aY);
- aStart.add(rBLFromTop, aX - aY, -aY, true);
- aStart.add(rBLFromBottom, aX - aY, aX, false);
+ aStart.add(rBLFromTop, aAxisA, -aY, true);
+ aStart.add(rBLFromBottom, aAxisA, aX, false);
aStart.sort();
/// Fill top-right Style Table
- const Style& rTRFromBottom(GetCellStyleRight(_nLastCol, _nFirstRow));
const Style& rTRFromLeft(GetCellStyleTop(_nLastCol, _nFirstRow));
+ const Style& rTRFromBottom(GetCellStyleRight(_nLastCol, _nFirstRow));
StyleVectorTable aEnd;
+ const basegfx::B2DVector aAxisB(aY - aX);
- aEnd.add(rTRFromBottom, aY - aX, -aY, true);
- aEnd.add(rTRFromLeft, aY - aX, -aX, false);
+ aEnd.add(rTRFromLeft, aAxisB, -aX, true);
+ aEnd.add(rTRFromBottom, aAxisB, aY, false);
aEnd.sort();
CreateBorderPrimitives(
diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx
index ae2645f66e80..61d582cd94ff 100644
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -218,10 +218,11 @@ namespace sdr
/// Fill bottom-right Style Table
svx::frame::StyleVectorTable aEnd;
+ const basegfx::B2DVector aAxis(-rX);
- aEnd.add(rRightA, -rX, -aY, bHor); // bHor ? true : false));
- aEnd.add(rRightB, -rX, rX, false); // bHor ? false : false));
- aEnd.add(rRightC, -rX, aY, !bHor); // bHor ? false : true));
+ aEnd.add(rRightA, aAxis, -aY, bHor); // bHor ? true : false));
+ aEnd.add(rRightB, aAxis, rX, false); // bHor ? false : false));
+ aEnd.add(rRightC, aAxis, aY, !bHor); // bHor ? false : true));
aEnd.sort();
CreateBorderPrimitives(
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 739a6e933774..811793005d8b 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2555,10 +2555,11 @@ void SwTabFramePainter::PaintLines(OutputDevice& rDev, const SwRect& rRect) cons
aStartVector.sort();
svx::frame::StyleVectorTable aEndVector;
+ const basegfx::B2DVector aAxis(-aX);
- 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.add(aStyles[ 4 ], aAxis, -aY, true); // aRFromT
+ aEndVector.add(aStyles[ 5 ], aAxis, aX, false); // aRFromR
+ aEndVector.add(aStyles[ 6 ], aAxis, aY, false); // aRFromB
aEndVector.sort();
CreateBorderPrimitives(
@@ -2588,10 +2589,11 @@ void SwTabFramePainter::PaintLines(OutputDevice& rDev, const SwRect& rRect) cons
aStartVector.sort();
svx::frame::StyleVectorTable aEndVector;
+ const basegfx::B2DVector aAxis(-aX);
- 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.add(aStyles[ 6 ], aAxis, -aY, false); // aBFromR
+ aEndVector.add(aStyles[ 5 ], aAxis, aX, false); // aBFromB
+ aEndVector.add(aStyles[ 4 ], aAxis, aY, true); // aBFromL
aEndVector.sort();
CreateBorderPrimitives(
More information about the Libreoffice-commits
mailing list