[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - tools/source

[Dennis E. Hamilton]

 tools/source/generic/poly2.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d0e2741d35d4761dd1731edc03e626761d27d5a0
Author: Dennis E. Hamilton <orcmid at apache.org>
Date:   Tue Jul 19 22:19:03 2016 +0000

    Guard removal and replacement of unavailable slots per #i127045#

diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx
index c0f5394044d..d584d31 100644
--- a/tools/source/generic/poly2.cxx
+++ b/tools/source/generic/poly2.cxx
@@ -198,6 +198,7 @@ void PolyPolygon::Remove( sal_uInt16 nPos )
 {
     DBG_CHKTHIS( PolyPolygon, NULL );
     DBG_ASSERT( nPos < Count(), "PolyPolygon::Remove(): nPos >= nSize" );
+    if ( nPos >= Count() ) return; // not removable
 
     if ( mpImplPolyPolygon->mnRefCount > 1 )
     {
@@ -218,6 +219,7 @@ void PolyPolygon::Replace( const Polygon& rPoly, sal_uInt16 nPos )
 {
     DBG_CHKTHIS( PolyPolygon, NULL );
     DBG_ASSERT( nPos < Count(), "PolyPolygon::Replace(): nPos >= nSize" );
+    if ( nPos >= Count() ) return; // not replaceable
 
     if ( mpImplPolyPolygon->mnRefCount > 1 )
     {
commit cca5d508f25af73eb083efb1f0d70b20ab69e1ec
Author: Dennis E. Hamilton <orcmid at apache.org>
Date:   Tue Jul 19 22:08:51 2016 +0000

    Clean up inconsistent whitespace (tabs vs spaces)