[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sc/source

[Jochen Nitschke]

 sc/source/filter/excel/xelink.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e9c1b787b5b42837f0586add87f76e78b1eba529
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Tue Jan 10 13:31:59 2017 +0100

    fix interchanged parameters
    
    first one found by cppcheck
    > sc/source/filter/excel/xelink.cxx 637
    > funcArgOrderDifferent
    >  warning	Function 'InsertExtName' argument order different:
    >  declaration 'rnExtSheet, rnExtName, rUrl, rName, rArray'
    >  definition 'rnExtSheet, rnExtName, rName, rUrl, rArray'
    
    Change-Id: I6b9bdbf58a8eb271e873bf8dfc30041a72419f59
    Reviewed-on: https://gerrit.libreoffice.org/32927
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit ebadc6017827edef2bca7ed389d1af9ebffb96e9)
    Reviewed-on: https://gerrit.libreoffice.org/32989
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index 2bfe779..bd23511 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -2465,7 +2465,7 @@ bool XclExpLinkManagerImpl8::InsertDde(
 }
 
 bool XclExpLinkManagerImpl8::InsertExtName( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName,
-        const OUString& rName, const OUString& rUrl, const ScExternalRefCache::TokenArrayRef& rArray )
+        const OUString& rUrl, const OUString& rName, const ScExternalRefCache::TokenArrayRef& rArray )
 {
     sal_uInt16 nSupbook;
     if( maSBBuffer.InsertExtName( nSupbook, rnExtName, rUrl, rName, rArray ) )
@@ -2612,7 +2612,7 @@ bool XclExpLinkManager::InsertDde(
 }
 
 bool XclExpLinkManager::InsertExtName(
-    sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, const OUString& rName, const OUString& rUrl,
+    sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, const OUString& rUrl, const OUString& rName,
     const ScExternalRefCache::TokenArrayRef& rArray )
 {
     return mxImpl->InsertExtName(rnExtSheet, rnExtName, rUrl, rName, rArray);