summaryrefslogtreecommitdiff
path: root/include/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-02-25 10:24:55 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-02-27 07:34:52 +0100
commit19240f625f8bd7b772481abc8e678d7b0fadd921 (patch)
treedf98eb1d1d2bf11179aea13de58aa38548458b9d /include/svx
parent60c7725a20ff0d77e3025ed60608f57d46e50b58 (diff)
loplugin:unusedfields look for classes where we can make all the..
fields private Change-Id: Id3c6b123f06ab5dcf87628de4c347626110d2d27 Reviewed-on: https://gerrit.libreoffice.org/68302 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/svx')
-rw-r--r--include/svx/nbdtmg.hxx3
-rw-r--r--include/svx/sdr/contact/objectcontactofobjlistpainter.hxx2
-rw-r--r--include/svx/sdr/contact/viewcontactofe3d.hxx2
-rw-r--r--include/svx/sdrundomanager.hxx2
-rw-r--r--include/svx/svdobj.hxx2
-rw-r--r--include/svx/svdoutl.hxx1
-rw-r--r--include/svx/svdpage.hxx8
-rw-r--r--include/svx/svdpoev.hxx1
-rw-r--r--include/svx/svdundo.hxx2
-rw-r--r--include/svx/svdview.hxx1
-rw-r--r--include/svx/textchain.hxx3
-rw-r--r--include/svx/view3d.hxx2
12 files changed, 11 insertions, 18 deletions
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index f6d085902db5..0131b7d68ecc 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -115,6 +115,8 @@ class SVX_DLLPUBLIC NBOTypeMgrBase
// store the attributes passed from pSet
OUString aBulletCharFmtName;
OUString aNumCharFmtName;
+ bool bIsLoading;
+
NBOTypeMgrBase(const NBOTypeMgrBase&) = delete;
public:
@@ -138,7 +140,6 @@ class SVX_DLLPUBLIC NBOTypeMgrBase
const OUString& GetNumCharFmtName() { return aNumCharFmtName;}
MapUnit GetMapUnit() { return eCoreUnit;}
protected:
- bool bIsLoading;
void ImplLoad(const OUString& filename);
void ImplStore(const OUString& filename);
diff --git a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
index d9d0ffbf795b..e7c39c061f99 100644
--- a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
+++ b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
@@ -82,13 +82,13 @@ public:
class ObjectContactOfPagePainter : public ObjectContactPainter
{
-protected:
// the original ObjectContact this painter is working on
ObjectContact& mrOriginalObjectContact;
// Set StartPoint for next run, also given in constructor
tools::WeakReference<SdrPage> mxStartPage;
+protected:
// Hierarchy access methods
virtual sal_uInt32 GetPaintObjectCount() const override;
virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) override;
diff --git a/include/svx/sdr/contact/viewcontactofe3d.hxx b/include/svx/sdr/contact/viewcontactofe3d.hxx
index a6a633eb698d..8dc25997f4f4 100644
--- a/include/svx/sdr/contact/viewcontactofe3d.hxx
+++ b/include/svx/sdr/contact/viewcontactofe3d.hxx
@@ -62,13 +62,13 @@ public:
// primitive stuff
-protected:
// Primitive3DContainer of the ViewContact. This contains all necessary information
// for the graphical visualisation and needs to be supported by all 3D VCs which
// can be visualized. It does NOT contain the object transformation to be able to
// buffer for all possible usages
drawinglayer::primitive3d::Primitive3DContainer mxViewIndependentPrimitive3DContainer;
+protected:
// This method is responsible for creating the graphical visualisation data which is
// stored in mxViewIndependentPrimitive3DContainer, but without object transformation
virtual drawinglayer::primitive3d::Primitive3DContainer createViewIndependentPrimitive3DContainer() const = 0;
diff --git a/include/svx/sdrundomanager.hxx b/include/svx/sdrundomanager.hxx
index df9ac0845827..f932c91eac1c 100644
--- a/include/svx/sdrundomanager.hxx
+++ b/include/svx/sdrundomanager.hxx
@@ -36,8 +36,8 @@ private:
SfxUndoAction* mpLastUndoActionBeforeTextEdit;
bool mbEndTextEditTriggeredFromUndo;
-protected:
SfxObjectShell* m_pDocSh;
+protected:
// call to check for TextEdit active
bool isTextEditActive() const;
virtual void EmptyActionsChanged() override;
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 0d39a3843aae..c84965d4e984 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -198,11 +198,9 @@ public:
*/
class SVX_DLLPUBLIC SdrObjUserData
{
-protected:
SdrInventor const nInventor;
sal_uInt16 const nIdentifier;
-private:
void operator=(const SdrObjUserData& rData) = delete;
bool operator==(const SdrObjUserData& rData) const = delete;
bool operator!=(const SdrObjUserData& rData) const = delete;
diff --git a/include/svx/svdoutl.hxx b/include/svx/svdoutl.hxx
index ad4b02c60ab1..8fa51167a113 100644
--- a/include/svx/svdoutl.hxx
+++ b/include/svx/svdoutl.hxx
@@ -30,7 +30,6 @@ class SdrPage;
class SVX_DLLPUBLIC SdrOutliner : public Outliner
{
tools::WeakReference<SdrTextObj> mpTextObj;
-protected:
const SdrPage* mpVisualizedPage;
public:
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index 815aa160b4b2..b7e5ed43b1d7 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -62,17 +62,15 @@ class SvxUnoDrawPagesAccess;
// class SdrObjList
class SVX_DLLPUBLIC SdrObjList
{
+friend class SdrObjListIter;
+friend class SdrEditView;
+
private:
SdrObjList(const SdrObjList& rSrcList) = delete;
SdrObjList &operator=(const SdrObjList& rSrcList) = delete;
-private:
::std::vector<SdrObject*> maList;
-protected:
-friend class SdrObjListIter;
-friend class SdrEditView;
-
tools::Rectangle maSdrObjListOutRect;
tools::Rectangle maSdrObjListSnapRect;
bool mbObjOrdNumsDirty;
diff --git a/include/svx/svdpoev.hxx b/include/svx/svdpoev.hxx
index 187eadd4ca12..4d418a33d2e5 100644
--- a/include/svx/svdpoev.hxx
+++ b/include/svx/svdpoev.hxx
@@ -29,7 +29,6 @@ class SVX_DLLPUBLIC SdrPolyEditView : public SdrEditView, public IPolyPolygonEdi
{
friend class SdrEditView;
-protected:
bool bSetMarkedPointsSmoothPossible : 1;
bool bSetMarkedSegmentsKindPossible : 1;
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index f046700050c3..0e30f39c4661 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -206,7 +206,6 @@ public:
class SVX_DLLPUBLIC SdrUndoGeoObj : public SdrUndoObj
{
-protected:
std::unique_ptr<SdrObjGeoData> pUndoGeo;
std::unique_ptr<SdrObjGeoData> pRedoGeo;
// If we have a group object:
@@ -333,7 +332,6 @@ class SVX_DLLPUBLIC SdrUndoReplaceObj : public SdrUndoObj
bool bOldOwner;
bool bNewOwner;
-protected:
SdrObjList* pObjList;
sal_uInt32 nOrdNum;
SdrObject* pNewObj;
diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx
index 5e800e37adb4..c0d3b21a8f42 100644
--- a/include/svx/svdview.hxx
+++ b/include/svx/svdview.hxx
@@ -154,7 +154,6 @@ class SVX_DLLPUBLIC SdrView : public SdrCreateView, public virtual tools::WeakBa
bool bNoExtendedKeyDispatcher : 1;
bool mbMasterPagePaintCaching : 1;
-protected:
SvtAccessibilityOptions maAccessibilityOptions;
public:
diff --git a/include/svx/textchain.hxx b/include/svx/textchain.hxx
index f270754c2df5..2a0cc42f6b02 100644
--- a/include/svx/textchain.hxx
+++ b/include/svx/textchain.hxx
@@ -142,9 +142,10 @@ public:
protected:
TextChain();
- std::map< ChainLinkId, ImpChainLinkProperties *> maLinkPropertiesMap;
private:
+ std::map< ChainLinkId, ImpChainLinkProperties *> maLinkPropertiesMap;
+
friend class SdrModel;
//SdrTextObj *impGetNextLink(const SdrTextObj *) const;
//SdrTextObj *impGetPrevLink(const SdrTextObj *) const;
diff --git a/include/svx/view3d.hxx b/include/svx/view3d.hxx
index 83f25353c7b6..64c13412152f 100644
--- a/include/svx/view3d.hxx
+++ b/include/svx/view3d.hxx
@@ -41,13 +41,13 @@ class Impl3DMirrorConstructOverlay;
class SVX_DLLPUBLIC E3dView : public SdrView
{
-protected:
E3dDefaultAttributes a3DDefaultAttr;
MouseEvent aMouseEvent; // The parameters of the last Events (Mouse, Keyboard)
// Migrate selections
std::unique_ptr<Impl3DMirrorConstructOverlay> mpMirrorOverlay;
+protected:
void InitView();
void ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, bool bExtrude, double fDepth, basegfx::B2DHomMatrix const & rLatheMat);