diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-31 08:50:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-31 12:58:31 +0100 |
| commit | 693d40fed862614e05fbad167f7f09005683d6da (patch) | |
| tree | a908faedb0c82264de7051a30cfded2c9e6e3289 /oox/source/ole/olehelper.cxx | |
| parent | loplugin:constantparam in sd (diff) | |
| download | core-693d40fed862614e05fbad167f7f09005683d6da.tar.gz core-693d40fed862614e05fbad167f7f09005683d6da.zip | |
loplugin:constantparam in oox,registry,reportdesign
Change-Id: I914fa6c6ef2f660eb6b8570c9c5f86cef477be80
Reviewed-on: https://gerrit.libreoffice.org/44093
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox/source/ole/olehelper.cxx')
| -rw-r--r-- | oox/source/ole/olehelper.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index d1090c6421aa..27703ef6c537 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -300,15 +300,12 @@ bool OleHelper::importStdFont( StdFontInfo& orFontInfo, BinaryInputStream& rInSt return !rInStrm.isEof() && (nVersion <= 1); } -bool OleHelper::importStdPic( StreamDataSequence& orGraphicData, BinaryInputStream& rInStrm, bool bWithGuid ) +bool OleHelper::importStdPic( StreamDataSequence& orGraphicData, BinaryInputStream& rInStrm ) { - if( bWithGuid ) - { - bool bIsStdPic = importGuid( rInStrm ) == OLE_GUID_STDPIC; - OSL_ENSURE( bIsStdPic, "OleHelper::importStdPic - unexpected header GUID, expected StdPic" ); - if( !bIsStdPic ) - return false; - } + bool bIsStdPic = importGuid( rInStrm ) == OLE_GUID_STDPIC; + OSL_ENSURE( bIsStdPic, "OleHelper::importStdPic - unexpected header GUID, expected StdPic" ); + if( !bIsStdPic ) + return false; sal_uInt32 nStdPicId; sal_Int32 nBytes; |