diff options
Diffstat (limited to 'svx/source/table/tablelayouter.cxx')
| -rw-r--r-- | svx/source/table/tablelayouter.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index 87bd4436e7f3..6c55b57bb97c 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -647,9 +647,9 @@ void TableLayouter::LayoutTableWidth( tools::Rectangle& rArea, bool bFit ) } // if we have optimal sized rows, distribute what is given (left) - if( !bFit && !aOptimalColumns.empty() && (nCurrentWidth < rArea.getWidth()) ) + if( !bFit && !aOptimalColumns.empty() && (nCurrentWidth < rArea.getOpenWidth()) ) { - sal_Int32 nLeft = rArea.getWidth() - nCurrentWidth; + sal_Int32 nLeft = rArea.getOpenWidth() - nCurrentWidth; sal_Int32 nDistribute = nLeft / aOptimalColumns.size(); auto iter( aOptimalColumns.begin() ); @@ -697,8 +697,8 @@ void TableLayouter::LayoutTableWidth( tools::Rectangle& rArea, bool bFit ) } // now scale if wanted and needed - if( bFit && (nCurrentWidth != rArea.getWidth()) ) - distribute( maColumns, rArea.getWidth() - nCurrentWidth ); + if( bFit && (nCurrentWidth != rArea.getOpenWidth()) ) + distribute( maColumns, rArea.getOpenWidth() - nCurrentWidth ); // last step, update left edges sal_Int32 nNewWidth = 0; @@ -834,9 +834,9 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle& rArea, bool bFit ) } // if we have optimal sized rows, distribute what is given (left) - if( !bFit && !aOptimalRows.empty() && (nCurrentHeight < rArea.getHeight()) ) + if( !bFit && !aOptimalRows.empty() && (nCurrentHeight < rArea.getOpenHeight()) ) { - sal_Int32 nLeft = rArea.getHeight() - nCurrentHeight; + sal_Int32 nLeft = rArea.getOpenHeight() - nCurrentHeight; sal_Int32 nDistribute = nLeft / aOptimalRows.size(); auto iter( aOptimalRows.begin() ); @@ -881,8 +881,8 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle& rArea, bool bFit ) } // now scale if wanted and needed - if( bFit && nCurrentHeight != rArea.getHeight() ) - distribute(maRows, o3tl::saturating_sub<sal_Int32>(rArea.getHeight(), nCurrentHeight)); + if( bFit && nCurrentHeight != rArea.getOpenHeight() ) + distribute(maRows, o3tl::saturating_sub<sal_Int32>(rArea.getOpenHeight(), nCurrentHeight)); // last step, update left edges sal_Int32 nNewHeight = 0; |