summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-08-08 15:38:59 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-08-11 06:05:32 +0000
commit3716b144265dda695d7dd447dbe692a3f84c588e (patch)
tree6b8d8751e306841102f6808fbb5403dac193c35c /writerfilter
parentb796b24793827583550279d40bfe565c66ad284d (diff)
loplugin:constantparam
Change-Id: Ia06b9b189033b9409d7a59a211866f66a0614886 Reviewed-on: https://gerrit.libreoffice.org/28016 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/dmapper/GraphicImport.cxx12
1 files changed, 5 insertions, 7 deletions
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index c526c6de3b17..168d83aba0a6 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -75,12 +75,11 @@ class XInputStreamHelper : public cppu::WeakImplHelper<io::XInputStream>
const sal_uInt8* m_pBuffer;
const sal_Int32 m_nLength;
sal_Int32 m_nPosition;
- bool m_bBmp;
const sal_uInt8* m_pBMPHeader; //default BMP-header
sal_Int32 m_nHeaderLength;
public:
- XInputStreamHelper(const sal_uInt8* buf, size_t len, bool bBmp);
+ XInputStreamHelper(const sal_uInt8* buf, size_t len);
virtual ~XInputStreamHelper();
virtual ::sal_Int32 SAL_CALL readBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) override;
@@ -90,16 +89,15 @@ public:
virtual void SAL_CALL closeInput( ) throw (io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) override;
};
-XInputStreamHelper::XInputStreamHelper(const sal_uInt8* buf, size_t len, bool bBmp) :
+XInputStreamHelper::XInputStreamHelper(const sal_uInt8* buf, size_t len) :
m_pBuffer( buf ),
m_nLength( len ),
- m_nPosition( 0 ),
- m_bBmp( bBmp )
+ m_nPosition( 0 )
{
static const sal_uInt8 aHeader[] =
{0x42, 0x4d, 0xe6, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 };
m_pBMPHeader = aHeader;
- m_nHeaderLength = m_bBmp ? sizeof( aHeader ) / sizeof(sal_uInt8) : 0;
+ m_nHeaderLength = 0;
}
@@ -1365,7 +1363,7 @@ void GraphicImport::data(const sal_uInt8* buf, size_t len, writerfilter::Referen
beans::PropertyValues aMediaProperties( 1 );
aMediaProperties[0].Name = getPropertyName(PROP_INPUT_STREAM);
- uno::Reference< io::XInputStream > xIStream = new XInputStreamHelper( buf, len, false/*bIsBitmap*/ );
+ uno::Reference< io::XInputStream > xIStream = new XInputStreamHelper( buf, len );
aMediaProperties[0].Value <<= xIStream;
uno::Reference<beans::XPropertySet> xPropertySet;