diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-10 09:49:17 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-10 13:41:14 +0200 |
commit | 6bd33bd263c6666824d0d540395a4df4ae7d1d7b (patch) | |
tree | 100d56bf3c8b048efe0638e521d716727aa76cc2 /include/svx/svdmrkv.hxx | |
parent | 2a0ce97aedb346f1dfecedfedec20d89ed5f8482 (diff) |
loplugin:inlinefields in SdrMarkView
Change-Id: I2662c7dbae0189fe2057149d825df39bb976a295
Reviewed-on: https://gerrit.libreoffice.org/36354
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/svx/svdmrkv.hxx')
-rw-r--r-- | include/svx/svdmrkv.hxx | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index 246ba6061e8f..192f26b2b393 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -107,12 +107,12 @@ protected: Point maRef2; // Persistent Point maLastCrookCenter; // Persistent SdrHdlList maHdlList; - sdr::ViewSelection* mpSdrViewSelection; + sdr::ViewSelection maSdrViewSelection; - tools::Rectangle maMarkedObjRect; - tools::Rectangle maMarkedObjRectNoOffset; - tools::Rectangle maMarkedPointsRect; - tools::Rectangle maMarkedGluePointsRect; + tools::Rectangle maMarkedObjRect; + tools::Rectangle maMarkedObjRectNoOffset; + tools::Rectangle maMarkedPointsRect; + tools::Rectangle maMarkedGluePointsRect; sal_uInt16 mnFrameHandlesLimit; sal_uIntPtr mnInsPointNum; // Number of the InsPoint @@ -121,7 +121,6 @@ protected: SdrViewEditMode meEditMode; // Persistent SdrViewEditMode meEditMode0; // Persistent - //HMHbool bHdlShown : 1; bool mbDesignMode : 1; // DesignMode for SdrUnoObj bool mbForceFrameHandles : 1; // Persistent - FrameDrag also for single objects bool mbPlusHdlAlways : 1; // Persistent @@ -228,11 +227,11 @@ public: protected: // all available changing methods - SdrMarkList& GetMarkedObjectListWriteAccess() { return mpSdrViewSelection->GetMarkedObjectListWriteAccess(); } + SdrMarkList& GetMarkedObjectListWriteAccess() { return maSdrViewSelection.GetMarkedObjectListWriteAccess(); } public: // all available const methods for read access to selection - const SdrMarkList& GetMarkedObjectList() const { return mpSdrViewSelection->GetMarkedObjectList(); } + const SdrMarkList& GetMarkedObjectList() const { return maSdrViewSelection.GetMarkedObjectList(); } // returns SAL_MAX_SIZE if not found size_t TryToFindMarkedObject(const SdrObject* pObj) const { return GetMarkedObjectList().FindObject(pObj); } SdrPageView* GetSdrPageViewOfMarkedByIndex(size_t nNum) const { return GetMarkedObjectList().GetMark(nNum)->GetPageView(); } @@ -247,9 +246,9 @@ public: // Get a list of all those links which are connected to marked nodes, // but which are not marked themselves. - const SdrMarkList& GetEdgesOfMarkedNodes() const { return mpSdrViewSelection->GetEdgesOfMarkedNodes(); } - const SdrMarkList& GetMarkedEdgesOfMarkedNodes() const { return mpSdrViewSelection->GetMarkedEdgesOfMarkedNodes(); } - const std::vector<SdrObject*>& GetTransitiveHullOfMarkedObjects() const { return mpSdrViewSelection->GetAllMarkedObjects(); } + const SdrMarkList& GetEdgesOfMarkedNodes() const { return maSdrViewSelection.GetEdgesOfMarkedNodes(); } + const SdrMarkList& GetMarkedEdgesOfMarkedNodes() const { return maSdrViewSelection.GetMarkedEdgesOfMarkedNodes(); } + const std::vector<SdrObject*>& GetTransitiveHullOfMarkedObjects() const { return maSdrViewSelection.GetAllMarkedObjects(); } // mechanism to complete disable handles at the view. Handles will be hidden and deleted |