summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-05-10 19:19:10 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-05-12 12:30:53 +0200
commitdd6d7992d6f16133fafa7a617cf5fa0ba1ae37cc (patch)
tree49da40c8dbfa15a9fde368e0a8b69a623f357eaf /svtools
parent8891472e1f9c5e452a4e8d55241eeba118274092 (diff)
loplugin:constantparam
Change-Id: I67d74072c776c32a1f91df94c621efe180baf5dc Reviewed-on: https://gerrit.libreoffice.org/37481 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/misc/imap.cxx8
-rw-r--r--svtools/source/misc/imap2.cxx36
-rw-r--r--svtools/source/misc/transfer.cxx4
-rw-r--r--svtools/source/misc/transfer2.cxx2
-rw-r--r--svtools/source/table/tablecontrol_impl.cxx2
5 files changed, 26 insertions, 26 deletions
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 7888c8ee5099..a4b5b7ef84d4 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -910,7 +910,7 @@ void ImageMap::ImpReadImageMap( SvStream& rIStm, size_t nCount, const OUString&
|*
\******************************************************************************/
-void ImageMap::Write( SvStream& rOStm, const OUString& rBaseURL ) const
+void ImageMap::Write( SvStream& rOStm ) const
{
IMapCompat* pCompat;
OUString aImageName( GetName() );
@@ -934,7 +934,7 @@ void ImageMap::Write( SvStream& rOStm, const OUString& rBaseURL ) const
delete pCompat;
- ImpWriteImageMap( rOStm, rBaseURL );
+ ImpWriteImageMap( rOStm, OUString() );
rOStm.SetEndian( nOldFormat );
}
@@ -946,7 +946,7 @@ void ImageMap::Write( SvStream& rOStm, const OUString& rBaseURL ) const
|*
\******************************************************************************/
-void ImageMap::Read( SvStream& rIStm, const OUString& rBaseURL )
+void ImageMap::Read( SvStream& rIStm )
{
char cMagic[6];
SvStreamEndian nOldFormat = rIStm.GetEndian();
@@ -975,7 +975,7 @@ void ImageMap::Read( SvStream& rIStm, const OUString& rBaseURL )
// here one can read in newer versions
delete pCompat;
- ImpReadImageMap( rIStm, nCount, rBaseURL );
+ ImpReadImageMap( rIStm, nCount, OUString() );
}
else
diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx
index 6f01c15a1fcc..e9ccd365606d 100644
--- a/svtools/source/misc/imap2.cxx
+++ b/svtools/source/misc/imap2.cxx
@@ -144,16 +144,16 @@ void ImageMap::Write( SvStream& rOStm, sal_uLong nFormat ) const
{
switch( nFormat )
{
- case IMAP_FORMAT_BIN : Write( rOStm, "" ); break;
- case IMAP_FORMAT_CERN : ImpWriteCERN( rOStm, "" ); break;
- case IMAP_FORMAT_NCSA : ImpWriteNCSA( rOStm, "" ); break;
+ case IMAP_FORMAT_BIN : Write( rOStm ); break;
+ case IMAP_FORMAT_CERN : ImpWriteCERN( rOStm ); break;
+ case IMAP_FORMAT_NCSA : ImpWriteNCSA( rOStm ); break;
default:
break;
}
}
-void ImageMap::ImpWriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const
+void ImageMap::ImpWriteCERN( SvStream& rOStm ) const
{
size_t nCount = maList.size();
@@ -164,15 +164,15 @@ void ImageMap::ImpWriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const
switch( pObj->GetType() )
{
case IMAP_OBJ_RECTANGLE:
- static_cast<IMapRectangleObject*>( pObj )->WriteCERN( rOStm, rBaseURL );
+ static_cast<IMapRectangleObject*>( pObj )->WriteCERN( rOStm, OUString() );
break;
case IMAP_OBJ_CIRCLE:
- static_cast<IMapCircleObject*>( pObj )->WriteCERN( rOStm, rBaseURL );
+ static_cast<IMapCircleObject*>( pObj )->WriteCERN( rOStm, OUString() );
break;
case IMAP_OBJ_POLYGON:
- static_cast<IMapPolygonObject*>( pObj )->WriteCERN( rOStm, rBaseURL );
+ static_cast<IMapPolygonObject*>( pObj )->WriteCERN( rOStm, OUString() );
break;
default:
@@ -181,7 +181,7 @@ void ImageMap::ImpWriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const
}
}
-void ImageMap::ImpWriteNCSA( SvStream& rOStm, const OUString& rBaseURL ) const
+void ImageMap::ImpWriteNCSA( SvStream& rOStm ) const
{
size_t nCount = maList.size();
@@ -192,15 +192,15 @@ void ImageMap::ImpWriteNCSA( SvStream& rOStm, const OUString& rBaseURL ) const
switch( pObj->GetType() )
{
case IMAP_OBJ_RECTANGLE:
- static_cast<IMapRectangleObject*>( pObj )->WriteNCSA( rOStm, rBaseURL );
+ static_cast<IMapRectangleObject*>( pObj )->WriteNCSA( rOStm, OUString() );
break;
case IMAP_OBJ_CIRCLE:
- static_cast<IMapCircleObject*>( pObj )->WriteNCSA( rOStm, rBaseURL );
+ static_cast<IMapCircleObject*>( pObj )->WriteNCSA( rOStm, OUString() );
break;
case IMAP_OBJ_POLYGON:
- static_cast<IMapPolygonObject*>( pObj )->WriteNCSA( rOStm, rBaseURL );
+ static_cast<IMapPolygonObject*>( pObj )->WriteNCSA( rOStm, OUString() );
break;
default:
@@ -218,9 +218,9 @@ sal_uLong ImageMap::Read( SvStream& rIStm, sal_uLong nFormat )
switch ( nFormat )
{
- case IMAP_FORMAT_BIN : Read( rIStm, "" ); break;
- case IMAP_FORMAT_CERN : nRet = ImpReadCERN( rIStm, "" ); break;
- case IMAP_FORMAT_NCSA : nRet = ImpReadNCSA( rIStm, "" ); 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;
@@ -232,14 +232,14 @@ sal_uLong ImageMap::Read( SvStream& rIStm, sal_uLong nFormat )
return nRet;
}
-sal_uLong ImageMap::ImpReadCERN( SvStream& rIStm, const OUString& rBaseURL )
+sal_uLong ImageMap::ImpReadCERN( SvStream& rIStm )
{
// delete old content
ClearImageMap();
OString aStr;
while ( rIStm.ReadLine( aStr ) )
- ImpReadCERNLine( aStr, rBaseURL );
+ ImpReadCERNLine( aStr, OUString() );
return IMAP_ERR_OK;
}
@@ -373,14 +373,14 @@ OUString ImageMap::ImpReadCERNURL( const char** ppStr, const OUString& rBaseURL
return INetURLObject::GetAbsURL( rBaseURL, aStr );
}
-sal_uLong ImageMap::ImpReadNCSA( SvStream& rIStm, const OUString& rBaseURL )
+sal_uLong ImageMap::ImpReadNCSA( SvStream& rIStm )
{
// delete old content
ClearImageMap();
OString aStr;
while ( rIStm.ReadLine( aStr ) )
- ImpReadNCSALine( aStr, rBaseURL );
+ ImpReadNCSALine( aStr, OUString() );
return IMAP_ERR_OK;
}
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 437745bc9106..dd903daf47d2 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -713,7 +713,7 @@ bool TransferableHelper::SetImageMap( const ImageMap& rIMap )
SvMemoryStream aMemStm( 8192, 8192 );
aMemStm.SetVersion( SOFFICE_FILEFORMAT_50 );
- rIMap.Write( aMemStm, OUString() );
+ rIMap.Write( aMemStm );
maAny <<= Sequence< sal_Int8 >( static_cast< const sal_Int8* >( aMemStm.GetData() ), aMemStm.Seek( STREAM_SEEK_TO_END ) );
return( maAny.hasValue() );
@@ -1767,7 +1767,7 @@ bool TransferableDataHelper::GetImageMap( const css::datatransfer::DataFlavor& r
if( bRet )
{
- rIMap.Read( *xStm, OUString() );
+ rIMap.Read( *xStm );
bRet = ( xStm->GetError() == ERRCODE_NONE );
}
diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx
index 34a55d768d58..5e9b8374895f 100644
--- a/svtools/source/misc/transfer2.cxx
+++ b/svtools/source/misc/transfer2.cxx
@@ -463,7 +463,7 @@ void TransferDataContainer::CopyImageMap( const ImageMap& rImgMap )
{
SvMemoryStream aMemStm( 8192, 8192 );
aMemStm.SetVersion( SOFFICE_FILEFORMAT_50 );
- rImgMap.Write( aMemStm, OUString() );
+ rImgMap.Write( aMemStm );
CopyAnyData( SotClipboardFormatId::SVIM, static_cast<sal_Char const *>(aMemStm.GetData()),
aMemStm.Seek( STREAM_SEEK_TO_END ) );
}
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 8046143f1b62..fa5d0ca21bd0 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -2432,7 +2432,7 @@ namespace svt { namespace table
void TableControl_Impl::impl_commitAccessibleEvent( sal_Int16 const i_eventID, Any const & i_newValue )
{
if ( impl_isAccessibleAlive() )
- m_pAccessibleTable->commitEvent( i_eventID, i_newValue, Any() );
+ m_pAccessibleTable->commitEvent( i_eventID, i_newValue );
}