include/svx/CommonStyleManager.hxx | 3 ---
include/svx/gallery1.hxx | 1 -
include/svx/galmisc.hxx | 2 --
include/svx/graphctl.hxx | 6 ------
include/svx/hlnkitem.hxx | 1 -
include/svx/nbdtmg.hxx | 6 ------
include/svx/tbxctl.hxx | 1 -
include/svx/xit.hxx | 1 -
svx/inc/AccessibleSvxFindReplaceDialog.hxx | 2 --
svx/inc/galobj.hxx | 6 ------
svx/source/dialog/imapwnd.hxx | 2 --
svx/source/dialog/srchdlg.cxx | 1 -
svx/source/engine3d/scene3d.cxx | 10 ----------
svx/source/gallery2/gallery1.cxx | 1 -
svx/source/inc/fmexpl.hxx | 2 --
svx/source/svdraw/sdrpagewindow.cxx | 4 ----
svx/source/svdraw/svdcrtv.cxx | 13 ++++---------
svx/source/svdraw/svdhdl.cxx | 5 -----
svx/source/svdraw/svdmrkv.cxx | 12 ++++--------
svx/source/svdraw/svdsnpv.cxx | 24 ++++++++----------------
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 5 -----
21 files changed, 16 insertions(+), 92 deletions(-)
New commits:
commit d5cd223c48667770eeec3ef18c8b1b29d8ba564c
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Wed Jan 25 10:22:47 2017 +0200
loplugin: unnecessary destructor svx
Change-Id: I7feed30eea4f7367943fa2d6e0d75be5ca209068
Reviewed-on: https://gerrit.libreoffice.org/33516
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/svx/CommonStyleManager.hxx
b/include/svx/CommonStyleManager.hxx
index 9b144c0..d28ccdd 100644
--- a/include/svx/CommonStyleManager.hxx
+++ b/include/svx/CommonStyleManager.hxx
@@ -26,9 +26,6 @@ public:
: StyleManager(rShell)
{}
- virtual ~CommonStyleManager() override
- {}
-
virtual sfx2::StylePreviewRenderer* CreateStylePreviewRenderer(
OutputDevice& rOutputDev,
SfxStyleSheetBase* pStyle,
long nMaxHeight) override;
diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx
index 9d9dcc3..1f87557 100644
--- a/include/svx/gallery1.hxx
+++ b/include/svx/gallery1.hxx
@@ -53,7 +53,6 @@ public:
const OUString& rName,
bool bReadOnly, bool bNewFile,
sal_uInt32 nId, bool
bThemeNameFromResource );
- ~GalleryThemeEntry() {};
const OUString& GetThemeName() const { return aName; }
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index 4031af5..df984ee 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -111,8 +111,6 @@ public:
SdrObjUserData( SdrInventor::SgaImap,
ID_IMAPINFO ),
aImageMap( rImageMap ) {};
- virtual ~SgaIMapInfo() override {};
-
virtual SdrObjUserData* Clone( SdrObject* ) const override
{
SgaIMapInfo* pInfo = new SgaIMapInfo;
diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx
index 05e7524..1cf1c9c 100644
--- a/include/svx/graphctl.hxx
+++ b/include/svx/graphctl.hxx
@@ -125,9 +125,6 @@ public:
: rWin(rGraphWin)
{}
- virtual ~GraphCtrlUserCall() override
- {}
-
virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const
Rectangle& rOldBoundRect) override;
};
@@ -153,9 +150,6 @@ public:
: SdrView(pModel, pWindow)
, rGraphCtrl(*pWindow)
{}
-
- virtual ~GraphCtrlView() override
- {}
};
#endif // INCLUDED_SVX_GRAPHCTL_HXX
diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx
index fa70a26..ea27acf 100644
--- a/include/svx/hlnkitem.hxx
+++ b/include/svx/hlnkitem.hxx
@@ -68,7 +68,6 @@ public:
SvxLinkInsertMode eTyp,
HyperDialogEvent nEvents =
HyperDialogEvent::NONE,
SvxMacroTableDtor *pMacroTbl =nullptr );
- virtual ~SvxHyperlinkItem () override {}
inline SvxHyperlinkItem& operator=( const SvxHyperlinkItem &rItem );
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index d79976b..e781668 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -69,7 +69,6 @@ class SVX_DLLPUBLIC NumSettings_Impl
, pBrushItem(nullptr)
, aSize(0,0)
{}
- ~NumSettings_Impl(){}
};
typedef std::vector< std::shared_ptr<NumSettings_Impl> > NumSettingsArr_Impl;
@@ -100,7 +99,6 @@ class SVX_DLLPUBLIC NumberSettings_Impl
nIndexDefault((sal_uInt16)0xFFFF),
pNumSetting(nullptr)
{}
- ~NumberSettings_Impl(){}
};
typedef std::vector< std::shared_ptr<NumberSettings_Impl> >
NumberSettingsArr_Impl;
@@ -116,8 +114,6 @@ class SVX_DLLPUBLIC OutlineSettings_Impl
bIsCustomized(false),
pNumSettingsArr(nullptr)
{}
- ~OutlineSettings_Impl(){
- }
};
class SVX_DLLPUBLIC NBOTypeMgrBase
@@ -169,7 +165,6 @@ class SVX_DLLPUBLIC BulletsTypeMgr: public NBOTypeMgrBase
static BulletsSettings* pActualBullets[DEFAULT_BULLET_TYPES];
public:
BulletsTypeMgr();
- virtual ~BulletsTypeMgr() override {}
virtual void Init() override;
virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16
mLevel,sal_uInt16 nFromIndex=0) override;
virtual void RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex,
sal_uInt16 mLevel) override;
@@ -208,7 +203,6 @@ class SVX_DLLPUBLIC OutlineTypeMgr: public NBOTypeMgrBase
OutlineSettings_Impl*
pDefaultOutlineSettingsArrs[DEFAULT_NUM_VALUSET_COUNT];
public:
OutlineTypeMgr();
- virtual ~OutlineTypeMgr() override {}
virtual void Init() override;
virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16
mLevel,sal_uInt16 nFromIndex=0) override;
virtual void RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex,
sal_uInt16 mLevel) override;
diff --git a/include/svx/tbxctl.hxx b/include/svx/tbxctl.hxx
index 5aa9e10..f538930 100644
--- a/include/svx/tbxctl.hxx
+++ b/include/svx/tbxctl.hxx
@@ -41,7 +41,6 @@ public:
SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
// XInitialization
virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any
>& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException,
std::exception) override;
- virtual ~SvxTbxCtlDraw() override {}
SFX_DECL_TOOLBOX_CONTROL();
diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx
index fa8d4bd..46e780f 100644
--- a/include/svx/xit.hxx
+++ b/include/svx/xit.hxx
@@ -48,7 +48,6 @@ public:
NameOrIndex(sal_uInt16 nWhich, const OUString& rName);
NameOrIndex(sal_uInt16 nWhich, SvStream& rIn);
NameOrIndex(const NameOrIndex& rNameOrIndex);
- virtual ~NameOrIndex() override {};
virtual bool operator==(const SfxPoolItem& rItem) const override;
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
diff --git a/svx/inc/AccessibleSvxFindReplaceDialog.hxx
b/svx/inc/AccessibleSvxFindReplaceDialog.hxx
index 90b5639..ad1d1df 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 8bb4caa..ba93c31 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 5855064..9f1d290 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 c4891b4..02f7f7a 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 da2e7fb..dbf1e7b 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 927f0b5..c0743eb 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 819f83f..04bb94b 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 292bbde..2fdb7db 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 3dcda73..2b3ff42 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 0b51b7c..c8e89cb 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 d02747a..c7c882c 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 3d6167d..7b7feab 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 3baf156..673ee77 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
