[Libreoffice-commits] core.git: scaddins/source sdext/source sd/inc sd/source
Noel Grandin
noel.grandin at collabora.co.uk
Wed Jan 25 07:31:55 UTC 2017
scaddins/source/datefunc/datefunc.hxx | 1
sd/inc/imapinfo.hxx | 2 -
sd/inc/sdundo.hxx | 1
sd/source/filter/eppt/grouptable.hxx | 2 -
sd/source/filter/html/htmlex.hxx | 1
sd/source/filter/ppt/propread.hxx | 1
sd/source/ui/framework/configuration/ConfigurationController.cxx | 5 --
sd/source/ui/inc/dlg_char.hxx | 1
sd/source/ui/inc/dlgpage.hxx | 1
sd/source/ui/inc/gluectrl.hxx | 1
sd/source/ui/inc/optsitem.hxx | 6 ---
sd/source/ui/inc/paragr.hxx | 1
sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx | 1
sd/source/ui/slidesorter/controller/SlsAnimator.cxx | 5 --
sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx | 5 --
sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx | 5 --
sdext/source/minimizer/configurationaccess.hxx | 1
sdext/source/minimizer/optimizationstats.hxx | 1
sdext/source/pdfimport/inc/pdfparse.hxx | 1
sdext/source/pdfimport/pdfparse/pdfentries.cxx | 1
sdext/source/pdfimport/tree/writertreevisiting.hxx | 6 ---
sdext/source/presenter/PresenterPaneBorderPainter.cxx | 5 --
sdext/source/presenter/PresenterSlideSorter.cxx | 10 -----
sdext/source/presenter/PresenterTheme.cxx | 20 ----------
sdext/source/presenter/PresenterTimer.cxx | 1
25 files changed, 85 deletions(-)
New commits:
commit 4fabc2347c75bd09312c6d4b5c7695c26914af52
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Jan 25 08:36:58 2017 +0200
loplugin: unnecessary destructor scaddins..sdext
Change-Id: I6ae02ad25863ec7e0f780020dbc69c9a99488c24
Reviewed-on: https://gerrit.libreoffice.org/33511
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx
index f86920a..490fcd1 100644
--- a/scaddins/source/datefunc/datefunc.hxx
+++ b/scaddins/source/datefunc/datefunc.hxx
@@ -199,7 +199,6 @@ private:
public:
ScaDateAddIn();
- virtual ~ScaDateAddIn() override =default;
static OUString getImplementationName_Static();
static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
diff --git a/sd/inc/imapinfo.hxx b/sd/inc/imapinfo.hxx
index 665a68f..7091f64 100644
--- a/sd/inc/imapinfo.hxx
+++ b/sd/inc/imapinfo.hxx
@@ -43,8 +43,6 @@ public:
SfxListener(),
aImageMap( rIMapInfo.aImageMap ) {};
- virtual ~SdIMapInfo() override {};
-
virtual SdrObjUserData* Clone( SdrObject* ) const override { return new SdIMapInfo( *this ); }
void SetImageMap( const ImageMap& rIMap ) { aImageMap = rIMap; }
diff --git a/sd/inc/sdundo.hxx b/sd/inc/sdundo.hxx
index fa2d06e..159c1f1 100644
--- a/sd/inc/sdundo.hxx
+++ b/sd/inc/sdundo.hxx
@@ -29,7 +29,6 @@ class SD_DLLPUBLIC SdUndoAction : public SfxUndoAction
{
public:
SdUndoAction(SdDrawDocument* pSdDrawDocument);
- virtual ~SdUndoAction() override {}
void SetComment(const OUString& rStr) { maComment = rStr; }
virtual OUString GetComment() const override { return maComment; }
diff --git a/sd/source/filter/eppt/grouptable.hxx b/sd/source/filter/eppt/grouptable.hxx
index 079cb67..dd672c2 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 dc63989..a9c2939 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 c874eeb..fc1e3f2 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 b15ca31..daec78b 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 fb26411..62e4c9d 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 cd8f426..bebbfbb 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 9da2e24..15e8a0c 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 200415a..9526aee 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 dca7ea4..9389fed 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 ef80dac..82de3de 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 35c578f..fd6a63e 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 8521d69..778fa8d 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 ab6dd2c..dcff6a6 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
diff --git a/sdext/source/minimizer/configurationaccess.hxx b/sdext/source/minimizer/configurationaccess.hxx
index 3a23d22..06d0c5b 100644
--- a/sdext/source/minimizer/configurationaccess.hxx
+++ b/sdext/source/minimizer/configurationaccess.hxx
@@ -68,7 +68,6 @@ struct OptimizerSettings
mbSaveAs( true ),
mbOpenNewDocument( true ),
mnEstimatedFileSize( 0 ){};
- ~OptimizerSettings(){};
void LoadSettingsFromConfiguration( const css::uno::Reference< css::container::XNameAccess >& rSettings );
void SaveSettingsToConfiguration( const css::uno::Reference< css::container::XNameReplace >& rSettings );
diff --git a/sdext/source/minimizer/optimizationstats.hxx b/sdext/source/minimizer/optimizationstats.hxx
index 29824da..6988a10 100644
--- a/sdext/source/minimizer/optimizationstats.hxx
+++ b/sdext/source/minimizer/optimizationstats.hxx
@@ -33,7 +33,6 @@ class OptimizationStats
public:
OptimizationStats();
- ~OptimizationStats(){};
void SetStatusValue( const PPPOptimizerTokenEnum eStat, const css::uno::Any& rStatValue );
const css::uno::Any* GetStatusValue( const PPPOptimizerTokenEnum eStat ) const;
diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx b/sdext/source/pdfimport/inc/pdfparse.hxx
index d368286..4620cb6 100644
--- a/sdext/source/pdfimport/inc/pdfparse.hxx
+++ b/sdext/source/pdfimport/inc/pdfparse.hxx
@@ -290,7 +290,6 @@ class PDFReader
{
public:
PDFReader() {}
- ~PDFReader() {}
static PDFEntry* read( const char* pFileName );
#ifdef _WIN32
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 87dda7d..956327c 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -72,7 +72,6 @@ struct EmitImplData
m_nDecryptObject( 0 ),
m_nDecryptGeneration( 0 )
{}
- ~EmitImplData() {}
void decrypt( const sal_uInt8* pInBuffer, sal_uInt32 nLen, sal_uInt8* pOutBuffer,
unsigned int nObject, unsigned int nGeneration ) const
{
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.hxx b/sdext/source/pdfimport/tree/writertreevisiting.hxx
index dcd9942..10b6f64 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.hxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.hxx
@@ -37,8 +37,6 @@ namespace pdfi
explicit WriterXmlOptimizer(PDFIProcessor& rProcessor) :
m_rProcessor(rProcessor)
{}
- virtual ~WriterXmlOptimizer() override
- {}
virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) override;
virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ) override;
@@ -66,8 +64,6 @@ namespace pdfi
m_rStyleContainer(rStyleContainer),
m_rProcessor(rProcessor)
{}
- virtual ~WriterXmlFinalizer() override
- {}
virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) override;
virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ) override;
@@ -91,8 +87,6 @@ namespace pdfi
explicit WriterXmlEmitter(EmitContext& rEmitContext) :
m_rEmitContext(rEmitContext)
{}
- virtual ~WriterXmlEmitter() override
- {}
virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) override;
virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ) override;
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
index 70b9ffe..7d6f60a 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
@@ -107,7 +107,6 @@ public:
Renderer (
const Reference<XComponentContext>& rxContext,
const std::shared_ptr<PresenterTheme>& rpTheme);
- ~Renderer();
void SetCanvas (const Reference<rendering::XCanvas>& rxCanvas);
void PaintBorder (
@@ -409,10 +408,6 @@ PresenterPaneBorderPainter::Renderer::Renderer (
}
}
-PresenterPaneBorderPainter::Renderer::~Renderer()
-{
-}
-
void PresenterPaneBorderPainter::Renderer::SetCanvas (const Reference<rendering::XCanvas>& rxCanvas)
{
if (mxCanvas != rxCanvas)
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index 6d58ac6..d493344 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -139,7 +139,6 @@ public:
const std::shared_ptr<PresenterTheme>& rpTheme,
const Reference<awt::XWindow>& rxInvalidateTarget,
const std::shared_ptr<PresenterPaintManager>& rpPaintManager);
- ~MouseOverManager();
MouseOverManager(const MouseOverManager&) = delete;
MouseOverManager& operator=(const MouseOverManager&) = delete;
@@ -191,7 +190,6 @@ public:
CurrentSlideFrameRenderer (
const css::uno::Reference<css::uno::XComponentContext>& rxContext,
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas);
- ~CurrentSlideFrameRenderer();
void PaintCurrentSlideFrame (
const awt::Rectangle& rSlideBoundingBox,
@@ -1508,10 +1506,6 @@ PresenterSlideSorter::MouseOverManager::MouseOverManager (
}
}
-PresenterSlideSorter::MouseOverManager::~MouseOverManager()
-{
-}
-
void PresenterSlideSorter::MouseOverManager::Paint (
const sal_Int32 nSlideIndex,
const Reference<rendering::XCanvas>& rxCanvas,
@@ -1844,10 +1838,6 @@ PresenterSlideSorter::CurrentSlideFrameRenderer::CurrentSlideFrameRenderer (
}
}
-PresenterSlideSorter::CurrentSlideFrameRenderer::~CurrentSlideFrameRenderer()
-{
-}
-
void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintCurrentSlideFrame (
const awt::Rectangle& rSlideBoundingBox,
const Reference<rendering::XCanvas>& rxCanvas,
diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx
index 8f5ed5f..74ff11a 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -93,7 +93,6 @@ public:
ReadContext (
const Reference<XComponentContext>& rxContext,
const Reference<rendering::XCanvas>& rxCanvas);
- ~ReadContext();
/** Read data describing a font from the node that can be reached from
the given root via the given path.
@@ -126,7 +125,6 @@ class PaneStyle
{
public:
PaneStyle();
- ~PaneStyle();
const SharedBitmapDescriptor GetBitmap (const OUString& sBitmapName) const;
@@ -167,7 +165,6 @@ class ViewStyle
{
public:
ViewStyle();
- ~ViewStyle();
const SharedBitmapDescriptor GetBitmap (const OUString& sBitmapName) const;
@@ -233,7 +230,6 @@ public:
const OUString& rsName,
const Reference<container::XHierarchicalNameAccess>& rThemeRoot,
const OUString& rsNodeName);
- ~Theme();
void Read (
PresenterConfigurationAccess& rConfiguration,
@@ -598,10 +594,6 @@ PresenterTheme::Theme::Theme (
{
}
-PresenterTheme::Theme::~Theme()
-{
-}
-
void PresenterTheme::Theme::Read (
PresenterConfigurationAccess& rConfiguration,
ReadContext& rReadContext)
@@ -712,10 +704,6 @@ ReadContext::ReadContext (
}
}
-ReadContext::~ReadContext()
-{
-}
-
PresenterTheme::SharedFontDescriptor ReadContext::ReadFont (
const Reference<container::XHierarchicalNameAccess>& rxNode,
const OUString& rsFontPath,
@@ -951,10 +939,6 @@ PaneStyle::PaneStyle()
{
}
-PaneStyle::~PaneStyle()
-{
-}
-
const SharedBitmapDescriptor PaneStyle::GetBitmap (const OUString& rsBitmapName) const
{
if (mpBitmaps.get() != nullptr)
@@ -1071,10 +1055,6 @@ ViewStyle::ViewStyle()
{
}
-ViewStyle::~ViewStyle()
-{
-}
-
const SharedBitmapDescriptor ViewStyle::GetBitmap (const OUString& rsBitmapName) const
{
if (rsBitmapName == "Background")
diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx
index e9d3117..093f754 100644
--- a/sdext/source/presenter/PresenterTimer.cxx
+++ b/sdext/source/presenter/PresenterTimer.cxx
@@ -42,7 +42,6 @@ public:
const TimeValue& rDueTime,
const sal_Int64 nRepeatIntervall,
const sal_Int32 nTaskId);
- ~TimerTask() {}
PresenterTimer::Task maTask;
TimeValue maDueTime;
More information about the Libreoffice-commits
mailing list