summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-01-25 08:36:58 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-01-25 07:31:25 +0000
commit4fabc2347c75bd09312c6d4b5c7695c26914af52 (patch)
tree3829249cd0698e443418c028d46352d224c3d57c /sd/source
parent92c2c5f62d6e8962259e03424a40b6ac7ef32e7d (diff)
loplugin: unnecessary destructor scaddins..sdext
Change-Id: I6ae02ad25863ec7e0f780020dbc69c9a99488c24 Reviewed-on: https://gerrit.libreoffice.org/33511 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/filter/eppt/grouptable.hxx2
-rw-r--r--sd/source/filter/html/htmlex.hxx1
-rw-r--r--sd/source/filter/ppt/propread.hxx1
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationController.cxx5
-rw-r--r--sd/source/ui/inc/dlg_char.hxx1
-rw-r--r--sd/source/ui/inc/dlgpage.hxx1
-rw-r--r--sd/source/ui/inc/gluectrl.hxx1
-rw-r--r--sd/source/ui/inc/optsitem.hxx6
-rw-r--r--sd/source/ui/inc/paragr.hxx1
-rw-r--r--sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx1
-rw-r--r--sd/source/ui/slidesorter/controller/SlsAnimator.cxx5
-rw-r--r--sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx5
-rw-r--r--sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx5
13 files changed, 0 insertions, 35 deletions
diff --git a/sd/source/filter/eppt/grouptable.hxx b/sd/source/filter/eppt/grouptable.hxx
index 079cb677a92c..dd672c240f61 100644
--- a/sd/source/filter/eppt/grouptable.hxx
+++ b/sd/source/filter/eppt/grouptable.hxx
@@ -40,8 +40,6 @@ struct GroupEntry
mnCount = nCount;
mnCurrentPos = 0;
};
-
- ~GroupEntry(){};
};
class GroupTable
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index dc63989447ba..a9c2939adea3 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -67,7 +67,6 @@ private:
public:
explicit HtmlErrorContext();
- virtual ~HtmlErrorContext() override {};
virtual bool GetString( sal_uLong nErrId, OUString& rCtxStr ) override;
diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx
index c874eeb4d5fd..fc1e3f272791 100644
--- a/sd/source/filter/ppt/propread.hxx
+++ b/sd/source/filter/ppt/propread.hxx
@@ -91,7 +91,6 @@ struct PropEntry
PropEntry( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBufSize );
PropEntry( const PropEntry& rProp );
- ~PropEntry() {}
PropEntry& operator=(const PropEntry& rPropEntry);
};
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index b15ca317b626..daec78bc54cd 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -53,7 +53,6 @@ public:
Implementation (
ConfigurationController& rController,
const Reference<frame::XController>& rxController);
- ~Implementation();
Reference<XControllerManager> mxControllerManager;
@@ -560,10 +559,6 @@ ConfigurationController::Implementation::Implementation (
mpQueueProcessor->SetConfiguration(mxRequestedConfiguration);
}
-ConfigurationController::Implementation::~Implementation()
-{
-}
-
} } // end of namespace sd::framework
diff --git a/sd/source/ui/inc/dlg_char.hxx b/sd/source/ui/inc/dlg_char.hxx
index fb264115d7a6..62e4c9d7479e 100644
--- a/sd/source/ui/inc/dlg_char.hxx
+++ b/sd/source/ui/inc/dlg_char.hxx
@@ -44,7 +44,6 @@ public:
SdCharDlg( vcl::Window* pParent, const SfxItemSet* pAttr,
const SfxObjectShell* pDocShell );
- virtual ~SdCharDlg() override {};
};
#endif // INCLUDED_SD_SOURCE_UI_INC_DLG_CHAR_HXX
diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx
index cd8f426aafdc..bebbfbba99ad 100644
--- a/sd/source/ui/inc/dlgpage.hxx
+++ b/sd/source/ui/inc/dlgpage.hxx
@@ -44,7 +44,6 @@ private:
public:
SdPageDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, const SfxItemSet* pAttr, bool bAreaPage );
- virtual ~SdPageDlg() override {};
virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) override;
};
diff --git a/sd/source/ui/inc/gluectrl.hxx b/sd/source/ui/inc/gluectrl.hxx
index 9da2e24e438c..15e8a0caf0d4 100644
--- a/sd/source/ui/inc/gluectrl.hxx
+++ b/sd/source/ui/inc/gluectrl.hxx
@@ -58,7 +58,6 @@ public:
SFX_DECL_TOOLBOX_CONTROL();
SdTbxCtlGlueEscDir( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
- virtual ~SdTbxCtlGlueEscDir() override {}
};
#endif // INCLUDED_SD_SOURCE_UI_INC_GLUECTRL_HXX
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index 200415af9e06..9526aee6d539 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -118,7 +118,6 @@ protected:
public:
SdOptionsLayout( sal_uInt16 nConfigId, bool bUseConfig );
- virtual ~SdOptionsLayout() override {}
bool operator==( const SdOptionsLayout& rOpt ) const;
@@ -168,7 +167,6 @@ protected:
public:
SdOptionsContents( sal_uInt16 nConfigId, bool bUseConfig );
- virtual ~SdOptionsContents() override {}
bool operator==( const SdOptionsContents& rOpt ) const;
};
@@ -240,7 +238,6 @@ protected:
public:
SdOptionsMisc( sal_uInt16 nConfigId, bool bUseConfig );
- virtual ~SdOptionsMisc() override {}
bool operator==( const SdOptionsMisc& rOpt ) const;
@@ -361,7 +358,6 @@ protected:
public:
SdOptionsSnap( sal_uInt16 nConfigId, bool bUseConfig );
- virtual ~SdOptionsSnap() override {}
bool operator==( const SdOptionsSnap& rOpt ) const;
@@ -421,7 +417,6 @@ protected:
public:
explicit SdOptionsZoom(sal_uInt16 nConfigId);
- virtual ~SdOptionsZoom() override {}
void GetScale( sal_Int32& rX, sal_Int32& rY ) const { Init(); rX = nX; rY = nY; }
void SetScale( sal_Int32 nInX, sal_Int32 nInY ) { if( nX != nInX || nY != nInY ) { OptionsChanged(); nX = nInX; nY = nInY; } }
@@ -509,7 +504,6 @@ protected:
public:
SdOptionsPrint( sal_uInt16 nConfigId, bool bUseConfig );
- virtual ~SdOptionsPrint() override {}
bool operator==( const SdOptionsPrint& rOpt ) const;
diff --git a/sd/source/ui/inc/paragr.hxx b/sd/source/ui/inc/paragr.hxx
index dca7ea4a0de8..9389fedbf6fd 100644
--- a/sd/source/ui/inc/paragr.hxx
+++ b/sd/source/ui/inc/paragr.hxx
@@ -34,7 +34,6 @@ private:
public:
SdParagraphDlg( vcl::Window* pParent, const SfxItemSet* pAttr );
- virtual ~SdParagraphDlg() override {};
};
#endif // INCLUDED_SD_SOURCE_UI_INC_PARAGR_HXX
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
index ef80dac94e08..82de3de025f2 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
@@ -40,7 +40,6 @@ class BitmapCache::CacheEntry
public:
CacheEntry(const Bitmap& rBitmap, sal_Int32 nLastAccessTime, bool bIsPrecious);
CacheEntry(sal_Int32 nLastAccessTime, bool bIsPrecious);
- ~CacheEntry() {};
inline void Recycle (const CacheEntry& rEntry);
inline sal_Int32 GetMemorySize() const;
void Compress (const std::shared_ptr<BitmapCompressor>& rpCompressor);
diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
index 35c578f0aa3d..fd6a63ebdf6a 100644
--- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
@@ -36,7 +36,6 @@ public:
const double nGlobalTime,
const Animator::AnimationId nAnimationId,
const Animator::FinishFunctor& rFinishFunctor);
- ~Animation();
/** Run next animation step. If animation has reached its end it is
expired.
*/
@@ -246,10 +245,6 @@ Animator::Animation::Animation (
Run(nGlobalTime);
}
-Animator::Animation::~Animation()
-{
-}
-
bool Animator::Animation::Run (const double nGlobalTime)
{
if ( ! mbIsExpired)
diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
index 8521d69fc852..778fa8d4d4e8 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
@@ -59,7 +59,6 @@ public:
const sal_Int32 nRunIndex,
const sal_Int32 nStartIndex,
const sal_Int32 nEndIndex);
- ~PageObjectRun();
void operator () (const double nTime);
@@ -316,10 +315,6 @@ PageObjectRun::PageObjectRun (
maEndOffset.resize(nEndIndex - nStartIndex + 1);
}
-PageObjectRun::~PageObjectRun()
-{
-}
-
void PageObjectRun::UpdateOffsets(
const InsertPosition& rInsertPosition,
const view::Layouter& rLayouter)
diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
index ab6dd2c8bb1b..dcff6a61d45d 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
@@ -100,7 +100,6 @@ class Layer
{
public:
Layer();
- ~Layer();
Layer(const Layer&) = delete;
Layer& operator=(const Layer&) = delete;
@@ -378,10 +377,6 @@ Layer::Layer()
{
}
-Layer::~Layer()
-{
-}
-
void Layer::Initialize (sd::Window *pTargetWindow)
{
#if 0