summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-03-28 14:34:10 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-03-29 08:33:52 +0200
commit7f590dd7f492982f233d59afe672fa38a29279a3 (patch)
treec6e6a97c2ac4462be854827bfa1955c9b9023878 /include
parent15c9be2bbb9e0ee8853a982f96338960a80d6ee5 (diff)
loplugin:virtualdown in svx
Change-Id: I953780a4b2879266c415a3c4e8992c8be74dced4 Reviewed-on: https://gerrit.libreoffice.org/52001 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r--include/svx/obj3d.hxx2
-rw-r--r--include/svx/sdr/properties/defaultproperties.hxx2
-rw-r--r--include/svx/sdr/properties/properties.hxx4
-rw-r--r--include/svx/sdr/table/tablecontroller.hxx2
-rw-r--r--include/svx/selectioncontroller.hxx1
-rw-r--r--include/svx/svdedxv.hxx2
-rw-r--r--include/svx/svdobj.hxx4
-rw-r--r--include/svx/svdotext.hxx5
-rw-r--r--include/svx/svdpage.hxx4
-rw-r--r--include/svx/svdpntv.hxx3
10 files changed, 8 insertions, 21 deletions
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index 8f664c815a60..11229e7ed368 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -81,7 +81,7 @@ public:
E3dObjList();
SVX_DLLPUBLIC virtual ~E3dObjList() override;
- virtual E3dObjList* Clone() const override;
+ virtual E3dObjList* Clone() const;
virtual void NbcInsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE) override;
virtual void InsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE) override;
diff --git a/include/svx/sdr/properties/defaultproperties.hxx b/include/svx/sdr/properties/defaultproperties.hxx
index e264191c6f0a..deca6ce4a60b 100644
--- a/include/svx/sdr/properties/defaultproperties.hxx
+++ b/include/svx/sdr/properties/defaultproperties.hxx
@@ -100,7 +100,7 @@ namespace sdr
virtual void ForceDefaultAttributes();
// Scale the included ItemSet.
- virtual void Scale(const Fraction& rScale) override;
+ virtual void Scale(const Fraction& rScale);
};
} // end of namespace properties
} // end of namespace sdr
diff --git a/include/svx/sdr/properties/properties.hxx b/include/svx/sdr/properties/properties.hxx
index ef6cccb3103d..71dad7f567fb 100644
--- a/include/svx/sdr/properties/properties.hxx
+++ b/include/svx/sdr/properties/properties.hxx
@@ -141,10 +141,6 @@ namespace sdr
// Get the installed StyleSheet.
virtual SfxStyleSheet* GetStyleSheet() const = 0;
- // Scale the local ItemSet as far as it contains metric items.
- // Override this to do it for hierarchical objects like e.g. groups.
- virtual void Scale(const Fraction& rScale);
-
// Move local items to a new ItemPool.
// Override this to do it for hierarchical objects like e.g. groups.
virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel);
diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx
index 9ad6658a299c..9b0eee19a28f 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -51,7 +51,7 @@ public:
SVX_DLLPRIVATE virtual bool onMouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin) override;
SVX_DLLPRIVATE virtual bool onMouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) override;
- SVX_DLLPRIVATE virtual bool HasMarked() override;
+ SVX_DLLPRIVATE virtual bool HasMarked();
SVX_DLLPRIVATE virtual bool DeleteMarked() override;
SVX_DLLPRIVATE virtual void onSelectionHasChanged() override;
diff --git a/include/svx/selectioncontroller.hxx b/include/svx/selectioncontroller.hxx
index 7510a830e645..9df053e9f5bc 100644
--- a/include/svx/selectioncontroller.hxx
+++ b/include/svx/selectioncontroller.hxx
@@ -53,7 +53,6 @@ public:
virtual void GetState( SfxItemSet& rSet );
virtual void Execute( SfxRequest& rReq );
- virtual bool HasMarked();
virtual bool DeleteMarked();
virtual bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const;
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index 75bae001cc2e..7a93a5590c80 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -219,7 +219,7 @@ public:
SdrTextObj* GetTextEditObject() const { return mxTextEditObj.get(); }
// info about TextEditPageView. Default is 0L.
- virtual SdrPageView* GetTextEditPageView() const override;
+ virtual SdrPageView* GetTextEditPageView() const;
// Current window of the outliners.
void SetTextEditWin(vcl::Window* pWin);
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 7bd547f20d71..3f01cbb82ff6 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -624,10 +624,6 @@ public:
virtual bool HasTextEdit() const;
- // returns true if TextEditMode started
- virtual bool BegTextEdit(SdrOutliner& rOutl);
- virtual void EndTextEdit(SdrOutliner& rOutl);
-
// keep text in outliner's format
// SetOutlinerParaObject: transfer ownership of *pTextObject!
void SetOutlinerParaObject(OutlinerParaObject* pTextObject);
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index dd9972b3ce56..277f51ebba2c 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -479,9 +479,10 @@ public:
virtual void NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear) override;
virtual bool HasTextEdit() const override;
- virtual bool BegTextEdit(SdrOutliner& rOutl) override;
+ // returns true if TextEditMode started
+ virtual bool BegTextEdit(SdrOutliner& rOutl);
virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, tools::Rectangle* pViewInit, tools::Rectangle* pViewMin) const;
- virtual void EndTextEdit(SdrOutliner& rOutl) override;
+ virtual void EndTextEdit(SdrOutliner& rOutl);
virtual EEAnchorMode GetOutlinerViewAnchorMode() const;
virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) override;
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index 8cd45fbe93f5..1a7fdb59a7fa 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -88,8 +88,6 @@ public:
SdrObjList(SdrModel* pNewModel, SdrPage* pNewPage);
virtual ~SdrObjList();
- virtual SdrObjList* Clone() const;
-
void CopyObjects(const SdrObjList& rSrcList);
/// clean up everything (without Undo)
void Clear();
@@ -428,7 +426,7 @@ protected:
public:
explicit SdrPage(SdrModel& rNewModel, bool bMasterPage=false);
virtual ~SdrPage() override;
- virtual SdrPage* Clone() const override;
+ virtual SdrPage* Clone() const;
virtual SdrPage* Clone(SdrModel* pNewModel) const;
bool IsMasterPage() const { return mbMaster; }
void SetInserted(bool bNew = true);
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 209a6ff183d8..eb48416af426 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -256,9 +256,6 @@ public:
// Info about TextEdit. Default is sal_False.
virtual bool IsTextEdit() const;
- // Info about TextEditPageView. Default is 0L.
- virtual SdrPageView* GetTextEditPageView() const;
-
// Must be called for every Window change as well as MapMode (Scaling) change:
// If the SdrView is shown in multiple windows at the same time (e.g.
// using the split pane), so that I can convert my pixel values to logical