diff options
author | Noel Grandin <noel@peralex.com> | 2016-03-04 13:44:33 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-03-04 14:01:19 +0200 |
commit | 9b3b0b1cebf9aae8a8da43b26df9b907b69d5c03 (patch) | |
tree | 1eca982d4afb4654ea347b444cacca6b8ff1e633 | |
parent | 1fd781e7cd33f325ec7e467ecd49e0cb6ff4762b (diff) |
loplugin:unuseddefaultparam in filter
Change-Id: Ieaad3145c01dc4ea7b3e7eb7859db89ebd1d7fe1
-rw-r--r-- | filter/source/flash/swfwriter.cxx | 11 | ||||
-rw-r--r-- | filter/source/flash/swfwriter.hxx | 4 | ||||
-rw-r--r-- | filter/source/graphicfilter/eps/eps.cxx | 6 | ||||
-rw-r--r-- | filter/source/msfilter/eschesdo.hxx | 4 | ||||
-rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 15 | ||||
-rw-r--r-- | include/filter/msfilter/msdffimp.hxx | 3 |
6 files changed, 17 insertions, 26 deletions
diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx index 6838e71b825c..fbd90f721af1 100644 --- a/filter/source/flash/swfwriter.cxx +++ b/filter/source/flash/swfwriter.cxx @@ -206,13 +206,13 @@ void Writer::endSprite() } -void Writer::placeShape( sal_uInt16 nID, sal_uInt16 nDepth, sal_Int32 x, sal_Int32 y, sal_uInt16 nClip ) +void Writer::placeShape( sal_uInt16 nID, sal_uInt16 nDepth, sal_Int32 x, sal_Int32 y ) { startTag( TAG_PLACEOBJECT2 ); BitStream aBits; - aBits.writeUB( sal_uInt32(nClip != 0), 1 ); // Has Clip Actions? + aBits.writeUB( sal_uInt32(0), 1 ); // Has Clip Actions? aBits.writeUB( 0, 1 ); // reserved aBits.writeUB( sal_uInt32(0), 1 ); // has a name aBits.writeUB( 0, 1 ); // no ratio @@ -231,9 +231,6 @@ void Writer::placeShape( sal_uInt16 nID, sal_uInt16 nDepth, sal_Int32 x, sal_Int _Int16(static_cast<long>(map100thmm(y)*mnDocYScale)))); mpTag->addMatrix( aMatrix ); // transformation matrix - if( nClip != 0 ) - mpTag->addUI16( nClip ); - endTag(); } @@ -282,7 +279,7 @@ void Writer::showFrame() } -sal_uInt16 Writer::defineShape( const GDIMetaFile& rMtf, sal_Int16 x ) +sal_uInt16 Writer::defineShape( const GDIMetaFile& rMtf ) { mpVDev->SetMapMode( rMtf.GetPrefMapMode() ); Impl_writeActions( rMtf ); @@ -301,7 +298,7 @@ sal_uInt16 Writer::defineShape( const GDIMetaFile& rMtf, sal_Int16 x ) sal_uInt16 iDepth = 1; for(; aIter != aEnd; ++aIter) { - placeShape( *aIter, iDepth++, x, 0 ); + placeShape( *aIter, iDepth++, 0, 0 ); } endSprite(); diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx index 62ac8ca3bd64..5337f9ad19c6 100644 --- a/filter/source/flash/swfwriter.hxx +++ b/filter/source/flash/swfwriter.hxx @@ -284,7 +284,7 @@ public: A character id of a flash sprite is returned that contains all geometry from the metafile. */ - sal_uInt16 defineShape( const GDIMetaFile& rMtf, sal_Int16 x = 0 ); + sal_uInt16 defineShape( const GDIMetaFile& rMtf ); /** defines a bitmap and returns its flash id. */ @@ -293,7 +293,7 @@ public: // control tags /** inserts a place shape tag into the movie stream or the current sprite */ - void placeShape( sal_uInt16 nID, sal_uInt16 nDepth, sal_Int32 x, sal_Int32 y, sal_uInt16 nClipDepth = 0 ); + void placeShape( sal_uInt16 nID, sal_uInt16 nDepth, sal_Int32 x, sal_Int32 y ); /** inserts a remove shape tag into the movie stream or the current sprite */ void removeShape( sal_uInt16 nDepth ); diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 786c1128d732..ab24328b7742 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -167,7 +167,7 @@ private: void ImplWriteF( sal_Int32 nNumb, sal_uLong nCount = 3, sal_uLong nMode = PS_SPACE ); // writes a double in ASCII format to stream - void ImplWriteDouble( double, sal_uLong nMode = PS_SPACE ); + void ImplWriteDouble( double ); // writes a long in ASCII format to stream void ImplWriteLong( sal_Int32 nNumb, sal_uLong nMode = PS_SPACE ); @@ -2342,7 +2342,7 @@ void PSWriter::ImplWriteLong(sal_Int32 nNumber, sal_uLong nMode) ImplExecMode(nMode); } -void PSWriter::ImplWriteDouble( double fNumber, sal_uLong nMode ) +void PSWriter::ImplWriteDouble( double fNumber ) { sal_Int32 nPTemp = (sal_Int32)fNumber; sal_Int32 nATemp = labs( (sal_Int32)( ( fNumber - nPTemp ) * 100000 ) ); @@ -2381,7 +2381,7 @@ void PSWriter::ImplWriteDouble( double fNumber, sal_uLong nMode ) if ( zCount ) mpPS->SeekRel( zCount ); } - ImplExecMode( nMode ); + ImplExecMode( PS_SPACE ); } /// Writes the number to stream: nNumber / ( 10^nCount ) diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx index 6a3f58c6ea25..7473676cae91 100644 --- a/filter/source/msfilter/eschesdo.hxx +++ b/filter/source/msfilter/eschesdo.hxx @@ -56,8 +56,8 @@ public: bool ImplGetPropertyValue( const sal_Unicode* pString ); bool ImplGetPropertyValue( const OUString& rString ) { return ImplGetPropertyValue(rString.getStr()); } - sal_Int32 ImplGetInt32PropertyValue( const sal_Unicode* pStr, sal_uInt32 nDef = 0 ) - { return ImplGetPropertyValue( pStr ) ? *static_cast<sal_Int32 const *>(mAny.getValue()) : nDef; } + sal_Int32 ImplGetInt32PropertyValue( const sal_Unicode* pStr ) + { return ImplGetPropertyValue( pStr ) ? *static_cast<sal_Int32 const *>(mAny.getValue()) : 0; } sal_Int32 ImplGetInt32PropertyValue( const OUString& rStr ) { return ImplGetInt32PropertyValue(rStr.getStr()); } diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 1bbd826682fb..c62dea472fef 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -3290,7 +3290,7 @@ bool SvxMSDffManager::SeekToRec( SvStream& rSt, sal_uInt16 nRecId, sal_uLong nMa return bRet; } -bool SvxMSDffManager::SeekToRec2( sal_uInt16 nRecId1, sal_uInt16 nRecId2, sal_uLong nMaxFilePos, DffRecordHeader* pRecHd ) const +bool SvxMSDffManager::SeekToRec2( sal_uInt16 nRecId1, sal_uInt16 nRecId2, sal_uLong nMaxFilePos ) const { bool bRet = false; sal_uLong nFPosMerk = rStCtrl.Tell(); // remember FilePos for conditionally later restoration @@ -3302,16 +3302,11 @@ bool SvxMSDffManager::SeekToRec2( sal_uInt16 nRecId1, sal_uInt16 nRecId2, sal_uL if ( aHd.nRecType == nRecId1 || aHd.nRecType == nRecId2 ) { bRet = true; - if ( pRecHd ) - *pRecHd = aHd; - else + bool bSeekSuccess = aHd.SeekToBegOfRecord(rStCtrl); + if (!bSeekSuccess) { - bool bSeekSuccess = aHd.SeekToBegOfRecord(rStCtrl); - if (!bSeekSuccess) - { - bRet = false; - break; - } + bRet = false; + break; } } if ( !bRet ) diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 3e3f414af5fa..e0c23eeda75f 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -525,8 +525,7 @@ public: sal_uLong nSkipCount = 0 ); bool SeekToRec2( sal_uInt16 nRecId1, sal_uInt16 nRecId2, - sal_uLong nMaxFilePos, - DffRecordHeader* pRecHd = nullptr ) const; + sal_uLong nMaxFilePos ) const; static OUString MSDFFReadZString( SvStream& rIn, sal_uInt32 nMaxLen, |