Kaydet (Commit) 0a3eaf9f authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:unnecessaryvirtual in sd..sdext

Change-Id: Id0bc82210fadc138b55d1abe4e06b1d2ed564df3
Reviewed-on: https://gerrit.libreoffice.org/30659Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
Tested-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 19dc288c
...@@ -51,14 +51,14 @@ typedef std::list< CustomAnimationEffectPtr > EffectSequence; ...@@ -51,14 +51,14 @@ typedef std::list< CustomAnimationEffectPtr > EffectSequence;
class EffectSequenceHelper; class EffectSequenceHelper;
class SD_DLLPUBLIC CustomAnimationEffect class SD_DLLPUBLIC CustomAnimationEffect final
{ {
friend class MainSequence; friend class MainSequence;
friend class EffectSequenceHelper; friend class EffectSequenceHelper;
public: public:
CustomAnimationEffect( const css::uno::Reference< css::animations::XAnimationNode >& xNode ); 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 const css::uno::Reference< css::animations::XAnimationNode >& getNode() const { return mxNode; }
SAL_DLLPRIVATE void setNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode ); SAL_DLLPRIVATE void setNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
......
...@@ -86,11 +86,11 @@ struct PresetCategory ...@@ -86,11 +86,11 @@ struct PresetCategory
typedef std::shared_ptr< PresetCategory > PresetCategoryPtr; typedef std::shared_ptr< PresetCategory > PresetCategoryPtr;
typedef std::vector< PresetCategoryPtr > PresetCategoryList; typedef std::vector< PresetCategoryPtr > PresetCategoryList;
class SD_DLLPUBLIC CustomAnimationPresets class SD_DLLPUBLIC CustomAnimationPresets final
{ {
public: public:
SAL_DLLPRIVATE CustomAnimationPresets(); SAL_DLLPRIVATE CustomAnimationPresets();
SAL_DLLPRIVATE virtual ~CustomAnimationPresets(); SAL_DLLPRIVATE ~CustomAnimationPresets();
static const CustomAnimationPresets& getCustomAnimationPresets(); static const CustomAnimationPresets& getCustomAnimationPresets();
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
class SdDrawDocument; class SdDrawDocument;
class SdPage; class SdPage;
class SD_DLLPUBLIC SdCustomShow class SD_DLLPUBLIC SdCustomShow final
{ {
public: public:
typedef ::std::vector<const SdPage*> PageVec; typedef ::std::vector<const SdPage*> PageVec;
...@@ -47,7 +47,7 @@ public: ...@@ -47,7 +47,7 @@ public:
explicit SdCustomShow(SdDrawDocument* pDrawDoc); explicit SdCustomShow(SdDrawDocument* pDrawDoc);
SdCustomShow(SdDrawDocument* pDrawDoc, css::uno::Reference< css::uno::XInterface > const & xShow ); SdCustomShow(SdDrawDocument* pDrawDoc, css::uno::Reference< css::uno::XInterface > const & xShow );
virtual ~SdCustomShow(); ~SdCustomShow();
// @@@ copy ctor, but no copy assignment? @@@ // @@@ copy ctor, but no copy assignment? @@@
SdCustomShow( const SdCustomShow& rShow ); SdCustomShow( const SdCustomShow& rShow );
......
...@@ -76,7 +76,7 @@ public: ...@@ -76,7 +76,7 @@ public:
}; };
/// this class exports an Impress Document as a HTML Presentation. /// this class exports an Impress Document as a HTML Presentation.
class HtmlExport class HtmlExport final
{ {
std::vector< SdPage* > maPages; std::vector< SdPage* > maPages;
std::vector< SdPage* > maNotesPages; std::vector< SdPage* > maNotesPages;
...@@ -229,7 +229,7 @@ class HtmlExport ...@@ -229,7 +229,7 @@ class HtmlExport
SdDrawDocument* pExpDoc, SdDrawDocument* pExpDoc,
sd::DrawDocShell* pDocShell); sd::DrawDocShell* pDocShell);
virtual ~HtmlExport(); ~HtmlExport();
static OUString ColorToHTMLString( Color aColor ); static OUString ColorToHTMLString( Color aColor );
static OUString StringToHTMLString( const OUString& rString ); static OUString StringToHTMLString( const OUString& rString );
......
...@@ -73,14 +73,13 @@ using ::com::sun::star::uno::Sequence; ...@@ -73,14 +73,13 @@ using ::com::sun::star::uno::Sequence;
namespace { namespace {
class OutlineToImpressFinalizer class OutlineToImpressFinalizer final
{ {
public: public:
OutlineToImpressFinalizer ( OutlineToImpressFinalizer (
::sd::ViewShellBase& rBase, ::sd::ViewShellBase& rBase,
SdDrawDocument& rDocument, SdDrawDocument& rDocument,
SvLockBytes& rBytes); SvLockBytes& rBytes);
virtual ~OutlineToImpressFinalizer() {};
void operator() (bool bEventSeen); void operator() (bool bEventSeen);
private: private:
::sd::ViewShellBase& mrBase; ::sd::ViewShellBase& mrBase;
......
...@@ -64,11 +64,11 @@ namespace sd { namespace slidesorter { ...@@ -64,11 +64,11 @@ namespace sd { namespace slidesorter {
Note that this class is not in its final state. Note that this class is not in its final state.
*/ */
class SlideSorter class SlideSorter final
{ {
friend class controller::SlotManager; friend class controller::SlotManager;
public: public:
virtual ~SlideSorter(); ~SlideSorter();
/// Forbid copy construction and copy assignment /// Forbid copy construction and copy assignment
SlideSorter(const SlideSorter&) = delete; SlideSorter(const SlideSorter&) = delete;
......
...@@ -185,7 +185,7 @@ public: ...@@ -185,7 +185,7 @@ public:
bool HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWin); bool HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWin);
virtual void SetUIUnit(FieldUnit eUnit); void SetUIUnit(FieldUnit eUnit);
void SetDefTabHRuler( sal_uInt16 nDefTab ); void SetDefTabHRuler( sal_uInt16 nDefTab );
const SfxPoolItem* GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& nNumItemId); const SfxPoolItem* GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& nNumItemId);
......
...@@ -53,14 +53,14 @@ class MasterPageContainerChangeEvent; ...@@ -53,14 +53,14 @@ class MasterPageContainerChangeEvent;
Entries are accessed via a Token, which is mostly a numerical index but Entries are accessed via a Token, which is mostly a numerical index but
whose values do not necessarily have to be consecutive. whose values do not necessarily have to be consecutive.
*/ */
class MasterPageContainer class MasterPageContainer final
{ {
public: public:
typedef int Token; typedef int Token;
static const Token NIL_TOKEN = -1; static const Token NIL_TOKEN = -1;
MasterPageContainer(); MasterPageContainer();
virtual ~MasterPageContainer(); ~MasterPageContainer();
void AddChangeListener (const Link<MasterPageContainerChangeEvent&,void>& rLink); void AddChangeListener (const Link<MasterPageContainerChangeEvent&,void>& rLink);
void RemoveChangeListener (const Link<MasterPageContainerChangeEvent&,void>& rLink); void RemoveChangeListener (const Link<MasterPageContainerChangeEvent&,void>& rLink);
......
...@@ -33,7 +33,7 @@ namespace sd { namespace sidebar { ...@@ -33,7 +33,7 @@ namespace sd { namespace sidebar {
heuristic that uses values given with each request and which is heuristic that uses values given with each request and which is
controlled by various parameters that are described below. controlled by various parameters that are described below.
*/ */
class MasterPageContainerQueue class MasterPageContainerQueue final
{ {
public: public:
class ContainerAdapter { class ContainerAdapter {
...@@ -50,7 +50,7 @@ public: ...@@ -50,7 +50,7 @@ public:
static MasterPageContainerQueue* Create ( static MasterPageContainerQueue* Create (
const std::weak_ptr<ContainerAdapter>& rpContainer); const std::weak_ptr<ContainerAdapter>& rpContainer);
virtual ~MasterPageContainerQueue(); ~MasterPageContainerQueue();
/** This method is typically called for entries in the container for /** This method is typically called for entries in the container for
which GetPreviewState() returns OS_CREATABLE. The creation of the which GetPreviewState() returns OS_CREATABLE. The creation of the
......
...@@ -49,7 +49,7 @@ class RequestQueue; ...@@ -49,7 +49,7 @@ class RequestQueue;
timer is started that eventually calls ProcessRequest(). This is timer is started that eventually calls ProcessRequest(). This is
repeated until the queue is empty or Stop() is called. repeated until the queue is empty or Stop() is called.
*/ */
class QueueProcessor class QueueProcessor final
{ {
public: public:
typedef ::std::function<bool ()> IdleDetectionCallback; typedef ::std::function<bool ()> IdleDetectionCallback;
...@@ -59,7 +59,7 @@ public: ...@@ -59,7 +59,7 @@ public:
const Size& rPreviewSize, const Size& rPreviewSize,
const bool bDoSuperSampling, const bool bDoSuperSampling,
const SharedCacheContext& rpCacheContext); const SharedCacheContext& rpCacheContext);
virtual ~QueueProcessor(); ~QueueProcessor();
/** Start the processor. This implementation is timer based and waits /** Start the processor. This implementation is timer based and waits
an defined amount of time that depends on the given argument before an defined amount of time that depends on the given argument before
......
...@@ -61,7 +61,7 @@ class SelectionManager; ...@@ -61,7 +61,7 @@ class SelectionManager;
class SlotManager; class SlotManager;
class VisibleAreaManager; class VisibleAreaManager;
class SlideSorterController class SlideSorterController final
{ {
public: public:
/** Create a new controller for the slide sorter. /** Create a new controller for the slide sorter.
...@@ -76,7 +76,7 @@ public: ...@@ -76,7 +76,7 @@ public:
*/ */
void Init(); void Init();
virtual ~SlideSorterController(); ~SlideSorterController();
void Dispose(); void Dispose();
......
...@@ -37,11 +37,11 @@ namespace sd { namespace slidesorter { namespace controller { ...@@ -37,11 +37,11 @@ namespace sd { namespace slidesorter { namespace controller {
StartObservation() and EndObservation(). When the later is called StartObservation() and EndObservation(). When the later is called
the selection is set to just the newly inserted pages. the selection is set to just the newly inserted pages.
*/ */
class SelectionObserver class SelectionObserver final
{ {
public: public:
SelectionObserver (SlideSorter& rSlideSorter); SelectionObserver (SlideSorter& rSlideSorter);
virtual ~SelectionObserver(); ~SelectionObserver();
void NotifyPageEvent (const SdrPage* pPage); void NotifyPageEvent (const SdrPage* pPage);
void StartObservation(); void StartObservation();
......
...@@ -49,12 +49,12 @@ inline sal_Int32 FromCoreIndex (const sal_uInt16 nCoreIndex) { return (nCoreInde ...@@ -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 this set of slides can be modified (but do not call it directly, use
SlideSorterController::SetDocumentSlides() instead.) SlideSorterController::SetDocumentSlides() instead.)
*/ */
class SlideSorterModel class SlideSorterModel final
{ {
public: public:
SlideSorterModel (SlideSorter& rSlideSorter); SlideSorterModel (SlideSorter& rSlideSorter);
virtual ~SlideSorterModel(); ~SlideSorterModel();
void Dispose(); void Dispose();
/** This method is present to let the view create a ShowView for /** This method is present to let the view create a ShowView for
......
...@@ -63,11 +63,11 @@ public: ...@@ -63,11 +63,11 @@ public:
void setModal(bool bModal) { m_bModal = bModal; } void setModal(bool bModal) { m_bModal = bModal; }
}; };
class TableDesignWidget class TableDesignWidget final
{ {
public: public:
TableDesignWidget( VclBuilderContainer* pParent, ViewShellBase& rBase, bool bModal ); TableDesignWidget( VclBuilderContainer* pParent, ViewShellBase& rBase, bool bModal );
virtual ~TableDesignWidget(); ~TableDesignWidget();
// callbacks // callbacks
void onSelectionChanged(); void onSelectionChanged();
......
...@@ -199,7 +199,7 @@ namespace pdfi ...@@ -199,7 +199,7 @@ namespace pdfi
bool m_bHaveTextOnDocLevel; bool m_bHaveTextOnDocLevel;
}; };
class CharGlyph class CharGlyph final
{ {
public: public:
CharGlyph(Element* pCurElement, const GraphicsContext& rCurrentContext, CharGlyph(Element* pCurElement, const GraphicsContext& rCurrentContext,
...@@ -207,7 +207,6 @@ namespace pdfi ...@@ -207,7 +207,6 @@ namespace pdfi
: m_pCurElement(pCurElement), m_rCurrentContext(rCurrentContext), : m_pCurElement(pCurElement), m_rCurrentContext(rCurrentContext),
m_Width(width), m_PrevSpaceWidth(prevSpaceWidth), m_rGlyphs(rGlyphs) {}; m_Width(width), m_PrevSpaceWidth(prevSpaceWidth), m_rGlyphs(rGlyphs) {};
virtual ~CharGlyph(){};
OUString& getGlyph(){ return m_rGlyphs; } OUString& getGlyph(){ return m_rGlyphs; }
double getWidth(){ return m_Width; } double getWidth(){ return m_Width; }
double getPrevSpaceWidth(){ return m_PrevSpaceWidth; } double getPrevSpaceWidth(){ return m_PrevSpaceWidth; }
......
...@@ -32,11 +32,11 @@ namespace sdext { namespace presenter { ...@@ -32,11 +32,11 @@ namespace sdext { namespace presenter {
to show the sprite when its size is not yet defined (results in a crash) 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.) and hiding a sprite before disposing it (results in zombie sprites.)
*/ */
class PresenterSprite class PresenterSprite final
{ {
public: public:
PresenterSprite(); PresenterSprite();
virtual ~PresenterSprite(); ~PresenterSprite();
PresenterSprite(const PresenterSprite&) = delete; PresenterSprite(const PresenterSprite&) = delete;
PresenterSprite& operator=(const PresenterSprite&) = delete; PresenterSprite& operator=(const PresenterSprite&) = delete;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment