summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-01-25 10:22:47 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-01-25 11:55:19 +0000
commitd5cd223c48667770eeec3ef18c8b1b29d8ba564c (patch)
treea4b1788e7ffcd5eaddbc2519a9ad76bb39b7c2cf /svx
parent3e6042c2ce4613f5f200739b5842d4e38e8ec54a (diff)
loplugin: unnecessary destructor svx
Change-Id: I7feed30eea4f7367943fa2d6e0d75be5ca209068 Reviewed-on: https://gerrit.libreoffice.org/33516 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/AccessibleSvxFindReplaceDialog.hxx2
-rw-r--r--svx/inc/galobj.hxx6
-rw-r--r--svx/source/dialog/imapwnd.hxx2
-rw-r--r--svx/source/dialog/srchdlg.cxx1
-rw-r--r--svx/source/engine3d/scene3d.cxx10
-rw-r--r--svx/source/gallery2/gallery1.cxx1
-rw-r--r--svx/source/inc/fmexpl.hxx2
-rw-r--r--svx/source/svdraw/sdrpagewindow.cxx4
-rw-r--r--svx/source/svdraw/svdcrtv.cxx13
-rw-r--r--svx/source/svdraw/svdhdl.cxx5
-rw-r--r--svx/source/svdraw/svdmrkv.cxx12
-rw-r--r--svx/source/svdraw/svdsnpv.cxx24
-rw-r--r--svx/source/tbxctrls/tbunosearchcontrollers.cxx5
13 files changed, 16 insertions, 71 deletions
diff --git a/svx/inc/AccessibleSvxFindReplaceDialog.hxx b/svx/inc/AccessibleSvxFindReplaceDialog.hxx
index 90b56399102b..ad1d1df009f2 100644
--- a/svx/inc/AccessibleSvxFindReplaceDialog.hxx
+++ b/svx/inc/AccessibleSvxFindReplaceDialog.hxx
@@ -44,8 +44,6 @@ public:
{
SetWindow(pSplDlg);
}
- virtual ~VCLXSvxFindReplaceDialog() override
- {};
private:
virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override
{
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index 8bb4caa3ee74..ba93c31d386f 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -124,7 +124,6 @@ public:
SgaObjectSvDraw();
SgaObjectSvDraw( const FmFormModel& rModel, const INetURLObject& rURL );
SgaObjectSvDraw( SvStream& rIStm, const INetURLObject& rURL );
- virtual ~SgaObjectSvDraw() override {};
virtual SgaObjKind GetObjKind() const override { return SgaObjKind::SvDraw; }
};
@@ -145,7 +144,6 @@ public:
SgaObjectBmp();
SgaObjectBmp( const INetURLObject& rURL );
SgaObjectBmp( const Graphic& rGraphic, const INetURLObject& rURL, const OUString& rFormat );
- virtual ~SgaObjectBmp() override {};
virtual SgaObjKind GetObjKind() const override { return SgaObjKind::Bitmap; }
};
@@ -157,8 +155,6 @@ public:
SgaObjectAnim();
SgaObjectAnim( const Graphic& rGraphic, const INetURLObject& rURL, const OUString& rFormatName );
- virtual ~SgaObjectAnim() override {};
-
virtual SgaObjKind GetObjKind() const override { return SgaObjKind::Animation; }
};
@@ -169,8 +165,6 @@ public:
SgaObjectINet();
SgaObjectINet( const Graphic& rGraphic, const INetURLObject& rURL, const OUString& rFormatName );
- virtual ~SgaObjectINet() override {};
-
virtual SgaObjKind GetObjKind() const override { return SgaObjKind::Inet; }
};
#endif
diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx
index 585506467fda..9f1d29074e8f 100644
--- a/svx/source/dialog/imapwnd.hxx
+++ b/svx/source/dialog/imapwnd.hxx
@@ -62,8 +62,6 @@ public:
SdrObjUserData ( SdrInventor::IMap, SVD_IMAP_USERDATA ),
mpObj ( rIMapUserData.mpObj ) {}
- virtual ~IMapUserData() override { }
-
virtual SdrObjUserData* Clone( SdrObject * ) const override { return new IMapUserData( *this ); }
const IMapObjectPtr& GetObject() const { return mpObj; }
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index c4891b4d69bb..02f7f7add5fe 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -137,7 +137,6 @@ struct SearchDlg_Impl
aCommand2URL.Protocol = "vnd.sun.search:";
aCommand2URL.Path = "SearchViaComponent2";
}
- ~SearchDlg_Impl() {}
};
void ListToStrArr_Impl( sal_uInt16 nId, std::vector<OUString>& rStrLst, ComboBox& rCBox )
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index da2e7fb0a3d4..dbf1e7b5f8fd 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -59,7 +59,6 @@ class ImpRemap3DDepth
public:
ImpRemap3DDepth(sal_uInt32 nOrdNum, double fMinimalDepth);
explicit ImpRemap3DDepth(sal_uInt32 nOrdNum);
- ~ImpRemap3DDepth();
// for ::std::sort
bool operator<(const ImpRemap3DDepth& rComp) const;
@@ -82,10 +81,6 @@ ImpRemap3DDepth::ImpRemap3DDepth(sal_uInt32 nOrdNum)
{
}
-ImpRemap3DDepth::~ImpRemap3DDepth()
-{
-}
-
bool ImpRemap3DDepth::operator<(const ImpRemap3DDepth& rComp) const
{
if(IsScene())
@@ -111,7 +106,6 @@ class Imp3DDepthRemapper
public:
explicit Imp3DDepthRemapper(E3dScene& rScene);
- ~Imp3DDepthRemapper();
sal_uInt32 RemapOrdNum(sal_uInt32 nOrdNum) const;
};
@@ -149,10 +143,6 @@ Imp3DDepthRemapper::Imp3DDepthRemapper(E3dScene& rScene)
::std::sort(maVector.begin(), maVector.end());
}
-Imp3DDepthRemapper::~Imp3DDepthRemapper()
-{
-}
-
sal_uInt32 Imp3DDepthRemapper::RemapOrdNum(sal_uInt32 nOrdNum) const
{
if(nOrdNum < maVector.size())
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 927f0b5db5d0..c0743ebef9af 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -154,7 +154,6 @@ public:
GalleryThemeCacheEntry( const GalleryThemeEntry* pThemeEntry, GalleryTheme* pTheme ) :
mpThemeEntry( pThemeEntry ), mpTheme( pTheme ) {}
- ~GalleryThemeCacheEntry() {}
const GalleryThemeEntry* GetThemeEntry() const { return mpThemeEntry; }
GalleryTheme* GetTheme() const { return mpTheme.get(); }
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 819f83f76384..04bb94ba8a7f 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -127,7 +127,6 @@ class FmNavViewMarksChanged : public SfxHint
FmFormView* pView;
public:
FmNavViewMarksChanged(FmFormView* pWhichView) { pView = pWhichView; }
- virtual ~FmNavViewMarksChanged() override {}
const FmFormView* GetAffectedView() const { return pView; }
};
@@ -222,7 +221,6 @@ public:
: m_bMixedSelection(false)
{
}
- virtual ~FmNavRequestSelectHint() override {}
void SetMixedSelection(bool bMixedSelection) { m_bMixedSelection = bMixedSelection; }
bool IsMixedSelection() const { return m_bMixedSelection; }
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index 292bbde38678..2fdb7db20e49 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -63,10 +63,6 @@ struct SdrPageWindow::Impl
mpOriginalPaintWindow(nullptr)
{
}
-
- ~Impl()
- {
- }
};
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 3dcda7360448..2b3ff4203766 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -53,7 +53,10 @@ class ImplConnectMarkerOverlay
public:
ImplConnectMarkerOverlay(const SdrCreateView& rView, SdrObject& rObject);
- ~ImplConnectMarkerOverlay();
+
+ // The OverlayObjects are cleared using the destructor of OverlayObjectList.
+ // That destructor calls clear() at the list which removes all objects from the
+ // OverlayManager and deletes them.
const SdrObject& GetTargetObject() const { return mrObject; }
};
@@ -107,14 +110,6 @@ ImplConnectMarkerOverlay::ImplConnectMarkerOverlay(const SdrCreateView& rView, S
}
}
-ImplConnectMarkerOverlay::~ImplConnectMarkerOverlay()
-{
- // The OverlayObjects are cleared using the destructor of OverlayObjectList.
- // That destructor calls clear() at the list which removes all objects from the
- // OverlayManager and deletes them.
-}
-
-
class ImpSdrCreateViewExtraData
{
// The OverlayObjects for XOR replacement
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 0b51b7ccf9f9..c8e89cbc4ae0 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -91,7 +91,6 @@ class SdrHdlBitmapSet
public:
explicit SdrHdlBitmapSet();
- ~SdrHdlBitmapSet();
const BitmapEx& GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd);
};
@@ -108,10 +107,6 @@ SdrHdlBitmapSet::SdrHdlBitmapSet()
{
}
-SdrHdlBitmapSet::~SdrHdlBitmapSet()
-{
-}
-
BitmapEx& SdrHdlBitmapSet::impGetOrCreateTargetBitmap(sal_uInt16 nIndex, const Rectangle& rRectangle)
{
BitmapEx& rTargetBitmap = maRealMarkers[nIndex];
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index d02747a0c177..c7c882c19f20 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -73,7 +73,10 @@ class ImplMarkingOverlay
public:
ImplMarkingOverlay(const SdrPaintView& rView, const basegfx::B2DPoint& rStartPos, bool bUnmarking);
- ~ImplMarkingOverlay();
+
+ // The OverlayObjects are cleared using the destructor of OverlayObjectList.
+ // That destructor calls clear() at the list which removes all objects from the
+ // OverlayManager and deletes them.
void SetSecondPosition(const basegfx::B2DPoint& rNewPosition);
bool IsUnmarking() const { return mbUnmarking; }
@@ -98,13 +101,6 @@ ImplMarkingOverlay::ImplMarkingOverlay(const SdrPaintView& rView, const basegfx:
}
}
-ImplMarkingOverlay::~ImplMarkingOverlay()
-{
- // The OverlayObjects are cleared using the destructor of OverlayObjectList.
- // That destructor calls clear() at the list which removes all objects from the
- // OverlayManager and deletes them.
-}
-
void ImplMarkingOverlay::SetSecondPosition(const basegfx::B2DPoint& rNewPosition)
{
if(rNewPosition != maSecondPosition)
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index 3d6167d8dd5a..7b7feab8ee3e 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -44,7 +44,10 @@ class ImplPageOriginOverlay
public:
ImplPageOriginOverlay(const SdrPaintView& rView, const basegfx::B2DPoint& rStartPos);
- ~ImplPageOriginOverlay();
+
+ // The OverlayObjects are cleared using the destructor of OverlayObjectList.
+ // That destructor calls clear() at the list which removes all objects from the
+ // OverlayManager and deletes them.
void SetPosition(const basegfx::B2DPoint& rNewPosition);
};
@@ -67,13 +70,6 @@ ImplPageOriginOverlay::ImplPageOriginOverlay(const SdrPaintView& rView, const ba
}
}
-ImplPageOriginOverlay::~ImplPageOriginOverlay()
-{
- // The OverlayObjects are cleared using the destructor of OverlayObjectList.
- // That destructor calls clear() at the list which removes all objects from the
- // OverlayManager and deletes them.
-}
-
void ImplPageOriginOverlay::SetPosition(const basegfx::B2DPoint& rNewPosition)
{
if(rNewPosition != maPosition)
@@ -112,7 +108,10 @@ class ImplHelpLineOverlay
public:
ImplHelpLineOverlay(const SdrPaintView& rView, const basegfx::B2DPoint& rStartPos,
SdrPageView* pPageView, sal_uInt16 nHelpLineNumber, SdrHelpLineKind eKind);
- ~ImplHelpLineOverlay();
+
+ // The OverlayObjects are cleared using the destructor of OverlayObjectList.
+ // That destructor calls clear() at the list which removes all objects from the
+ // OverlayManager and deletes them.
void SetPosition(const basegfx::B2DPoint& rNewPosition);
@@ -145,13 +144,6 @@ ImplHelpLineOverlay::ImplHelpLineOverlay(
}
}
-ImplHelpLineOverlay::~ImplHelpLineOverlay()
-{
- // The OverlayObjects are cleared using the destructor of OverlayObjectList.
- // That destructor calls clear() at the list which removes all objects from the
- // OverlayManager and deletes them.
-}
-
void ImplHelpLineOverlay::SetPosition(const basegfx::B2DPoint& rNewPosition)
{
if(rNewPosition != maPosition)
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 3baf15615724..673ee775669d 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -295,7 +295,6 @@ class SearchToolbarControllersManager
public:
SearchToolbarControllersManager();
- ~SearchToolbarControllersManager();
static SearchToolbarControllersManager& createControllersManager();
@@ -319,10 +318,6 @@ SearchToolbarControllersManager::SearchToolbarControllersManager()
{
}
-SearchToolbarControllersManager::~SearchToolbarControllersManager()
-{
-}
-
namespace
{
class theSearchToolbarControllersManager