[Libreoffice-commits] core.git: 2 commits - stoc/source svx/source

[Caolán McNamara]

 stoc/source/invocation/invocation.cxx |   18 ------------------
 svx/source/table/tablelayouter.cxx    |    2 +-
 2 files changed, 1 insertion(+), 19 deletions(-)

New commits:
commit 914a35e8467252da43f864c86b0a820d8c0bd38e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Feb 4 20:45:30 2018 +0000

    ofz#4949 Integer-overflow
    
    Change-Id: Ib8928108c987989ab849e8d7e1a85078f6d93050
    Reviewed-on: https://gerrit.libreoffice.org/49216
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 9a31f56288cc..9bca986844c3 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -798,7 +798,7 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle& rArea, bool bFit )
 
     // now scale if wanted and needed
     if( bFit && nCurrentHeight != rArea.getHeight() )
-        distribute( maRows, rArea.getHeight() - nCurrentHeight );
+        distribute(maRows, o3tl::saturating_sub<sal_Int32>(rArea.getHeight(), nCurrentHeight));
 
     // last step, update left edges
     sal_Int32 nNewHeight = 0;
commit 52030a3a65657dc5a3aed3208b25b33df7277e1b
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Feb 5 10:57:07 2018 +0200

    Remove code that has been commented out since initial import in 2000
    
    Change-Id: I42aaed79e88b6cb8bb0b93aa49555aad45050fe7

diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx
index f639e55bdee8..f564425c4202 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -357,10 +357,6 @@ void Invocation_Impl::setMaterial( const Any& rMaterial )
         _xNameContainer.set( _xDirect, UNO_QUERY );
         _xENDirect.set( _xDirect, UNO_QUERY );
         _xDirect2.set( _xDirect, UNO_QUERY );
-
-        // only once!!!
-        //_xIntrospectionAccess = XIntrospectionAccessRef();
-        //_xPropertySet         = XPropertySetRef();
     }
     else
     {
@@ -417,20 +413,6 @@ void Invocation_Impl::setMaterial( const Any& rMaterial )
                 _xENIntrospection.set( _xIntrospectionAccess, UNO_QUERY );
             }
         }
-        /* only once !!!
-        _xDirect = XInvocationRef();
-        if( !_xIntrospectionAccess.is() )
-        {
-            // reset
-            _xElementAccess     = XElementAccessRef();
-            _xEnumerationAccess = XEnumerationAccessRef();
-            _xIndexAccess       = XIndexAccessRef();
-            _xIndexContainer    = XIndexContainerRef();
-            _xNameAccess        = XNameAccessRef();
-            _xNameContainer     = XNameContainerRef();
-            _xPropertySet       = XPropertySetRef();
-        }
-        */
     }
 }