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 /svx | |
| parent | 53599a9a183878cdf435f80939f8d301a3909d78 (diff) | |
borderline: Added merge BorderLinePrimitive2D
Added BorderLinePrimitive2D merges for Writer and fixes.
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/framelinkarray.cxx | 13 | ||||
| -rw-r--r-- | svx/source/table/viewcontactoftableobj.cxx | 12 |
2 files changed, 6 insertions, 19 deletions
diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx index 2d81caebd3a7..db54294640c5 100644 --- a/svx/source/dialog/framelinkarray.cxx +++ b/svx/source/dialog/framelinkarray.cxx @@ -249,9 +249,6 @@ struct ArrayImpl long GetColPosition( size_t nCol ) const; long GetRowPosition( size_t nRow ) const; - long GetColWidth( size_t nFirstCol, size_t nLastCol ) const; - long GetRowHeight( size_t nFirstRow, size_t nLastRow ) const; - bool HasCellRotation() const; }; @@ -375,16 +372,6 @@ long ArrayImpl::GetRowPosition( size_t nRow ) const return maYCoords[ nRow ]; } -long ArrayImpl::GetColWidth( size_t nFirstCol, size_t nLastCol ) const -{ - return GetColPosition( nLastCol + 1 ) - GetColPosition( nFirstCol ); -} - -long ArrayImpl::GetRowHeight( size_t nFirstRow, size_t nLastRow ) const -{ - return GetRowPosition( nLastRow + 1 ) - GetRowPosition( nFirstRow ); -} - bool ArrayImpl::HasCellRotation() const { // check cell array diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx index 52d6ce42b943..90d143665140 100644 --- a/svx/source/table/viewcontactoftableobj.cxx +++ b/svx/source/table/viewcontactoftableobj.cxx @@ -208,14 +208,14 @@ namespace sdr const basegfx::B2DVector aY(basegfx::getNormalizedPerpendicular(rX)); /// Fill top-left Style Table - if(rLeftA.IsUsed()) aStart.push_back(svx::frame::StyleVectorCombination(rLeftA, -aY, bHor ? true : false)); - if(rLeftB.IsUsed()) aStart.push_back(svx::frame::StyleVectorCombination(rLeftB, -rX, bHor ? true : true)); - if(rLeftC.IsUsed()) aStart.push_back(svx::frame::StyleVectorCombination(rLeftC, aY, bHor ? false : true)); + if(rLeftA.IsUsed()) aStart.push_back(svx::frame::StyleVectorCombination(rLeftA, -aY, bHor)); // bHor ? true : false)); + if(rLeftB.IsUsed()) aStart.push_back(svx::frame::StyleVectorCombination(rLeftB, -rX, true)); // bHor ? true : true)); + if(rLeftC.IsUsed()) aStart.push_back(svx::frame::StyleVectorCombination(rLeftC, aY, !bHor)); // bHor ? false : true)); /// Fill bottom-right Style Table - if(rRightA.IsUsed()) aEnd.push_back(svx::frame::StyleVectorCombination(rRightA, -aY, bHor ? true : false)); - if(rRightB.IsUsed()) aEnd.push_back(svx::frame::StyleVectorCombination(rRightB, rX, bHor ? false : false)); - if(rRightC.IsUsed()) aEnd.push_back(svx::frame::StyleVectorCombination(rRightC, aY, bHor ? false : true)); + if(rRightA.IsUsed()) aEnd.push_back(svx::frame::StyleVectorCombination(rRightA, -aY, bHor)); // bHor ? true : false)); + if(rRightB.IsUsed()) aEnd.push_back(svx::frame::StyleVectorCombination(rRightB, rX, false)); // bHor ? false : false)); + if(rRightC.IsUsed()) aEnd.push_back(svx::frame::StyleVectorCombination(rRightC, aY, !bHor)); // bHor ? false : true)); CreateBorderPrimitives( rContainer, |