[Libreoffice-commits] core.git: include/sfx2 sfx2/source slideshow/source sot/source starmath/inc starmath/source store/source
Noel Grandin
noel.grandin at collabora.co.uk
Wed Jan 25 10:26:45 UTC 2017
include/sfx2/Metadatable.hxx | 2 --
include/sfx2/emojiview.hxx | 2 --
include/sfx2/itemwrapper.hxx | 4 ----
include/sfx2/sidebar/UnoDeck.hxx | 1 -
include/sfx2/sidebar/UnoDecks.hxx | 3 +--
include/sfx2/sidebar/UnoPanel.hxx | 1 -
include/sfx2/sidebar/UnoPanels.hxx | 1 -
include/sfx2/templatelocalview.hxx | 2 --
sfx2/source/appl/linksrc.cxx | 11 -----------
sfx2/source/appl/lnkbase2.cxx | 3 ---
sfx2/source/dialog/backingwindow.cxx | 1 -
sfx2/source/dialog/securitypage.cxx | 6 ------
sfx2/source/dialog/tabdlg.cxx | 3 ---
sfx2/source/inc/docundomanager.hxx | 3 ---
sfx2/source/inc/templatesearchviewitem.hxx | 3 ---
sfx2/source/view/impframe.hxx | 2 --
sfx2/source/view/impviewframe.hxx | 4 ----
sfx2/source/view/printer.cxx | 1 -
sfx2/source/view/viewprn.cxx | 1 -
slideshow/source/engine/opengl/Operation.hxx | 6 ------
slideshow/source/inc/animation.hxx | 2 --
slideshow/source/inc/shapeattributelayer.hxx | 1 -
slideshow/source/inc/vieweventhandler.hxx | 2 --
sot/source/sdstor/stgstrms.hxx | 1 -
starmath/inc/cursor.hxx | 4 ----
starmath/source/mathmlexport.hxx | 1 -
store/source/storcach.cxx | 3 ---
27 files changed, 1 insertion(+), 73 deletions(-)
New commits:
commit 2608523b69fd6f1d888a74674a6ec795b4ad3aad
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Jan 25 10:19:59 2017 +0200
loplugin: unnecessary destructor sfx2..store
Change-Id: Idbf2585e48cd89a43ab68c5c8819880d20461ccf
Reviewed-on: https://gerrit.libreoffice.org/33514
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/sfx2/Metadatable.hxx b/include/sfx2/Metadatable.hxx
index b838c9f..f0289d9 100644
--- a/include/sfx2/Metadatable.hxx
+++ b/include/sfx2/Metadatable.hxx
@@ -141,8 +141,6 @@ class SFX2_DLLPUBLIC MetadatableMixin :
public:
MetadatableMixin() {};
- virtual ~MetadatableMixin() override {}
-
// css::rdf::XNode:
virtual OUString SAL_CALL getStringValue()
throw (css::uno::RuntimeException, std::exception) override;
diff --git a/include/sfx2/emojiview.hxx b/include/sfx2/emojiview.hxx
index 30245cf..adb8306 100644
--- a/include/sfx2/emojiview.hxx
+++ b/include/sfx2/emojiview.hxx
@@ -42,8 +42,6 @@ public:
: mCategory(rCategory)
{}
- ~ViewFilter_Category () {}
-
bool operator () (const ThumbnailViewItem *pItem);
static bool isFilteredCategory(FILTER_CATEGORY filter, const OUString &rCategory);
diff --git a/include/sfx2/itemwrapper.hxx b/include/sfx2/itemwrapper.hxx
index 64fbf6d..0633bf2 100644
--- a/include/sfx2/itemwrapper.hxx
+++ b/include/sfx2/itemwrapper.hxx
@@ -134,8 +134,6 @@ public:
inline explicit ValueItemWrapper( sal_uInt16 nSlot ) :
SingleItemWrapper< ItemT, ValueT >( nSlot ) {}
- virtual ~ValueItemWrapper() {}
-
virtual ValueT GetItemValue( const ItemT& rItem ) const SAL_OVERRIDE
{ return static_cast< ValueT >( rItem.GetValue() ); }
virtual void SetItemValue( ItemT& rItem, ValueT aValue ) const SAL_OVERRIDE
@@ -156,8 +154,6 @@ public:
inline explicit IdentItemWrapper( sal_uInt16 nSlot ) :
SingleItemWrapper< ItemT, const ItemT& >( nSlot ) {}
- virtual ~IdentItemWrapper() {}
-
virtual const ItemT& GetItemValue( const ItemT& rItem ) const SAL_OVERRIDE
{ return rItem; }
virtual void SetItemValue( ItemT& rItem, const ItemT& rValue ) const SAL_OVERRIDE
diff --git a/include/sfx2/sidebar/UnoDeck.hxx b/include/sfx2/sidebar/UnoDeck.hxx
index 43d57b2..9e4d052 100644
--- a/include/sfx2/sidebar/UnoDeck.hxx
+++ b/include/sfx2/sidebar/UnoDeck.hxx
@@ -29,7 +29,6 @@ class SfxUnoDeck : public cppu::WeakImplHelper<css::ui::XDeck>
public:
SfxUnoDeck(const css::uno::Reference<css::frame::XFrame>& , const OUString&);
- virtual ~SfxUnoDeck() override {};
virtual OUString SAL_CALL getId()
throw(css::uno::RuntimeException, std::exception) override;
diff --git a/include/sfx2/sidebar/UnoDecks.hxx b/include/sfx2/sidebar/UnoDecks.hxx
index e17b7a3..34cf6ff 100644
--- a/include/sfx2/sidebar/UnoDecks.hxx
+++ b/include/sfx2/sidebar/UnoDecks.hxx
@@ -31,7 +31,6 @@ class SfxUnoDecks : public cppu::WeakImplHelper<css::ui::XDecks>
public:
SfxUnoDecks(const css::uno::Reference<css::frame::XFrame>&);
- virtual ~SfxUnoDecks() override {};
// XNameAccess
@@ -71,4 +70,4 @@ private:
#endif
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/UnoPanel.hxx b/include/sfx2/sidebar/UnoPanel.hxx
index a622675..8c30810 100644
--- a/include/sfx2/sidebar/UnoPanel.hxx
+++ b/include/sfx2/sidebar/UnoPanel.hxx
@@ -32,7 +32,6 @@ class SfxUnoPanel : public cppu::WeakImplHelper<css::ui::XPanel>
public:
SfxUnoPanel(const css::uno::Reference<css::frame::XFrame>& , const OUString&, const OUString&);
- virtual ~SfxUnoPanel() override {};
virtual OUString SAL_CALL getId()
throw(css::uno::RuntimeException, std::exception) override;
diff --git a/include/sfx2/sidebar/UnoPanels.hxx b/include/sfx2/sidebar/UnoPanels.hxx
index 3a5848b..b9558b4 100644
--- a/include/sfx2/sidebar/UnoPanels.hxx
+++ b/include/sfx2/sidebar/UnoPanels.hxx
@@ -29,7 +29,6 @@ class SfxUnoPanels : public cppu::WeakImplHelper<css::ui::XPanels>
public:
SfxUnoPanels(const css::uno::Reference<css::frame::XFrame>& , const OUString&);
- virtual ~SfxUnoPanels() override {};
// XPanels
virtual OUString SAL_CALL getDeckId()
diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx
index d75d86b..1e4267c 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -59,8 +59,6 @@ public:
: mApp(App)
{}
- ~ViewFilter_Application () {}
-
bool operator () (const ThumbnailViewItem *pItem);
static bool isFilteredExtension(FILTER_APPLICATION filter, const OUString &rExt);
diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx
index e7c5a38..a12f86c 100644
--- a/sfx2/source/appl/linksrc.cxx
+++ b/sfx2/source/appl/linksrc.cxx
@@ -81,14 +81,8 @@ struct SvLinkSource_Entry_Impl
explicit SvLinkSource_Entry_Impl( SvBaseLink* pLink )
: xSink( pLink ), nAdviseModes( 0 ), bIsDataSink( false )
{}
-
- ~SvLinkSource_Entry_Impl();
};
-SvLinkSource_Entry_Impl::~SvLinkSource_Entry_Impl()
-{
-}
-
class SvLinkSource_Array_Impl
{
private:
@@ -195,13 +189,8 @@ struct SvLinkSource_Impl
, m_bIsReadOnly(false)
{
}
- ~SvLinkSource_Impl();
};
-SvLinkSource_Impl::~SvLinkSource_Impl()
-{
-}
-
SvLinkSource::SvLinkSource()
: pImpl( new SvLinkSource_Impl )
{
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 44f7e5e..ffb5b1d 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -56,9 +56,6 @@ struct BaseLink_Impl
, m_pFileDlg( nullptr )
, m_bIsConnect( false )
{}
-
- ~BaseLink_Impl()
- {}
};
// only for internal management
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 3fb5991..82dc215 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -741,7 +741,6 @@ struct ImplDelayedDispatch
aArgs( i_rArgs )
{
}
- ~ImplDelayedDispatch() {}
};
static void implDispatchDelayed( void*, void* pArg )
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index 293f33f..04a138a 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -151,7 +151,6 @@ struct SfxSecurityPage_Impl
DECL_LINK( ChangeProtectionPBHdl, Button*, void );
SfxSecurityPage_Impl( SfxSecurityPage &rDlg, const SfxItemSet &rItemSet );
- ~SfxSecurityPage_Impl();
bool FillItemSet_Impl( SfxItemSet & );
void Reset_Impl( const SfxItemSet & );
@@ -181,11 +180,6 @@ SfxSecurityPage_Impl::SfxSecurityPage_Impl( SfxSecurityPage &rTabPage, const Sfx
}
-SfxSecurityPage_Impl::~SfxSecurityPage_Impl()
-{
-}
-
-
bool SfxSecurityPage_Impl::FillItemSet_Impl( SfxItemSet & )
{
bool bModified = false;
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 19b8985..d0a50f0 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -124,9 +124,6 @@ struct TabDlg_Impl
{
aData.reserve( nCnt );
}
- ~TabDlg_Impl()
- {
- }
};
diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx
index b675ca2..12ea42c 100644
--- a/sfx2/source/inc/docundomanager.hxx
+++ b/sfx2/source/inc/docundomanager.hxx
@@ -82,9 +82,6 @@ public:
{
i_rSubComponent.MethodEntryCheck();
}
- ~SfxModelGuard()
- {
- }
void clear()
{
diff --git a/sfx2/source/inc/templatesearchviewitem.hxx b/sfx2/source/inc/templatesearchviewitem.hxx
index fe5a511..6e1b7d3 100644
--- a/sfx2/source/inc/templatesearchviewitem.hxx
+++ b/sfx2/source/inc/templatesearchviewitem.hxx
@@ -19,9 +19,6 @@ struct TemplateSearchViewItem : public TemplateViewItem
, mnAssocId(0)
{}
- virtual ~TemplateSearchViewItem () override
- {}
-
sal_uInt16 mnAssocId; //Associated item id to the TemplateViews
};
diff --git a/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx
index 9939d8b..4390153 100644
--- a/sfx2/source/view/impframe.hxx
+++ b/sfx2/source/view/impframe.hxx
@@ -71,8 +71,6 @@ public:
,bMenuBarOn( true )
{
}
-
- virtual ~SfxFrame_Impl() override { }
};
#endif
diff --git a/sfx2/source/view/impviewframe.hxx b/sfx2/source/view/impviewframe.hxx
index 20ef4cf..5238f2a 100644
--- a/sfx2/source/view/impviewframe.hxx
+++ b/sfx2/source/view/impviewframe.hxx
@@ -66,10 +66,6 @@ struct SfxViewFrame_Impl
, bActive(false)
{
}
-
- ~SfxViewFrame_Impl()
- {
- }
};
class SfxFrameViewWindow_Impl : public vcl::Window
diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index 1ff1d91..941aaa8 100644
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -47,7 +47,6 @@ struct SfxPrinter_Impl
mbSelection ( true ),
mbFromTo ( true ),
mbRange ( true ) {}
- ~SfxPrinter_Impl() {}
};
struct SfxPrintOptDlg_Impl
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index b73e1c4..16316ad 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -411,7 +411,6 @@ private:
public:
SfxDialogExecutor_Impl( SfxViewShell* pViewSh, PrinterSetupDialog* pParent );
- ~SfxDialogExecutor_Impl() {}
Link<Button*, void> GetLink() const { return LINK(const_cast<SfxDialogExecutor_Impl*>(this), SfxDialogExecutor_Impl, Execute); }
const SfxItemSet* GetOptions() const { return _pOptions.get(); }
diff --git a/slideshow/source/engine/opengl/Operation.hxx b/slideshow/source/engine/opengl/Operation.hxx
index 95aaa06..0ee818f 100644
--- a/slideshow/source/engine/opengl/Operation.hxx
+++ b/slideshow/source/engine/opengl/Operation.hxx
@@ -104,7 +104,6 @@ public:
*/
SRotate(const glm::vec3& Axis, const glm::vec3& Origin, double Angle,
bool bInter, double T0, double T1);
- virtual ~SRotate() override {}
private:
/** axis to rotate CCW about
*/
@@ -149,7 +148,6 @@ public:
*/
SScale(const glm::vec3& Scale, const glm::vec3& Origin,bool bInter, double T0, double T1);
- virtual ~SScale() override {}
private:
glm::vec3 scale;
glm::vec3 origin;
@@ -181,7 +179,6 @@ public:
*/
STranslate(const glm::vec3& Vector,bool bInter, double T0, double T1);
- virtual ~STranslate() override {}
private:
/** vector to translate by
*/
@@ -214,7 +211,6 @@ public:
*/
SEllipseTranslate(double dWidth, double dHeight, double dStartPosition, double dEndPosition, bool bInter, double T0, double T1);
- virtual ~SEllipseTranslate() override {}
private:
/** width and length of the ellipse
*/
@@ -237,7 +233,6 @@ public:
virtual void interpolate(glm::mat4& matrix, double t, double SlideWidthScale, double SlideHeightScale) const override;
RotateAndScaleDepthByWidth(const glm::vec3& Axis,const glm::vec3& Origin,double Angle, bool bScale, bool bInter, double T0, double T1);
- virtual ~RotateAndScaleDepthByWidth() override {}
private:
glm::vec3 axis;
glm::vec3 origin;
@@ -256,7 +251,6 @@ public:
virtual void interpolate(glm::mat4& matrix, double t, double SlideWidthScale, double SlideHeightScale) const override;
RotateAndScaleDepthByHeight(const glm::vec3& Axis,const glm::vec3& Origin,double Angle, bool bScale, bool bInter, double T0, double T1);
- virtual ~RotateAndScaleDepthByHeight() override {}
private:
glm::vec3 axis;
glm::vec3 origin;
diff --git a/slideshow/source/inc/animation.hxx b/slideshow/source/inc/animation.hxx
index 9a722df..04f7fb7 100644
--- a/slideshow/source/inc/animation.hxx
+++ b/slideshow/source/inc/animation.hxx
@@ -47,8 +47,6 @@ namespace slideshow
class Animation : public virtual SharedPtrAble
{
public:
- virtual ~Animation() override {}
-
/** Notify that the animation going active soon.
Implementers should preload any buffers, and create
diff --git a/slideshow/source/inc/shapeattributelayer.hxx b/slideshow/source/inc/shapeattributelayer.hxx
index e8648b5..27ed2c1 100644
--- a/slideshow/source/inc/shapeattributelayer.hxx
+++ b/slideshow/source/inc/shapeattributelayer.hxx
@@ -50,7 +50,6 @@ namespace slideshow
class State final
{
public:
- ~State() {}
/// Abstract, numerically encoded state ID
typedef ::std::size_t StateId;
diff --git a/slideshow/source/inc/vieweventhandler.hxx b/slideshow/source/inc/vieweventhandler.hxx
index 1291c0f..800daf9 100644
--- a/slideshow/source/inc/vieweventhandler.hxx
+++ b/slideshow/source/inc/vieweventhandler.hxx
@@ -42,8 +42,6 @@ namespace slideshow
class ViewEventHandler : public virtual SharedPtrAble
{
public:
- virtual ~ViewEventHandler() override {}
-
/** Notify new view.
@param rView
diff --git a/sot/source/sdstor/stgstrms.hxx b/sot/source/sdstor/stgstrms.hxx
index 9b9c41c..d2b8f306 100644
--- a/sot/source/sdstor/stgstrms.hxx
+++ b/sot/source/sdstor/stgstrms.hxx
@@ -100,7 +100,6 @@ class StgFATStrm : public StgStrm { // the master FAT stream
bool SetPage( short, sal_Int32 );
public:
explicit StgFATStrm( StgIo& );
- virtual ~StgFATStrm() override {}
using StgStrm::GetPage;
sal_Int32 GetPage( short, bool, sal_uInt16 *pnMasterAlloc = nullptr);
virtual bool SetSize( sal_Int32 ) override;
diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx
index 8eac806..33f3718 100644
--- a/starmath/inc/cursor.hxx
+++ b/starmath/inc/cursor.hxx
@@ -93,10 +93,6 @@ public:
BuildGraph();
}
- ~SmCursor()
- {
- }
-
/** Get position */
const SmCaretPos& GetPosition() const { return mpPosition->CaretPos; }
diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx
index 4581db8..7d9adcd 100644
--- a/starmath/source/mathmlexport.hxx
+++ b/starmath/source/mathmlexport.hxx
@@ -97,7 +97,6 @@ public:
SmXMLExport(
const css::uno::Reference< css::uno::XComponentContext >& rContext,
OUString const & implementationName, SvXMLExportFlags nExportFlags);
- virtual ~SmXMLExport() override {};
// XUnoTunnel
sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx
index 7ab20e6..bb5bf53 100644
--- a/store/source/storcach.cxx
+++ b/store/source/storcach.cxx
@@ -54,9 +54,6 @@ struct Entry
explicit Entry (std::shared_ptr<PageData> const & rxPage, sal_uInt32 nOffset)
: m_xPage(rxPage), m_nOffset(nOffset), m_pNext(nullptr)
{}
-
- // Destruction
- ~Entry() {}
};
};
More information about the Libreoffice-commits
mailing list