[Libreoffice-commits] core.git: include/svl include/svtools svl/source svtools/source
Noel Grandin
noel.grandin at collabora.co.uk
Wed Jan 25 11:29:41 UTC 2017
include/svl/cintitem.hxx | 8 --------
include/svl/custritm.hxx | 2 --
include/svl/flagitem.hxx | 4 +---
include/svl/inethist.hxx | 1 -
include/svl/intitem.hxx | 2 --
include/svl/metitem.hxx | 1 -
include/svl/nfkeytab.hxx | 1 -
include/svl/ondemand.hxx | 9 ---------
include/svl/poolitem.hxx | 1 -
include/svl/ptitem.hxx | 3 +--
include/svl/rectitem.hxx | 1 -
include/svl/szitem.hxx | 3 +--
include/svl/visitem.hxx | 2 --
include/svl/zforlist.hxx | 1 -
include/svtools/ServerDetailsControls.hxx | 4 ----
include/svtools/imapcirc.hxx | 1 -
include/svtools/imappoly.hxx | 1 -
include/svtools/imaprect.hxx | 1 -
include/svtools/ivctrl.hxx | 1 -
include/svtools/svparser.hxx | 1 -
svl/source/items/slstitm.cxx | 5 -----
svl/source/items/stylepool.cxx | 4 ----
svl/source/misc/inethist.cxx | 5 -----
svl/source/undo/undo.cxx | 4 ----
svtools/source/config/accessibilityoptions.cxx | 6 ------
svtools/source/control/ruler.cxx | 4 ----
svtools/source/control/scriptedtext.cxx | 6 ------
svtools/source/dialogs/addresstemplate.cxx | 4 ----
svtools/source/graphic/grfcache.cxx | 3 ---
svtools/source/misc/embedhlp.cxx | 4 ----
30 files changed, 3 insertions(+), 90 deletions(-)
New commits:
commit 58868eb9edb819db1684ae04988a77897c62ab59
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Jan 25 10:21:25 2017 +0200
loplugin: unnecessary destructor svl..svtools
Change-Id: Ie96dda7194c83ba88693f8c91899c732d704a4bd
Reviewed-on: https://gerrit.libreoffice.org/33515
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx
index e6b404c..2ccfd94 100644
--- a/include/svl/cintitem.hxx
+++ b/include/svl/cintitem.hxx
@@ -37,8 +37,6 @@ public:
SfxPoolItem(rItem), m_nValue(rItem.m_nValue)
{}
- virtual ~CntByteItem() override {}
-
virtual bool operator ==(const SfxPoolItem & rItem) const override;
virtual bool GetPresentation(SfxItemPresentation,
@@ -86,8 +84,6 @@ public:
SfxPoolItem(rItem), m_nValue(rItem.m_nValue)
{}
- virtual ~CntUInt16Item() override {}
-
virtual bool operator ==(const SfxPoolItem & rItem) const override;
virtual bool GetPresentation(SfxItemPresentation,
@@ -135,8 +131,6 @@ public:
SfxPoolItem(rItem), m_nValue(rItem.m_nValue)
{}
- virtual ~CntInt32Item() override {}
-
virtual bool operator ==(const SfxPoolItem & rItem) const override;
virtual bool GetPresentation(SfxItemPresentation,
@@ -184,8 +178,6 @@ public:
SfxPoolItem(rItem), m_nValue(rItem.m_nValue)
{}
- virtual ~CntUInt32Item() override {}
-
virtual bool operator ==(const SfxPoolItem & rItem) const override;
virtual bool GetPresentation(SfxItemPresentation,
diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx
index 84b2db1..66f65a8 100644
--- a/include/svl/custritm.hxx
+++ b/include/svl/custritm.hxx
@@ -41,8 +41,6 @@ public:
SfxPoolItem(rItem), m_aValue(rItem.m_aValue)
{}
- virtual ~CntUnencodedStringItem() override {}
-
virtual bool operator ==(const SfxPoolItem & rItem) const override;
virtual bool GetPresentation(SfxItemPresentation,
diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx
index f9fd4c0..3edb95e 100644
--- a/include/svl/flagitem.hxx
+++ b/include/svl/flagitem.hxx
@@ -33,9 +33,7 @@ public:
explicit SfxFlagItem( sal_uInt16 nWhich = 0, sal_uInt16 nValue = 0 );
SfxFlagItem( const SfxFlagItem& );
- virtual ~SfxFlagItem() override {}
-
- virtual sal_uInt8 GetFlagCount() const;
+ virtual sal_uInt8 GetFlagCount() const;
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const override;
diff --git a/include/svl/inethist.hxx b/include/svl/inethist.hxx
index e983d1d..f595997 100644
--- a/include/svl/inethist.hxx
+++ b/include/svl/inethist.hxx
@@ -105,7 +105,6 @@ class SVL_DLLPUBLIC INetURLHistoryHint: public SfxHint
const INetURLObject* pObj;
public:
explicit INetURLHistoryHint( const INetURLObject* Object ) : pObj(Object) {}
- virtual ~INetURLHistoryHint() override {}
const INetURLObject* GetObject() const { return pObj; }
};
diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx
index da2dc64..6a0e4e9 100644
--- a/include/svl/intitem.hxx
+++ b/include/svl/intitem.hxx
@@ -55,8 +55,6 @@ public:
SfxPoolItem(rItem), m_nValue(rItem.m_nValue)
{}
- virtual ~SfxInt16Item() override {}
-
virtual bool operator ==(const SfxPoolItem & rItem) const override;
virtual bool GetPresentation(SfxItemPresentation,
diff --git a/include/svl/metitem.hxx b/include/svl/metitem.hxx
index 5fcd3ce..c4a5217e 100644
--- a/include/svl/metitem.hxx
+++ b/include/svl/metitem.hxx
@@ -28,7 +28,6 @@ public:
explicit SfxMetricItem( sal_uInt16 nWhich, sal_uInt32 nValue );
SfxMetricItem( sal_uInt16 nWhich, SvStream & );
SfxMetricItem( const SfxMetricItem& );
- virtual ~SfxMetricItem() override {}
virtual void ScaleMetrics( long lMult, long lDiv ) override;
virtual bool HasMetrics() const override;
diff --git a/include/svl/nfkeytab.hxx b/include/svl/nfkeytab.hxx
index 923d528..7872cc4 100644
--- a/include/svl/nfkeytab.hxx
+++ b/include/svl/nfkeytab.hxx
@@ -111,7 +111,6 @@ class NfKeywordTable final
public:
NfKeywordTable() : m_keywords(NF_KEYWORD_ENTRIES_COUNT) {};
- ~NfKeywordTable() {}
OUString & operator[] (Keywords_t::size_type n) { return m_keywords[n]; }
const OUString & operator[] (Keywords_t::size_type n) const { return m_keywords[n]; }
diff --git a/include/svl/ondemand.hxx b/include/svl/ondemand.hxx
index a458877..69139b9 100644
--- a/include/svl/ondemand.hxx
+++ b/include/svl/ondemand.hxx
@@ -149,9 +149,6 @@ public:
, bValid(false)
, bInitialized(false)
{}
- ~OnDemandCalendarWrapper()
- {
- }
void init(
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
@@ -207,9 +204,6 @@ public:
, bValid(false)
, bInitialized(false)
{}
- ~OnDemandTransliterationWrapper()
- {
- }
bool isInitialized() const { return bInitialized; }
@@ -265,9 +259,6 @@ public:
: pPtr(nullptr)
, bInitialized(false)
{}
- ~OnDemandNativeNumberWrapper()
- {
- }
void init(
const css::uno::Reference< css::uno::XComponentContext >& rxContext
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index b6d8011..fa2fbd1 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -288,7 +288,6 @@ class SVL_DLLPUBLIC SfxPoolItemHint: public SfxHint
SfxPoolItem* pObj;
public:
explicit SfxPoolItemHint( SfxPoolItem* Object ) : pObj(Object) {}
- virtual ~SfxPoolItemHint() override {}
SfxPoolItem* GetObject() const { return pObj; }
};
diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx
index 62f7517..0d135ee 100644
--- a/include/svl/ptitem.hxx
+++ b/include/svl/ptitem.hxx
@@ -34,9 +34,8 @@ public:
SfxPointItem();
SfxPointItem( sal_uInt16 nWhich, const Point& rVal );
SfxPointItem( const SfxPointItem& );
- virtual ~SfxPointItem() override {}
- virtual bool GetPresentation( SfxItemPresentation ePres,
+ virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString &rText,
diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx
index 28872ae..359b7aa 100644
--- a/include/svl/rectitem.hxx
+++ b/include/svl/rectitem.hxx
@@ -35,7 +35,6 @@ public:
SfxRectangleItem();
SfxRectangleItem( sal_uInt16 nWhich, const Rectangle& rVal );
SfxRectangleItem( const SfxRectangleItem& );
- virtual ~SfxRectangleItem() override {}
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx
index 7fac379..0adfd84 100644
--- a/include/svl/szitem.hxx
+++ b/include/svl/szitem.hxx
@@ -33,9 +33,8 @@ private:
public:
SfxSizeItem( sal_uInt16 nWhich, const Size& rVal );
SfxSizeItem( const SfxSizeItem& );
- virtual ~SfxSizeItem() override {}
- virtual bool GetPresentation( SfxItemPresentation ePres,
+ virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString &rText,
diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx
index e6e054e..8d3076d 100644
--- a/include/svl/visitem.hxx
+++ b/include/svl/visitem.hxx
@@ -42,8 +42,6 @@ public:
SfxPoolItem(rItem), m_nValue(rItem.m_nValue)
{}
- virtual ~SfxVisibilityItem() override {}
-
virtual bool operator ==(const SfxPoolItem & rItem) const override;
virtual bool GetPresentation(SfxItemPresentation, MapUnit, MapUnit,
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index ab7dd90..37c2b26 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -249,7 +249,6 @@ public:
NfCurrencyEntry( const css::i18n::Currency & rCurr,
const LocaleDataWrapper& rLocaleData,
LanguageType eLang );
- ~NfCurrencyEntry() {}
/// Symbols and language identical
bool operator==( const NfCurrencyEntry& r ) const;
diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx
index 4631c99..49965ad 100644
--- a/include/svtools/ServerDetailsControls.hxx
+++ b/include/svtools/ServerDetailsControls.hxx
@@ -73,7 +73,6 @@ class HostDetailsContainer : public DetailsContainer
public:
HostDetailsContainer( VclBuilderContainer* pBuilder, sal_uInt16 nPort, const OUString& sScheme );
- virtual ~HostDetailsContainer( ) override { };
virtual void show( bool bShow = true ) override;
virtual INetURLObject getUrl( ) override;
@@ -95,7 +94,6 @@ class DavDetailsContainer : public HostDetailsContainer
public:
DavDetailsContainer( VclBuilderContainer* pBuilder );
- virtual ~DavDetailsContainer( ) override { };
virtual void show( bool bShow = true ) override;
virtual bool enableUserCredentials( ) override { return false; };
@@ -115,7 +113,6 @@ class SmbDetailsContainer : public DetailsContainer
public:
SmbDetailsContainer( VclBuilderContainer* pBuilder );
- virtual ~SmbDetailsContainer( ) override { };
virtual INetURLObject getUrl( ) override;
virtual bool setUrl( const INetURLObject& rUrl ) override;
@@ -140,7 +137,6 @@ class CmisDetailsContainer : public DetailsContainer
public:
CmisDetailsContainer(VclBuilderContainer* pBuilder, Dialog* pParentDialog, OUString const & sBinding);
- virtual ~CmisDetailsContainer( ) override { };
virtual void show( bool bShow = true ) override;
virtual INetURLObject getUrl( ) override;
diff --git a/include/svtools/imapcirc.hxx b/include/svtools/imapcirc.hxx
index f8c1273..1667abe 100644
--- a/include/svtools/imapcirc.hxx
+++ b/include/svtools/imapcirc.hxx
@@ -49,7 +49,6 @@ public:
const OUString& rName,
bool bActive = true,
bool bPixelCoords = true );
- virtual ~IMapCircleObject() override {}
virtual sal_uInt16 GetType() const override;
virtual bool IsHit( const Point& rPoint ) const override;
diff --git a/include/svtools/imappoly.hxx b/include/svtools/imappoly.hxx
index 5242edb..42626b5 100644
--- a/include/svtools/imappoly.hxx
+++ b/include/svtools/imappoly.hxx
@@ -50,7 +50,6 @@ public:
const OUString& rName,
bool bActive = true,
bool bPixelCoords = true );
- virtual ~IMapPolygonObject() override {}
virtual sal_uInt16 GetType() const override;
virtual bool IsHit( const Point& rPoint ) const override;
diff --git a/include/svtools/imaprect.hxx b/include/svtools/imaprect.hxx
index ba564ae..4aac469 100644
--- a/include/svtools/imaprect.hxx
+++ b/include/svtools/imaprect.hxx
@@ -48,7 +48,6 @@ public:
const OUString& rName,
bool bActive = true,
bool bPixelCoords = true );
- virtual ~IMapRectangleObject() override {};
virtual sal_uInt16 GetType() const override;
virtual bool IsHit( const Point& rPoint ) const override;
diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx
index 8a27031..2b97508 100644
--- a/include/svtools/ivctrl.hxx
+++ b/include/svtools/ivctrl.hxx
@@ -115,7 +115,6 @@ class SvxIconChoiceCtrlEntry
public:
SvxIconChoiceCtrlEntry( const OUString& rText, const Image& rImage );
- ~SvxIconChoiceCtrlEntry () {}
const Image& GetImage () const { return aImage; }
void SetText ( const OUString& rText ) { aText = rText; }
diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx
index b184702..03da935 100644
--- a/include/svtools/svparser.hxx
+++ b/include/svtools/svparser.hxx
@@ -81,7 +81,6 @@ protected:
, nTokenId(0)
{
}
- ~TokenStackType() { }
};
// methods for Token stack
diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx
index ea8ee3f..8e8bca2 100644
--- a/svl/source/items/slstitm.cxx
+++ b/svl/source/items/slstitm.cxx
@@ -34,14 +34,9 @@ public:
std::vector<OUString> aList;
SfxImpStringList() {}
- ~SfxImpStringList();
};
-SfxImpStringList::~SfxImpStringList()
-{
-}
-
SfxStringListItem::SfxStringListItem()
{
}
diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx
index 2fbee92..cfc61ab 100644
--- a/svl/source/items/stylepool.cxx
+++ b/svl/source/items/stylepool.cxx
@@ -362,10 +362,6 @@ public:
"<StylePoolImpl::StylePoolImpl(..)> - <SfxItemSet::Clone( sal_False )> does not work as excepted - <mpIgnorableItems> is not empty." );
}
- ~StylePoolImpl()
- {
- }
-
std::shared_ptr<SfxItemSet> insertItemSet( const SfxItemSet& rSet );
// #i86923#
diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx
index 3eecd4b..d84a262 100644
--- a/svl/source/misc/inethist.cxx
+++ b/svl/source/misc/inethist.cxx
@@ -150,7 +150,6 @@ class INetURLHistory_Impl
public:
INetURLHistory_Impl();
- ~INetURLHistory_Impl();
INetURLHistory_Impl(const INetURLHistory_Impl&) = delete;
INetURLHistory_Impl& operator=(const INetURLHistory_Impl&) = delete;
@@ -165,10 +164,6 @@ INetURLHistory_Impl::INetURLHistory_Impl()
initialize();
}
-INetURLHistory_Impl::~INetURLHistory_Impl()
-{
-}
-
void INetURLHistory_Impl::initialize()
{
m_aHead.initialize();
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index 116e3df..4636021 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -249,10 +249,6 @@ struct SfxUndoManager_Data
pActUndoArray = pUndoArray.get();
}
- ~SfxUndoManager_Data()
- {
- }
-
// Copy assignment is forbidden and not implemented.
SfxUndoManager_Data (const SfxUndoManager_Data &) = delete;
SfxUndoManager_Data & operator= (const SfxUndoManager_Data &) = delete;
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index 2dbb836..5c2fc33 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -52,7 +52,6 @@ private:
public:
SvtAccessibilityOptions_Impl();
- ~SvtAccessibilityOptions_Impl();
void SetVCLSettings();
bool GetIsForPagePreviews() const;
@@ -100,11 +99,6 @@ SvtAccessibilityOptions_Impl::SvtAccessibilityOptions_Impl()
}
}
-SvtAccessibilityOptions_Impl::~SvtAccessibilityOptions_Impl()
-{
-}
-
-
bool SvtAccessibilityOptions_Impl::GetIsForPagePreviews() const
{
css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 0981bc1..413e92c 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -88,7 +88,6 @@ private:
public:
ImplRulerData();
- ~ImplRulerData();
ImplRulerData& operator=( const ImplRulerData& rData );
};
@@ -111,9 +110,6 @@ ImplRulerData::ImplRulerData() :
{
}
-ImplRulerData::~ImplRulerData()
-{}
-
ImplRulerData& ImplRulerData::operator=( const ImplRulerData& rData )
{
if( this == &rData )
diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx
index c0e26ab..06a27c0 100644
--- a/svtools/source/control/scriptedtext.cxx
+++ b/svtools/source/control/scriptedtext.cxx
@@ -69,8 +69,6 @@ public:
/** Copy constructor. */
SvtScriptedTextHelper_Impl(
const SvtScriptedTextHelper_Impl& _rCopy );
- /** Destructor. */
- ~SvtScriptedTextHelper_Impl();
/** Sets new fonts and recalculates the text width. */
void SetFonts( vcl::Font* _pLatinFont, vcl::Font* _pAsianFont, vcl::Font* _pCmplxFont );
@@ -111,10 +109,6 @@ SvtScriptedTextHelper_Impl::SvtScriptedTextHelper_Impl( const SvtScriptedTextHel
{
}
-SvtScriptedTextHelper_Impl::~SvtScriptedTextHelper_Impl()
-{
-}
-
const vcl::Font& SvtScriptedTextHelper_Impl::GetFont( sal_uInt16 _nScript ) const
{
switch( _nScript )
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 8338cde..7d59771 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -472,10 +472,6 @@ void AssignmentPersistentData::ImplCommit()
memset(pFields, 0, sizeof(pFields));
}
- ~AddressBookSourceDialogData()
- {
- }
-
// Copy assignment is forbidden and not implemented.
AddressBookSourceDialogData (const AddressBookSourceDialogData &) = delete;
AddressBookSourceDialogData & operator= (const AddressBookSourceDialogData &) = delete;
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index 1d2cf43..273afff 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -48,10 +48,7 @@ private:
BitmapChecksum mnID4;
public:
-
-
explicit GraphicID( const GraphicObject& rObj );
- ~GraphicID() {}
bool operator==( const GraphicID& rID ) const
{
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 451a469..ac3f498 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -267,10 +267,6 @@ struct EmbeddedObjectRef_Impl
if (r.pGraphic && !r.bNeedUpdate)
pGraphic.reset( new Graphic(*r.pGraphic) );
}
-
- ~EmbeddedObjectRef_Impl()
- {
- }
};
const uno::Reference <embed::XEmbeddedObject>& EmbeddedObjectRef::operator->() const
More information about the Libreoffice-commits
mailing list