sd/inc/OutlinerIterator.hxx | 3 - sd/inc/cusshow.hxx | 3 - sd/inc/sdabstdlg.hxx | 1 sd/inc/sdattr.hxx | 14 ---- sd/source/core/sdattr.cxx | 36 ------------ sd/source/filter/eppt/epptbase.hxx | 6 -- sd/source/ui/dlg/sddlgfact.cxx | 5 - sd/source/ui/dlg/sddlgfact.hxx | 1 sd/source/ui/inc/PaneShells.hxx | 13 ---- sd/source/ui/slideshow/slideshowimpl.cxx | 42 -------------- sd/source/ui/slideshow/slideshowimpl.hxx | 2 sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx | 2 sdext/source/pdfimport/sax/saxattrlist.hxx | 1 sdext/source/pdfimport/tree/genericelements.cxx | 4 - sdext/source/pdfimport/tree/genericelements.hxx | 3 - sdext/source/pdfimport/tree/style.hxx | 1 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 16 ----- sdext/source/presenter/PresenterUIPainter.hxx | 3 - 18 files changed, 4 insertions(+), 152 deletions(-)
New commits: commit b73f45ef0bf3230275c11fc9c70c22625332b695 Author: Noel Grandin <n...@peralex.com> Date: Wed May 18 16:57:21 2016 +0200 loplugin:unusedmethods in sd Change-Id: I27da3e7afd86217ec9f75958775da9c144d7a0a5 Reviewed-on: https://gerrit.libreoffice.org/25111 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noelgran...@gmail.com> diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx index f4392b0..dc63add 100644 --- a/sd/inc/OutlinerIterator.hxx +++ b/sd/inc/OutlinerIterator.hxx @@ -280,8 +280,7 @@ private: IteratorLocation aLocation); // Do not allow default constructor and copying of outliner containers. - OutlinerContainer (const OutlinerContainer&) {}; - OutlinerContainer() {}; + OutlinerContainer (const OutlinerContainer&) = delete; OutlinerContainer& operator= (const OutlinerContainer&) {return *this;}; }; diff --git a/sd/inc/cusshow.hxx b/sd/inc/cusshow.hxx index 11d1e15..83de986 100644 --- a/sd/inc/cusshow.hxx +++ b/sd/inc/cusshow.hxx @@ -40,8 +40,7 @@ private: // this is a weak reference to a possible living api wrapper for this custom show css::uno::WeakReference< css::uno::XInterface > mxUnoCustomShow; - // forbidden and not implemented - SdCustomShow(); + SdCustomShow() = delete; public: // single argument ctors shall be explicit diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index f673c28..702ba60 100644 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.hxx @@ -118,7 +118,6 @@ class AbstractSdInsertPasteDlg : public VclAbstractDialog class AbstractSdInsertPagesObjsDlg : public VclAbstractDialog { public: - virtual vcl::Window* GetWindow() = 0; //this method is added for return a vcl::Window type pointer virtual std::vector<OUString> GetList ( const sal_uInt16 nType ) = 0; virtual bool IsLink() = 0; virtual bool IsRemoveUnnessesaryMasterPages() const = 0; diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx index 603e322..710a072 100644 --- a/sd/inc/sdattr.hxx +++ b/sd/inc/sdattr.hxx @@ -35,8 +35,6 @@ class SdAttrLayerName : public SfxStringItem { public: - SdAttrLayerName() : - SfxStringItem( ATTR_LAYER_NAME, OUString("neue Ebene") ) {} SdAttrLayerName( const OUString& aStr ) : SfxStringItem( ATTR_LAYER_NAME, aStr ) {} }; @@ -86,7 +84,6 @@ public: class DiaEffectItem : public SfxEnumItem { public: - DiaEffectItem( css::presentation::FadeEffect eFade = css::presentation::FadeEffect_NONE ); DiaEffectItem( SvStream& rIn ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; @@ -97,7 +94,6 @@ public: class DiaSpeedItem : public SfxEnumItem { public: - DiaSpeedItem( FadeSpeed = FADE_SPEED_MEDIUM ); DiaSpeedItem( SvStream& rIn ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; @@ -108,7 +104,6 @@ public: class DiaAutoItem : public SfxEnumItem { public: - DiaAutoItem( PresChange = PRESCHANGE_MANUAL ); DiaAutoItem( SvStream& rIn ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; @@ -116,15 +111,6 @@ public: sal_uInt16 GetValueCount() const override { return PRESCHANGE_COUNT; } }; -class DiaTimeItem : public SfxUInt32Item -{ -public: - DiaTimeItem( sal_uInt32 nValue = 0L ); - - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; - virtual bool operator==( const SfxPoolItem& ) const override; -}; - #endif // INCLUDED_SD_INC_SDATTR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/core/sdattr.cxx b/sd/source/core/sdattr.cxx index 186f376..8a6a385 100644 --- a/sd/source/core/sdattr.cxx +++ b/sd/source/core/sdattr.cxx @@ -27,11 +27,6 @@ using namespace ::com::sun::star; |* *************************************************************************/ -DiaEffectItem::DiaEffectItem( presentation::FadeEffect eFE ) : - SfxEnumItem( ATTR_DIA_EFFECT, (sal_uInt16)eFE ) -{ -} - DiaEffectItem::DiaEffectItem( SvStream& rIn ) : SfxEnumItem( ATTR_DIA_EFFECT, rIn ) { @@ -53,11 +48,6 @@ SfxPoolItem* DiaEffectItem::Create( SvStream& rIn, sal_uInt16 ) const |* *************************************************************************/ -DiaSpeedItem::DiaSpeedItem( FadeSpeed eFS ) : - SfxEnumItem( ATTR_DIA_SPEED, (sal_uInt16)eFS ) -{ -} - DiaSpeedItem::DiaSpeedItem( SvStream& rIn ) : SfxEnumItem( ATTR_DIA_SPEED, rIn ) { @@ -79,11 +69,6 @@ SfxPoolItem* DiaSpeedItem::Create( SvStream& rIn, sal_uInt16 ) const |* *************************************************************************/ -DiaAutoItem::DiaAutoItem( PresChange eChange ) : - SfxEnumItem( ATTR_DIA_AUTO, (sal_uInt16)eChange ) -{ -} - DiaAutoItem::DiaAutoItem( SvStream& rIn ) : SfxEnumItem( ATTR_DIA_AUTO, rIn ) { @@ -99,25 +84,4 @@ SfxPoolItem* DiaAutoItem::Create( SvStream& rIn, sal_uInt16 ) const return new DiaAutoItem( rIn ); } -/************************************************************************* -|* -|* DiaTimeItem -|* -*************************************************************************/ - -DiaTimeItem::DiaTimeItem( sal_uInt32 nValue ) : - SfxUInt32Item( ATTR_DIA_TIME, nValue ) -{ -} - -SfxPoolItem* DiaTimeItem::Clone( SfxItemPool* ) const -{ - return new DiaTimeItem( *this ); -} - -bool DiaTimeItem::operator==( const SfxPoolItem& rItem ) const -{ - return static_cast<const DiaTimeItem&>( rItem ).GetValue() == GetValue(); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx index a0dac14..8c5684b 100644 --- a/sd/source/filter/eppt/epptbase.hxx +++ b/sd/source/filter/eppt/epptbase.hxx @@ -98,10 +98,6 @@ class PropValue PropValue() {} - explicit PropValue( css::uno::Reference< css::beans::XPropertySet > rXPropSet ) - : mXPropSet( rXPropSet ) - {} - static bool GetPropertyValue( css::uno::Any& rAny, const css::uno::Reference< css::beans::XPropertySet > &, @@ -168,8 +164,6 @@ struct FontCollectionEntry private: - FontCollectionEntry() {} - void ImplInit( const OUString& rName ); }; diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index 43b0e6a..b3e15bf 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -274,11 +274,6 @@ void AbstractSdInsertLayerDlg_Impl::SetHelpId( const OString& rHelpId ) pDlg->SetHelpId( rHelpId ); } -vcl::Window* AbstractSdInsertPagesObjsDlg_Impl::GetWindow() -{ - return static_cast<vcl::Window*>(pDlg); -} - std::vector<OUString> AbstractSdInsertPagesObjsDlg_Impl::GetList(const sal_uInt16 nType) { return pDlg->GetList(nType); diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index baa6a33..cf7cf46 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -164,7 +164,6 @@ class SdInsertPagesObjsDlg; class AbstractSdInsertPagesObjsDlg_Impl : public AbstractSdInsertPagesObjsDlg { DECL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl,SdInsertPagesObjsDlg) - virtual vcl::Window * GetWindow() override; virtual std::vector<OUString> GetList ( const sal_uInt16 nType ) override; virtual bool IsLink() override; virtual bool IsRemoveUnnessesaryMasterPages() const override; diff --git a/sd/source/ui/inc/PaneShells.hxx b/sd/source/ui/inc/PaneShells.hxx index 80d66bf..e1b9df9 100644 --- a/sd/source/ui/inc/PaneShells.hxx +++ b/sd/source/ui/inc/PaneShells.hxx @@ -62,19 +62,6 @@ public: virtual ~LeftDrawPaneShell(); }; -/** Shell that displays the right pane for both Impress and Draw. The shell - does not do anything else and has especially no slots. -*/ -class ToolPanelPaneShell : public SfxShell -{ -public: - SFX_DECL_INTERFACE( SD_IF_SDTOOLPANELPANESHELL ) - -public: - ToolPanelPaneShell(); - virtual ~ToolPanelPaneShell(); -}; - } // end of namespace sd #endif diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 4bbe623..2b031ea 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1670,48 +1670,6 @@ sal_Int32 SlideshowImpl::getCurrentSlideNumber() return mpSlideController.get() ? mpSlideController->getCurrentSlideNumber() : -1; } -sal_Int32 SlideshowImpl::getFirstSlideNumber() -{ - sal_Int32 nRet = 0; - if( mpSlideController.get() ) - { - sal_Int32 nSlideIndexCount = mpSlideController->getSlideIndexCount() - 1; - if( nSlideIndexCount >= 0 ) - { - nRet = mpSlideController->getSlideNumber( nSlideIndexCount ); - while( nSlideIndexCount-- ) - { - sal_Int32 nTemp = mpSlideController->getSlideNumber( nSlideIndexCount ); - if( nRet > nTemp ) - nRet = nTemp; - } - } - } - - return nRet; -} - -sal_Int32 SlideshowImpl::getLastSlideNumber() -{ - sal_Int32 nRet = 0; - if( mpSlideController.get() ) - { - sal_Int32 nSlideIndexCount = mpSlideController->getSlideIndexCount() - 1; - if( nSlideIndexCount >= 0 ) - { - nRet = mpSlideController->getSlideNumber( nSlideIndexCount ); - while( nSlideIndexCount-- ) - { - sal_Int32 nTemp = mpSlideController->getSlideNumber( nSlideIndexCount ); - if( nRet < nTemp ) - nRet = nTemp; - } - } - } - - return nRet; -} - sal_Bool SAL_CALL SlideshowImpl::isEndless() throw( RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 5845175..fd401a4 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -262,8 +262,6 @@ private: void displaySlideNumber( sal_Int32 nSlide ); void displaySlideIndex( sal_Int32 nIndex ); sal_Int32 getCurrentSlideNumber(); - sal_Int32 getFirstSlideNumber(); - sal_Int32 getLastSlideNumber(); inline bool isInputFreezed() const { return mbInputFreeze; } void jumpToBookmark( const OUString& sBookmark ); diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx index 3afaadc..49b85dc 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx @@ -97,8 +97,6 @@ private: */ PageEnumeration (::std::unique_ptr<Enumeration<SharedPageDescriptor> > && pImpl); - // Default constructor not implemented. - PageEnumeration(); }; } } } // end of namespace ::sd::slidesorter::model diff --git a/sdext/source/pdfimport/sax/saxattrlist.hxx b/sdext/source/pdfimport/sax/saxattrlist.hxx index c8c76f34..04b7664 100644 --- a/sdext/source/pdfimport/sax/saxattrlist.hxx +++ b/sdext/source/pdfimport/sax/saxattrlist.hxx @@ -47,7 +47,6 @@ namespace pdfi std::unordered_map< OUString, size_t, OUStringHash > m_aIndexMap; public: - SaxAttrList() {} explicit SaxAttrList( const std::unordered_map< OUString, OUString, OUStringHash >& ); SaxAttrList( const SaxAttrList& ); virtual ~SaxAttrList(); diff --git a/sdext/source/pdfimport/tree/genericelements.cxx b/sdext/source/pdfimport/tree/genericelements.cxx index 2da7860..c5c61a4 100644 --- a/sdext/source/pdfimport/tree/genericelements.cxx +++ b/sdext/source/pdfimport/tree/genericelements.cxx @@ -32,10 +32,6 @@ namespace pdfi { -ElementFactory::~ElementFactory() -{ -} - Element::~Element() { while( !Children.empty() ) diff --git a/sdext/source/pdfimport/tree/genericelements.hxx b/sdext/source/pdfimport/tree/genericelements.hxx index 7099cb9..55b6b00 100644 --- a/sdext/source/pdfimport/tree/genericelements.hxx +++ b/sdext/source/pdfimport/tree/genericelements.hxx @@ -286,8 +286,7 @@ namespace pdfi class ElementFactory { public: - ElementFactory() {} - virtual ~ElementFactory(); + ElementFactory() = delete; static HyperlinkElement* createHyperlinkElement( Element* pParent, const OUString& rURI ) { return new HyperlinkElement( pParent, rURI ); } diff --git a/sdext/source/pdfimport/tree/style.hxx b/sdext/source/pdfimport/tree/style.hxx index 31be3db..9d3edd0 100644 --- a/sdext/source/pdfimport/tree/style.hxx +++ b/sdext/source/pdfimport/tree/style.hxx @@ -43,7 +43,6 @@ namespace pdfi Element* ContainedElement; std::vector< Style* > SubStyles; - Style() : ContainedElement( nullptr ) {} Style( const OString& rName, const PropertyMap& rProps ) : Name( rName ), Properties( rProps ), diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx index d52e3a0..73ea8bf 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -69,22 +69,6 @@ namespace pdfi { struct FontAttributes { - FontAttributes( const GooString& familyName_, - bool isEmbedded_, - bool isBold_, - bool isItalic_, - bool isUnderline_, - double size_ ) : - familyName(), - isEmbedded(isEmbedded_), - isBold(isBold_), - isItalic(isItalic_), - isUnderline(isUnderline_), - size(size_) - { - familyName.append(const_cast<GooString*>(&familyName_)); - } - FontAttributes() : familyName(), isEmbedded(false), diff --git a/sdext/source/presenter/PresenterUIPainter.hxx b/sdext/source/presenter/PresenterUIPainter.hxx index ed58fd4..1b5ef18 100644 --- a/sdext/source/presenter/PresenterUIPainter.hxx +++ b/sdext/source/presenter/PresenterUIPainter.hxx @@ -32,8 +32,7 @@ namespace sdext { namespace presenter { class PresenterUIPainter { public: - PresenterUIPainter(); - ~PresenterUIPainter(); + PresenterUIPainter() = delete; PresenterUIPainter(const PresenterUIPainter&) = delete; PresenterUIPainter& operator=(const PresenterUIPainter&) = delete; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits