make loplugin constantparam smarter about string params

Change-Id: Id3df69b38fd35f46735246a6d307a89aa10d4294
Reviewed-on: https://gerrit.libreoffice.org/37426
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 16 insertions, 20 deletions

diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx
index 1c86d6d4bd85..6f01c15a1fcc 100644
--- a/svtools/source/misc/imap2.cxx
+++ b/svtools/source/misc/imap2.cxx
@@ -140,13 +140,13 @@ void IMapPolygonObject::WriteNCSA( SvStream& rOStm, const OUString& rBaseURL  )
     rOStm.WriteLine(aStrBuf.makeStringAndClear());
 }
 
-void ImageMap::Write( SvStream& rOStm, sal_uLong nFormat, const OUString& rBaseURL ) const
+void ImageMap::Write( SvStream& rOStm, sal_uLong nFormat ) const
 {
     switch( nFormat )
     {
-        case IMAP_FORMAT_BIN : Write( rOStm, rBaseURL ); break;
-        case IMAP_FORMAT_CERN : ImpWriteCERN( rOStm, rBaseURL ); break;
-        case IMAP_FORMAT_NCSA : ImpWriteNCSA( rOStm, rBaseURL ); break;
+        case IMAP_FORMAT_BIN : Write( rOStm, "" ); break;
+        case IMAP_FORMAT_CERN : ImpWriteCERN( rOStm, "" ); break;
+        case IMAP_FORMAT_NCSA : ImpWriteNCSA( rOStm, "" ); break;
 
         default:
         break;
@@ -209,7 +209,7 @@ void ImageMap::ImpWriteNCSA( SvStream& rOStm, const OUString& rBaseURL  ) const
     }
 }
 
-sal_uLong ImageMap::Read( SvStream& rIStm, sal_uLong nFormat, const OUString& rBaseURL  )
+sal_uLong ImageMap::Read( SvStream& rIStm, sal_uLong nFormat  )
 {
     sal_uLong nRet = IMAP_ERR_FORMAT;
 
@@ -218,9 +218,9 @@ sal_uLong ImageMap::Read( SvStream& rIStm, sal_uLong nFormat, const OUString& rB
 
     switch ( nFormat )
     {
-        case IMAP_FORMAT_BIN    : Read( rIStm, rBaseURL ); break;
-        case IMAP_FORMAT_CERN   : nRet = ImpReadCERN( rIStm, rBaseURL ); break;
-        case IMAP_FORMAT_NCSA   : nRet = ImpReadNCSA( rIStm, rBaseURL ); break;
+        case IMAP_FORMAT_BIN    : Read( rIStm, "" ); break;
+        case IMAP_FORMAT_CERN   : nRet = ImpReadCERN( rIStm, "" ); break;
+        case IMAP_FORMAT_NCSA   : nRet = ImpReadNCSA( rIStm, "" ); break;
 
         default:
         break;
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 4fc4f5d5dfb1..8046143f1b62 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -335,8 +335,7 @@ namespace svt { namespace table
         if ( impl_isAccessibleAlive() )
         {
             impl_commitAccessibleEvent( AccessibleEventId::TABLE_MODEL_CHANGED,
-                makeAny( AccessibleTableModelChange( AccessibleTableModelChangeType::INSERT, i_first, i_last, 0, m_pModel->getColumnCount() ) ),
-                Any()
+                makeAny( AccessibleTableModelChange( AccessibleTableModelChangeType::INSERT, i_first, i_last, 0, m_pModel->getColumnCount() ) )
             );
         }
 
@@ -2320,7 +2319,7 @@ namespace svt { namespace table
 
     void TableControl_Impl::commitAccessibleEvent( sal_Int16 const i_eventID )
     {
-        impl_commitAccessibleEvent( i_eventID, Any(), Any() );
+        impl_commitAccessibleEvent( i_eventID, Any() );
     }
 
 
@@ -2430,10 +2429,10 @@ namespace svt { namespace table
     }
 
 
-    void TableControl_Impl::impl_commitAccessibleEvent( sal_Int16 const i_eventID, Any const & i_newValue, Any const & i_oldValue )
+    void TableControl_Impl::impl_commitAccessibleEvent( sal_Int16 const i_eventID, Any const & i_newValue )
     {
         if ( impl_isAccessibleAlive() )
-             m_pAccessibleTable->commitEvent( i_eventID, i_newValue, i_oldValue );
+             m_pAccessibleTable->commitEvent( i_eventID, i_newValue, Any() );
     }
 
 
diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx
index 1cb24ae7af49..b2773971c6c4 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -299,8 +299,7 @@ namespace svt { namespace table
         bool            impl_isAccessibleAlive() const;
         void            impl_commitAccessibleEvent(
                             sal_Int16 const i_eventID,
-                            css::uno::Any const & i_newValue,
-                            css::uno::Any const & i_oldValue
+                            css::uno::Any const & i_newValue
                         );
 
         /** toggles the cursor visibility
diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx
index 36efa809fb4b..df3f7a210970 100644
--- a/svtools/source/urlobj/inetimg.cxx
+++ b/svtools/source/urlobj/inetimg.cxx
@@ -34,7 +34,7 @@ void INetImage::Write( SvStream& rOStm, SotClipboardFormatId nFormat ) const
             OUString sString(
                 aImageURL + OUStringLiteral1(TOKEN_SEPARATOR) + aTargetURL
                 + OUStringLiteral1(TOKEN_SEPARATOR) + aTargetFrame
-                + OUStringLiteral1(TOKEN_SEPARATOR) + aAlternateText
+                + OUStringLiteral1(TOKEN_SEPARATOR) /* + aAlternateText */
                 + OUStringLiteral1(TOKEN_SEPARATOR)
                 + OUString::number(aSizePixel.Width())
                 + OUStringLiteral1(TOKEN_SEPARATOR)
@@ -67,7 +67,7 @@ bool INetImage::Read( SvStream& rIStm, SotClipboardFormatId nFormat )
             aImageURL = sINetImg.getToken( 0, TOKEN_SEPARATOR, nStart );
             aTargetURL = sINetImg.getToken( 0, TOKEN_SEPARATOR, nStart );
             aTargetFrame = sINetImg.getToken( 0, TOKEN_SEPARATOR, nStart );
-            aAlternateText = sINetImg.getToken( 0, TOKEN_SEPARATOR, nStart );
+            /*aAlternateText =*/ sINetImg.getToken( 0, TOKEN_SEPARATOR, nStart );
             aSizePixel.Width() = sINetImg.getToken( 0, TOKEN_SEPARATOR,
                                                     nStart ).toInt32();
             aSizePixel.Height() = sINetImg.getToken( 0, TOKEN_SEPARATOR,
@@ -112,10 +112,8 @@ bool INetImage::Read( SvStream& rIStm, SotClipboardFormatId nFormat )
             if( nAltOffset )
             {
                 rIStm.Seek( nFilePos + nAltOffset );
-                aAlternateText = read_zeroTerminated_uInt8s_ToOUString(rIStm, eSysCSet);
+                /*aAlternateText =*/ read_zeroTerminated_uInt8s_ToOUString(rIStm, eSysCSet);
             }
-            else if( !aAlternateText.isEmpty() )
-                aAlternateText.clear();
 
             if( nAnchorOffset )
             {