[Libreoffice-commits] core.git: sdext/source sd/inc sd/source
Noel Grandin
noel.grandin at collabora.co.uk
Mon Nov 7 13:01:18 UTC 2016
sd/inc/CustomAnimationEffect.hxx | 4 ++--
sd/inc/CustomAnimationPreset.hxx | 4 ++--
sd/inc/cusshow.hxx | 4 ++--
sd/source/filter/html/htmlex.hxx | 4 ++--
sd/source/ui/app/sdmod1.cxx | 3 +--
sd/source/ui/inc/SlideSorter.hxx | 4 ++--
sd/source/ui/inc/ViewShell.hxx | 2 +-
sd/source/ui/sidebar/MasterPageContainer.hxx | 4 ++--
sd/source/ui/sidebar/MasterPageContainerQueue.hxx | 4 ++--
sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx | 4 ++--
sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx | 4 ++--
sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx | 4 ++--
sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx | 4 ++--
sd/source/ui/table/TableDesignPane.hxx | 4 ++--
sdext/source/pdfimport/tree/pdfiprocessor.hxx | 3 +--
sdext/source/presenter/PresenterSprite.hxx | 4 ++--
16 files changed, 29 insertions(+), 31 deletions(-)
New commits:
commit 0a3eaf9f67f5e66ca0ae0c38cc4d85e07795b9f4
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Nov 7 13:33:38 2016 +0200
loplugin:unnecessaryvirtual in sd..sdext
Change-Id: Id0bc82210fadc138b55d1abe4e06b1d2ed564df3
Reviewed-on: https://gerrit.libreoffice.org/30659
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index bc6adda..952582b 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -51,14 +51,14 @@ typedef std::list< CustomAnimationEffectPtr > EffectSequence;
class EffectSequenceHelper;
-class SD_DLLPUBLIC CustomAnimationEffect
+class SD_DLLPUBLIC CustomAnimationEffect final
{
friend class MainSequence;
friend class EffectSequenceHelper;
public:
CustomAnimationEffect( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
- virtual ~CustomAnimationEffect();
+ ~CustomAnimationEffect();
SAL_DLLPRIVATE const css::uno::Reference< css::animations::XAnimationNode >& getNode() const { return mxNode; }
SAL_DLLPRIVATE void setNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index c519d3c..7f8252f 100644
--- a/sd/inc/CustomAnimationPreset.hxx
+++ b/sd/inc/CustomAnimationPreset.hxx
@@ -86,11 +86,11 @@ struct PresetCategory
typedef std::shared_ptr< PresetCategory > PresetCategoryPtr;
typedef std::vector< PresetCategoryPtr > PresetCategoryList;
-class SD_DLLPUBLIC CustomAnimationPresets
+class SD_DLLPUBLIC CustomAnimationPresets final
{
public:
SAL_DLLPRIVATE CustomAnimationPresets();
- SAL_DLLPRIVATE virtual ~CustomAnimationPresets();
+ SAL_DLLPRIVATE ~CustomAnimationPresets();
static const CustomAnimationPresets& getCustomAnimationPresets();
diff --git a/sd/inc/cusshow.hxx b/sd/inc/cusshow.hxx
index a6edd30..d0509ad 100644
--- a/sd/inc/cusshow.hxx
+++ b/sd/inc/cusshow.hxx
@@ -27,7 +27,7 @@
class SdDrawDocument;
class SdPage;
-class SD_DLLPUBLIC SdCustomShow
+class SD_DLLPUBLIC SdCustomShow final
{
public:
typedef ::std::vector<const SdPage*> PageVec;
@@ -47,7 +47,7 @@ public:
explicit SdCustomShow(SdDrawDocument* pDrawDoc);
SdCustomShow(SdDrawDocument* pDrawDoc, css::uno::Reference< css::uno::XInterface > const & xShow );
- virtual ~SdCustomShow();
+ ~SdCustomShow();
// @@@ copy ctor, but no copy assignment? @@@
SdCustomShow( const SdCustomShow& rShow );
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index c42f1b8..dc63989 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -76,7 +76,7 @@ public:
};
/// this class exports an Impress Document as a HTML Presentation.
-class HtmlExport
+class HtmlExport final
{
std::vector< SdPage* > maPages;
std::vector< SdPage* > maNotesPages;
@@ -229,7 +229,7 @@ class HtmlExport
SdDrawDocument* pExpDoc,
sd::DrawDocShell* pDocShell);
- virtual ~HtmlExport();
+ ~HtmlExport();
static OUString ColorToHTMLString( Color aColor );
static OUString StringToHTMLString( const OUString& rString );
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 1dcaae8..0fb7a27 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -73,14 +73,13 @@ using ::com::sun::star::uno::Sequence;
namespace {
-class OutlineToImpressFinalizer
+class OutlineToImpressFinalizer final
{
public:
OutlineToImpressFinalizer (
::sd::ViewShellBase& rBase,
SdDrawDocument& rDocument,
SvLockBytes& rBytes);
- virtual ~OutlineToImpressFinalizer() {};
void operator() (bool bEventSeen);
private:
::sd::ViewShellBase& mrBase;
diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx
index 6f85c3f..684f4db 100644
--- a/sd/source/ui/inc/SlideSorter.hxx
+++ b/sd/source/ui/inc/SlideSorter.hxx
@@ -64,11 +64,11 @@ namespace sd { namespace slidesorter {
Note that this class is not in its final state.
*/
-class SlideSorter
+class SlideSorter final
{
friend class controller::SlotManager;
public:
- virtual ~SlideSorter();
+ ~SlideSorter();
/// Forbid copy construction and copy assignment
SlideSorter(const SlideSorter&) = delete;
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 5d899f8..ab3c480 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -185,7 +185,7 @@ public:
bool HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWin);
- virtual void SetUIUnit(FieldUnit eUnit);
+ void SetUIUnit(FieldUnit eUnit);
void SetDefTabHRuler( sal_uInt16 nDefTab );
const SfxPoolItem* GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& nNumItemId);
diff --git a/sd/source/ui/sidebar/MasterPageContainer.hxx b/sd/source/ui/sidebar/MasterPageContainer.hxx
index be616cf..b0c8ac7 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.hxx
@@ -53,14 +53,14 @@ class MasterPageContainerChangeEvent;
Entries are accessed via a Token, which is mostly a numerical index but
whose values do not necessarily have to be consecutive.
*/
-class MasterPageContainer
+class MasterPageContainer final
{
public:
typedef int Token;
static const Token NIL_TOKEN = -1;
MasterPageContainer();
- virtual ~MasterPageContainer();
+ ~MasterPageContainer();
void AddChangeListener (const Link<MasterPageContainerChangeEvent&,void>& rLink);
void RemoveChangeListener (const Link<MasterPageContainerChangeEvent&,void>& rLink);
diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
index 99d8e47..092af20 100644
--- a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
@@ -33,7 +33,7 @@ namespace sd { namespace sidebar {
heuristic that uses values given with each request and which is
controlled by various parameters that are described below.
*/
-class MasterPageContainerQueue
+class MasterPageContainerQueue final
{
public:
class ContainerAdapter {
@@ -50,7 +50,7 @@ public:
static MasterPageContainerQueue* Create (
const std::weak_ptr<ContainerAdapter>& rpContainer);
- virtual ~MasterPageContainerQueue();
+ ~MasterPageContainerQueue();
/** This method is typically called for entries in the container for
which GetPreviewState() returns OS_CREATABLE. The creation of the
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
index 73779ab..3898474 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
@@ -49,7 +49,7 @@ class RequestQueue;
timer is started that eventually calls ProcessRequest(). This is
repeated until the queue is empty or Stop() is called.
*/
-class QueueProcessor
+class QueueProcessor final
{
public:
typedef ::std::function<bool ()> IdleDetectionCallback;
@@ -59,7 +59,7 @@ public:
const Size& rPreviewSize,
const bool bDoSuperSampling,
const SharedCacheContext& rpCacheContext);
- virtual ~QueueProcessor();
+ ~QueueProcessor();
/** Start the processor. This implementation is timer based and waits
an defined amount of time that depends on the given argument before
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
index f28cd44..80f981c 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
@@ -61,7 +61,7 @@ class SelectionManager;
class SlotManager;
class VisibleAreaManager;
-class SlideSorterController
+class SlideSorterController final
{
public:
/** Create a new controller for the slide sorter.
@@ -76,7 +76,7 @@ public:
*/
void Init();
- virtual ~SlideSorterController();
+ ~SlideSorterController();
void Dispose();
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
index c88b032..cbe0072 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
@@ -37,11 +37,11 @@ namespace sd { namespace slidesorter { namespace controller {
StartObservation() and EndObservation(). When the later is called
the selection is set to just the newly inserted pages.
*/
-class SelectionObserver
+class SelectionObserver final
{
public:
SelectionObserver (SlideSorter& rSlideSorter);
- virtual ~SelectionObserver();
+ ~SelectionObserver();
void NotifyPageEvent (const SdrPage* pPage);
void StartObservation();
diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
index 148a89c..ad3bbcf 100644
--- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
@@ -49,12 +49,12 @@ inline sal_Int32 FromCoreIndex (const sal_uInt16 nCoreIndex) { return (nCoreInde
this set of slides can be modified (but do not call it directly, use
SlideSorterController::SetDocumentSlides() instead.)
*/
-class SlideSorterModel
+class SlideSorterModel final
{
public:
SlideSorterModel (SlideSorter& rSlideSorter);
- virtual ~SlideSorterModel();
+ ~SlideSorterModel();
void Dispose();
/** This method is present to let the view create a ShowView for
diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx
index 90dc69f..e8dbbe3 100644
--- a/sd/source/ui/table/TableDesignPane.hxx
+++ b/sd/source/ui/table/TableDesignPane.hxx
@@ -63,11 +63,11 @@ public:
void setModal(bool bModal) { m_bModal = bModal; }
};
-class TableDesignWidget
+class TableDesignWidget final
{
public:
TableDesignWidget( VclBuilderContainer* pParent, ViewShellBase& rBase, bool bModal );
- virtual ~TableDesignWidget();
+ ~TableDesignWidget();
// callbacks
void onSelectionChanged();
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
index bcce100..1588b05 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
@@ -199,7 +199,7 @@ namespace pdfi
bool m_bHaveTextOnDocLevel;
};
- class CharGlyph
+ class CharGlyph final
{
public:
CharGlyph(Element* pCurElement, const GraphicsContext& rCurrentContext,
@@ -207,7 +207,6 @@ namespace pdfi
: m_pCurElement(pCurElement), m_rCurrentContext(rCurrentContext),
m_Width(width), m_PrevSpaceWidth(prevSpaceWidth), m_rGlyphs(rGlyphs) {};
- virtual ~CharGlyph(){};
OUString& getGlyph(){ return m_rGlyphs; }
double getWidth(){ return m_Width; }
double getPrevSpaceWidth(){ return m_PrevSpaceWidth; }
diff --git a/sdext/source/presenter/PresenterSprite.hxx b/sdext/source/presenter/PresenterSprite.hxx
index c73400f..a2383e0 100644
--- a/sdext/source/presenter/PresenterSprite.hxx
+++ b/sdext/source/presenter/PresenterSprite.hxx
@@ -32,11 +32,11 @@ namespace sdext { namespace presenter {
to show the sprite when its size is not yet defined (results in a crash)
and hiding a sprite before disposing it (results in zombie sprites.)
*/
-class PresenterSprite
+class PresenterSprite final
{
public:
PresenterSprite();
- virtual ~PresenterSprite();
+ ~PresenterSprite();
PresenterSprite(const PresenterSprite&) = delete;
PresenterSprite& operator=(const PresenterSprite&) = delete;
More information about the Libreoffice-commits
mailing list