Don't use output rArea when TableLayouter::getCellArea returns false

...when xCell->isMerged, as happens during CppunitTest_sd_filters_test.
aCellArea will be "empty" (i.e., getMinX()==SAL_MAX_INT32 etc.) and the
aCellRect.Move calculation will overflow for 32-bit long.

Change-Id: I12649234c060edd9f2cab1792cf75335ae22b730

1 files changed, 10 insertions, 9 deletions

diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 0c5368486386..0793e77d524a 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -860,15 +860,16 @@ void TableLayouter::updateCells( Rectangle& rRectangle )
             if( xCell.is() )
             {
                 basegfx::B2IRectangle aCellArea;
-                getCellArea( xCell, aPos, aCellArea );
-
-                Rectangle aCellRect;
-                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 );
+                if( getCellArea( xCell, aPos, aCellArea ) )
+                {
+                    Rectangle aCellRect;
+                    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 );
+                }
             }
         }
     }