summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2018-11-12 09:18:56 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2018-11-12 12:45:53 +0100
commit8cbe779fcbcfcd722a64f98f5cef3df63d02e037 (patch)
treeeb4b6ec923e631d2c3d73a3d37ea01dc1f41a9d1 /include
parent3a99ae072ac170ebed8d1f5bf65913d3412fab67 (diff)
svx: prefix members of SdrEditView
Change-Id: I3e27d8444c5a152ee39b9e2cc12b9df707f092b8 Reviewed-on: https://gerrit.libreoffice.org/63281 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins
Diffstat (limited to 'include')
-rw-r--r--include/svx/svdedtv.hxx94
1 files changed, 47 insertions, 47 deletions
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index ba6b1172df6b..6fc2e1aab75f 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -78,41 +78,41 @@ class SVX_DLLPUBLIC SdrEditView : public SdrMarkView
protected:
// cache the transformation queries, etc. a little
- bool bPossibilitiesDirty : 1;
- bool bReadOnly : 1;
- bool bGroupPossible : 1;
- bool bUnGroupPossible : 1;
- bool bGrpEnterPossible : 1;
- bool bToTopPossible : 1;
- bool bToBtmPossible : 1;
- bool bReverseOrderPossible : 1;
- bool bImportMtfPossible : 1;
- bool bCombinePossible : 1;
- bool bDismantlePossible : 1;
- bool bCombineNoPolyPolyPossible : 1;
- bool bDismantleMakeLinesPossible : 1;
- bool bOrthoDesiredOnMarked : 1;
- bool bOneOrMoreMovable : 1; // at least one object is moveable
- bool bMoreThanOneNoMovRot : 1; // more then one object is not movable nor turnable (Crook)
- bool bContortionPossible : 1; // all polygones (grouped if necessary)
- bool bMoveAllowed : 1;
- bool bResizeFreeAllowed : 1;
- bool bResizePropAllowed : 1;
- bool bRotateFreeAllowed : 1;
- bool bRotate90Allowed : 1;
- bool bMirrorFreeAllowed : 1;
- bool bMirror45Allowed : 1;
- bool bMirror90Allowed : 1;
- bool bShearAllowed : 1;
- bool bEdgeRadiusAllowed : 1;
- bool bTransparenceAllowed : 1;
- bool bCropAllowed : 1;
- bool bGradientAllowed : 1;
- bool bCanConvToPath : 1;
- bool bCanConvToPoly : 1;
- bool bCanConvToContour : 1;
- bool bMoveProtect : 1;
- bool bResizeProtect : 1;
+ bool m_bPossibilitiesDirty : 1;
+ bool m_bReadOnly : 1;
+ bool m_bGroupPossible : 1;
+ bool m_bUnGroupPossible : 1;
+ bool m_bGrpEnterPossible : 1;
+ bool m_bToTopPossible : 1;
+ bool m_bToBtmPossible : 1;
+ bool m_bReverseOrderPossible : 1;
+ bool m_bImportMtfPossible : 1;
+ bool m_bCombinePossible : 1;
+ bool m_bDismantlePossible : 1;
+ bool m_bCombineNoPolyPolyPossible : 1;
+ bool m_bDismantleMakeLinesPossible : 1;
+ bool m_bOrthoDesiredOnMarked : 1;
+ bool m_bOneOrMoreMovable : 1; // at least one object is moveable
+ bool m_bMoreThanOneNoMovRot : 1; // more then one object is not movable nor turnable (Crook)
+ bool m_bContortionPossible : 1; // all polygones (grouped if necessary)
+ bool m_bMoveAllowed : 1;
+ bool m_bResizeFreeAllowed : 1;
+ bool m_bResizePropAllowed : 1;
+ bool m_bRotateFreeAllowed : 1;
+ bool m_bRotate90Allowed : 1;
+ bool m_bMirrorFreeAllowed : 1;
+ bool m_bMirror45Allowed : 1;
+ bool m_bMirror90Allowed : 1;
+ bool m_bShearAllowed : 1;
+ bool m_bEdgeRadiusAllowed : 1;
+ bool m_bTransparenceAllowed : 1;
+ bool m_bCropAllowed : 1;
+ bool m_bGradientAllowed : 1;
+ bool m_bCanConvToPath : 1;
+ bool m_bCanConvToPoly : 1;
+ bool m_bCanConvToContour : 1;
+ bool m_bMoveProtect : 1;
+ bool m_bResizeProtect : 1;
private:
SVX_DLLPRIVATE void ImpClearVars();
@@ -160,7 +160,7 @@ protected:
// Check possibilities of all marked objects
virtual void CheckPossibilities();
- void ForcePossibilities() const { if (bPossibilitiesDirty || mbSomeObjChgdFlag) const_cast<SdrEditView*>(this)->CheckPossibilities(); }
+ void ForcePossibilities() const { if (m_bPossibilitiesDirty || mbSomeObjChgdFlag) const_cast<SdrEditView*>(this)->CheckPossibilities(); }
protected:
// #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
@@ -228,7 +228,7 @@ public:
void MirrorAllMarkedHorizontal() { MirrorMarkedObjHorizontal(); }
void MirrorAllMarkedVertical() { MirrorMarkedObjVertical(); }
void CopyMarked() { CopyMarkedObj(); }
- bool IsMoveAllowed() const { ForcePossibilities(); return bMoveAllowed && !bMoveProtect; }
+ bool IsMoveAllowed() const { ForcePossibilities(); return m_bMoveAllowed && !m_bMoveProtect; }
bool IsResizeAllowed(bool bProp=false) const;
bool IsRotateAllowed(bool b90Deg=false) const;
bool IsMirrorAllowed(bool b45Deg=false, bool b90Deg=false) const;
@@ -327,17 +327,17 @@ public:
// Previously marked objects, which are not group objects, remain marked.
void UnGroupMarked();
- bool IsGroupPossible() const { ForcePossibilities(); return bGroupPossible; }
- bool IsUnGroupPossible() const { ForcePossibilities(); return bUnGroupPossible; }
- bool IsGroupEnterPossible() const { ForcePossibilities(); return bGrpEnterPossible; }
+ bool IsGroupPossible() const { ForcePossibilities(); return m_bGroupPossible; }
+ bool IsUnGroupPossible() const { ForcePossibilities(); return m_bUnGroupPossible; }
+ bool IsGroupEnterPossible() const { ForcePossibilities(); return m_bGrpEnterPossible; }
// Convert marked objects to polygones/Beziercurves. The bool-functions
// return sal_True, if at least one marked object could be converted.
// Also member objects of group objects are converted.
// For a better description see: SdrObj.HXX
- bool IsConvertToPathObjPossible() const { ForcePossibilities(); return bCanConvToPath; }
- bool IsConvertToPolyObjPossible() const { ForcePossibilities(); return bCanConvToPoly; }
- bool IsConvertToContourPossible() const { ForcePossibilities(); return bCanConvToContour; }
+ bool IsConvertToPathObjPossible() const { ForcePossibilities(); return m_bCanConvToPath; }
+ bool IsConvertToPolyObjPossible() const { ForcePossibilities(); return m_bCanConvToPoly; }
+ bool IsConvertToContourPossible() const { ForcePossibilities(); return m_bCanConvToContour; }
void ConvertMarkedToPathObj(bool bLineToArea);
void ConvertMarkedToPolyObj();
@@ -373,9 +373,9 @@ public:
// Which means it can happen that IsToTopPossible() returns sal_True,
// but MovMarkedToTop() changes nothing (e.g. for multiple selections),
// as restriction derived via a view by GetMaxToTopObj() prevents this.
- bool IsToTopPossible() const { ForcePossibilities(); return bToTopPossible; }
- bool IsToBtmPossible() const { ForcePossibilities(); return bToBtmPossible; }
- bool IsReverseOrderPossible() const { ForcePossibilities(); return bReverseOrderPossible; }
+ bool IsToTopPossible() const { ForcePossibilities(); return m_bToTopPossible; }
+ bool IsToBtmPossible() const { ForcePossibilities(); return m_bToBtmPossible; }
+ bool IsReverseOrderPossible() const { ForcePossibilities(); return m_bReverseOrderPossible; }
// Using this method the view determines how far an object
// can be moved forward or backward (Z-order).
@@ -394,7 +394,7 @@ public:
// this methods converts the metafile to a drawing object.
// The SdrGrafObjs/SdrOle2Objs are replaced by the new objects.
void DoImportMarkedMtf(SvdProgressInfo *pProgrInfo=nullptr);
- bool IsImportMtfPossible() const { ForcePossibilities(); return bImportMtfPossible; }
+ bool IsImportMtfPossible() const { ForcePossibilities(); return m_bImportMtfPossible; }
// override SdrMarkView, for internal use
virtual void MarkListHasChanged() override;