From 813a319fe836d1ed1c967928bc044643d0b4c07d Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 11 Jan 2016 16:21:25 +0200 Subject: loplugin:unusedmethods unused return value in include/filter Change-Id: Ibd7d701b6991ae76d0cba0bfbb9cb79150c90c72 Reviewed-on: https://gerrit.libreoffice.org/21362 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- include/filter/msfilter/escherex.hxx | 28 ++++++++++++---------------- include/filter/msfilter/mscodec.hxx | 2 +- include/filter/msfilter/msdffimp.hxx | 2 -- include/filter/msfilter/msocximex.hxx | 2 +- include/filter/msfilter/mstoolbar.hxx | 2 +- include/filter/msfilter/svdfppt.hxx | 4 ++-- 6 files changed, 17 insertions(+), 23 deletions(-) (limited to 'include/filter/msfilter') diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index 4d3bedcb2434..1cb93dcf4568 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -680,8 +680,8 @@ public: sal_uInt32 GetBlibStoreContainerSize( SvStream* pMergePicStreamBSE = nullptr ) const; void WriteBlibStoreContainer( SvStream& rStrm, SvStream* pMergePicStreamBSE = nullptr ); - bool WriteBlibStoreEntry(SvStream& rStrm, sal_uInt32 nBlipId, - bool bWritePictureOffset, sal_uInt32 nResize = 0); + void WriteBlibStoreEntry(SvStream& rStrm, sal_uInt32 nBlipId, + bool bWritePictureOffset, sal_uInt32 nResize = 0); sal_uInt32 GetBlibID( SvStream& rPicOutStream, const OString& rGraphicId, @@ -818,7 +818,7 @@ public: void Commit( SvStream& rSt, sal_uInt16 nVersion = 3, sal_uInt16 nRecType = ESCHER_OPT ); - bool CreateShapeProperties( + void CreateShapeProperties( const css::uno::Reference< css::drawing::XShape > & rXShape ); bool CreateOLEGraphicProperties( @@ -833,12 +833,12 @@ public: ); /** Creates a complex ESCHER_Prop_fillBlip containing the BLIP directly (for Excel charts). */ - bool CreateEmbeddedBitmapProperties( + void CreateEmbeddedBitmapProperties( const OUString& rBitmapUrl, css::drawing::BitmapMode eBitmapMode ); /** Creates a complex ESCHER_Prop_fillBlip containing a hatch style (for Excel charts). */ - bool CreateEmbeddedHatchProperties( + void CreateEmbeddedHatchProperties( const css::drawing::Hatch& rHatch, const Color& rBackColor, bool bFillBackground @@ -906,7 +906,7 @@ public: // Because shadow properties depends to the line and fillstyle, the CreateShadowProperties method should be called at last. // It activ only when at least a FillStyle or LineStyle is set. - bool CreateShadowProperties( + void CreateShadowProperties( const css::uno::Reference< css::beans::XPropertySet > & ); @@ -957,10 +957,10 @@ public: bool PtIsID( sal_uInt32 nID ); void PtInsert( sal_uInt32 nID, sal_uInt32 nOfs ); - sal_uInt32 PtDelete( sal_uInt32 nID ); + void PtDelete( sal_uInt32 nID ); sal_uInt32 PtGetOffsetByID( sal_uInt32 nID ); - sal_uInt32 PtReplace( sal_uInt32 nID, sal_uInt32 nOfs ); - sal_uInt32 PtReplaceOrInsert( sal_uInt32 nID, sal_uInt32 nOfs ); + void PtReplace( sal_uInt32 nID, sal_uInt32 nOfs ); + void PtReplaceOrInsert( sal_uInt32 nID, sal_uInt32 nOfs ); EscherPersistTable(); virtual ~EscherPersistTable(); @@ -1216,7 +1216,7 @@ public: void ReplacePersistOffset( sal_uInt32 nKey, sal_uInt32 nOffset ); sal_uInt32 GetPersistOffset( sal_uInt32 nKey ); bool SeekToPersistOffset( sal_uInt32 nKey ); - bool InsertAtPersistOffset( sal_uInt32 nKey, sal_uInt32 nValue ); // nValue is being inserted into the Stream where it's appropriate (overwrite modus), without that the + void InsertAtPersistOffset( sal_uInt32 nKey, sal_uInt32 nValue ); // nValue is being inserted into the Stream where it's appropriate (overwrite modus), without that the // current StreamPosition changes void SetEditAs( const OUString& rEditAs ); rtl::OUString GetEditAs() { return mEditAs; } @@ -1242,8 +1242,8 @@ public: virtual sal_uInt32 EnterGroup( const OUString& rShapeName, const Rectangle* pBoundRect = nullptr ); sal_uInt32 EnterGroup( const Rectangle* pBoundRect = nullptr ); sal_uInt32 GetGroupLevel() const { return mnGroupLevel; }; - bool SetGroupSnapRect( sal_uInt32 nGroupLevel, const Rectangle& rRect ); - bool SetGroupLogicRect( sal_uInt32 nGroupLevel, const Rectangle& rRect ); + void SetGroupSnapRect( sal_uInt32 nGroupLevel, const Rectangle& rRect ); + void SetGroupLogicRect( sal_uInt32 nGroupLevel, const Rectangle& rRect ); virtual void LeaveGroup(); // a ESCHER_Sp is being written ( a ESCHER_DgContainer has to be opened for this purpose!) @@ -1313,10 +1313,6 @@ public: private: EscherEx( const EscherEx& ) = delete; EscherEx& operator=( const EscherEx& ) = delete; - - // prevent C-style cast to former base class EscherGraphicProvider - operator EscherGraphicProvider&(); - operator EscherGraphicProvider const&(); }; diff --git a/include/filter/msfilter/mscodec.hxx b/include/filter/msfilter/mscodec.hxx index 4f5676b7f045..c6836fc612a6 100644 --- a/include/filter/msfilter/mscodec.hxx +++ b/include/filter/msfilter/mscodec.hxx @@ -252,7 +252,7 @@ public: bool InitCipher( sal_uInt32 nCounter ); /** Creates an MD5 digest of salt digest. */ - bool CreateSaltDigest( + void CreateSaltDigest( const sal_uInt8 nSaltData[16], sal_uInt8 nSaltDigest[16] ); /** Encodes a block of memory. diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 28ae9184c443..8ba5791443b8 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -258,8 +258,6 @@ struct MSFILTER_DLLPUBLIC SvxMSDffImportRec SvxMSDffImportRec(const SvxMSDffImportRec& rCopy); ~SvxMSDffImportRec(); - bool operator==( const SvxMSDffImportRec& rEntry ) const - { return nShapeId == rEntry.nShapeId; } bool operator<( const SvxMSDffImportRec& rEntry ) const { return nShapeId < rEntry.nShapeId; } diff --git a/include/filter/msfilter/msocximex.hxx b/include/filter/msfilter/msocximex.hxx index 755dfe5ae8a0..e6e78e94db57 100644 --- a/include/filter/msfilter/msocximex.hxx +++ b/include/filter/msfilter/msocximex.hxx @@ -90,7 +90,7 @@ protected: // das einzige Formular css::uno::Reference< css::container::XIndexContainer > xFormComps; - virtual const css::uno::Reference< css::drawing::XDrawPage > & GetDrawPage(); + virtual void GetDrawPage(); }; #endif diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx index d2e8531c7e51..9daa89b22631 100644 --- a/include/filter/msfilter/mstoolbar.hxx +++ b/include/filter/msfilter/mstoolbar.hxx @@ -148,7 +148,7 @@ public: #if OSL_DEBUG_LEVEL > 1 virtual void Print( FILE* ) override; #endif - bool ImportToolBarControlData( CustomToolBarImportHelper&, std::vector< css::beans::PropertyValue >& ); + void ImportToolBarControlData( CustomToolBarImportHelper&, std::vector< css::beans::PropertyValue >& ); OUString CustomText() { return customText.getString(); } }; diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index 46fef225ead2..9633234fd747 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -780,7 +780,7 @@ public: explicit PPTParaSheet( sal_uInt32 nInstance ); PPTParaSheet( const PPTParaSheet& rParaSheet ); - bool Read( + void Read( SdrPowerPointImport& rMan, SvStream& rIn, bool bMasterStyle, @@ -1279,7 +1279,7 @@ public: class PPTConvertOCXControls : public SvxMSConvertOCXControls { - virtual const css::uno::Reference< css::drawing::XDrawPage > & GetDrawPage() override; + virtual void GetDrawPage() override; PptPageKind ePageKind; const SdrPowerPointImport* mpPPTImporter; public: -- cgit