diff options
Diffstat (limited to 'svx/source/table')
| -rw-r--r-- | svx/source/table/cell.cxx | 8 | ||||
| -rw-r--r-- | svx/source/table/svdotable.cxx | 4 | ||||
| -rw-r--r-- | svx/source/table/tablelayouter.cxx | 12 | ||||
| -rw-r--r-- | svx/source/table/tablertfimporter.cxx | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 7878426e1fe8..b7598208bbba 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -590,10 +590,10 @@ const Rectangle& Cell::GetCurrentBoundRect() const void Cell::TakeTextAnchorRect(Rectangle& rAnchorRect) const { - rAnchorRect.nLeft = maCellRect.nLeft + GetTextLeftDistance(); - rAnchorRect.nRight = maCellRect.nRight - GetTextRightDistance(); - rAnchorRect.nTop = maCellRect.nTop + GetTextUpperDistance(); - rAnchorRect.nBottom = maCellRect.nBottom - GetTextLowerDistance(); + rAnchorRect.Left() = maCellRect.Left() + GetTextLeftDistance(); + rAnchorRect.Right() = maCellRect.Right() - GetTextRightDistance(); + rAnchorRect.Top() = maCellRect.Top() + GetTextUpperDistance(); + rAnchorRect.Bottom() = maCellRect.Bottom() - GetTextLowerDistance(); } // ----------------------------------------------------------------------------- diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index c8be6a5bac5d..6d12c9bb5135 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -1040,8 +1040,8 @@ TableHitKind SdrTableObj::CheckTableHit( const Point& rPos, sal_Int32& rnX, sal_ const sal_Int32 nColCount = mpImpl->getColumnCount(); const sal_Int32 nRowCount = mpImpl->getRowCount(); - sal_Int32 nX = rPos.X() + nTol - aRect.nLeft; - sal_Int32 nY = rPos.Y() + nTol - aRect.nTop; + sal_Int32 nX = rPos.X() + nTol - aRect.Left(); + sal_Int32 nY = rPos.Y() + nTol - aRect.Top(); if( (nX < 0) || (nX > (aRect.GetWidth() + nTol)) || (nY < 0) || (nY > (aRect.GetHeight() + nTol) ) ) return SDRTABLEHIT_NONE; diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index 2a806f0661a2..e5f3ea8aae58 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -864,11 +864,11 @@ void TableLayouter::updateCells( Rectangle& rRectangle ) getCellArea( aPos, aCellArea ); Rectangle aCellRect; - aCellRect.nLeft = aCellArea.getMinX(); - aCellRect.nRight = aCellArea.getMaxX(); - aCellRect.nTop = aCellArea.getMinY(); - aCellRect.nBottom = aCellArea.getMaxY(); - aCellRect.Move( rRectangle.nLeft, rRectangle.nTop ); + aCellRect.Left() = aCellArea.getMinX(); + aCellRect.Right() = aCellArea.getMaxX(); + aCellRect.Top() = aCellArea.getMinY(); + aCellRect.Bottom() = aCellArea.getMaxY(); + aCellRect.Move( rRectangle.Left(), rRectangle.Top() ); xCell->setCellRect( aCellRect ); } } @@ -1115,7 +1115,7 @@ void TableLayouter::DistributeRows( ::Rectangle& rArea, sal_Int32 nFirstRow, sal if( nHeight < nMinHeight ) { sal_Int32 nNeededHeight = nRows * nMinHeight; - rArea.nBottom += nNeededHeight - nAllHeight; + rArea.Bottom() += nNeededHeight - nAllHeight; nHeight = nMinHeight; nAllHeight = nRows * nMinHeight; } diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index a0f6b8a3ae6a..38a060a2ad49 100644 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -296,7 +296,7 @@ void SdrTableRTFParser::FillTable() } Rectangle aRect( mrTableObj.GetSnapRect() ); - aRect.nRight = aRect.nLeft + nLastEdge; + aRect.Right() = aRect.Left() + nLastEdge; mrTableObj.NbcSetSnapRect( aRect ); } |