[Libreoffice-commits] core.git: include/svx sd/source svx/source sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Nov 12 11:46:16 UTC 2018
include/svx/svdedtv.hxx | 94 +++++++--------
sd/source/ui/inc/View.hxx | 12 -
svx/source/engine3d/view3d.cxx | 14 +-
svx/source/svdraw/svddrgv.cxx | 2
svx/source/svdraw/svdedtv.cxx | 256 ++++++++++++++++++++---------------------
svx/source/svdraw/svdedtv1.cxx | 22 +--
svx/source/svdraw/svdedtv2.cxx | 12 -
sw/source/core/draw/dview.cxx | 10 -
8 files changed, 211 insertions(+), 211 deletions(-)
New commits:
commit 8cbe779fcbcfcd722a64f98f5cef3df63d02e037
Author: Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Mon Nov 12 09:18:56 2018 +0100
Commit: Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Mon Nov 12 12:45:53 2018 +0100
svx: prefix members of SdrEditView
Change-Id: I3e27d8444c5a152ee39b9e2cc12b9df707f092b8
Reviewed-on: https://gerrit.libreoffice.org/63281
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Jenkins
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;
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 920deb89f0cc..e88424122877 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -207,12 +207,12 @@ public:
const bool bHandleBullets,
const SvxNumRule* pNumRule);
- void SetPossibilitiesDirty() { bPossibilitiesDirty = true; }
- void SetMoveAllowed( bool bSet ) { bMoveAllowed = bSet; }
- void SetMoveProtected( bool bSet ) { bMoveProtect = bSet; }
- void SetResizeFreeAllowed( bool bSet ) { bResizeFreeAllowed = bSet; }
- void SetResizePropAllowed( bool bSet ) { bResizePropAllowed = bSet; }
- void SetResizeProtected( bool bSet ) { bResizeProtect = bSet; }
+ void SetPossibilitiesDirty() { m_bPossibilitiesDirty = true; }
+ void SetMoveAllowed( bool bSet ) { m_bMoveAllowed = bSet; }
+ void SetMoveProtected( bool bSet ) { m_bMoveProtect = bSet; }
+ void SetResizeFreeAllowed( bool bSet ) { m_bResizeFreeAllowed = bSet; }
+ void SetResizePropAllowed( bool bSet ) { m_bResizePropAllowed = bSet; }
+ void SetResizeProtected( bool bSet ) { m_bResizeProtect = bSet; }
SdrObject* GetEmptyPresentationObject( PresObjKind eKind );
SdPage* GetPage();
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 807045ef5990..a601f1b27791 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -1590,7 +1590,7 @@ void E3dView::CheckPossibilities()
SdrView::CheckPossibilities();
// Set other flags
- if(bGroupPossible || bUnGroupPossible || bGrpEnterPossible)
+ if(m_bGroupPossible || m_bUnGroupPossible || m_bGrpEnterPossible)
{
const size_t nMarkCnt = GetMarkedObjectCount();
bool bCoumpound = false;
@@ -1606,14 +1606,14 @@ void E3dView::CheckPossibilities()
// So far: there are two or more of any objects selected. See if
// compound objects are involved. If yes, ban grouping.
- if(bGroupPossible && bCoumpound)
- bGroupPossible = false;
+ if(m_bGroupPossible && bCoumpound)
+ m_bGroupPossible = false;
- if(bUnGroupPossible && b3DObject)
- bUnGroupPossible = false;
+ if(m_bUnGroupPossible && b3DObject)
+ m_bUnGroupPossible = false;
- if(bGrpEnterPossible && bCoumpound)
- bGrpEnterPossible = false;
+ if(m_bGrpEnterPossible && bCoumpound)
+ m_bGrpEnterPossible = false;
}
}
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index b7938a2ff57d..20f14af9c5ce 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -854,7 +854,7 @@ bool SdrDragView::IsOrthoDesired() const
if( dynamic_cast< const SdrDragObjOwn* >( mpCurrentSdrDragMethod.get() )
|| dynamic_cast< const SdrDragResize* >(mpCurrentSdrDragMethod.get() ))
{
- return bOrthoDesiredOnMarked;
+ return m_bOrthoDesiredOnMarked;
}
return false;
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index e5338d43085b..2197c3fbc42e 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -43,49 +43,49 @@ using namespace com::sun::star;
void SdrEditView::ImpResetPossibilityFlags()
{
- bReadOnly =false;
-
- bGroupPossible =false;
- bUnGroupPossible =false;
- bGrpEnterPossible =false;
- bToTopPossible =false;
- bToBtmPossible =false;
- bReverseOrderPossible =false;
-
- bImportMtfPossible =false;
- bCombinePossible =false;
- bDismantlePossible =false;
- bCombineNoPolyPolyPossible =false;
- bDismantleMakeLinesPossible=false;
- bOrthoDesiredOnMarked =false;
-
- bOneOrMoreMovable =false;
- bMoreThanOneNoMovRot =false;
- bContortionPossible =false;
- bMoveAllowed =false;
- bResizeFreeAllowed =false;
- bResizePropAllowed =false;
- bRotateFreeAllowed =false;
- bRotate90Allowed =false;
- bMirrorFreeAllowed =false;
- bMirror45Allowed =false;
- bMirror90Allowed =false;
- bTransparenceAllowed =false;
- bCropAllowed =false;
- bGradientAllowed =false;
- bShearAllowed =false;
- bEdgeRadiusAllowed =false;
- bCanConvToPath =false;
- bCanConvToPoly =false;
- bCanConvToContour =false;
- bMoveProtect =false;
- bResizeProtect =false;
+ m_bReadOnly =false;
+
+ m_bGroupPossible =false;
+ m_bUnGroupPossible =false;
+ m_bGrpEnterPossible =false;
+ m_bToTopPossible =false;
+ m_bToBtmPossible =false;
+ m_bReverseOrderPossible =false;
+
+ m_bImportMtfPossible =false;
+ m_bCombinePossible =false;
+ m_bDismantlePossible =false;
+ m_bCombineNoPolyPolyPossible =false;
+ m_bDismantleMakeLinesPossible=false;
+ m_bOrthoDesiredOnMarked =false;
+
+ m_bOneOrMoreMovable =false;
+ m_bMoreThanOneNoMovRot =false;
+ m_bContortionPossible =false;
+ m_bMoveAllowed =false;
+ m_bResizeFreeAllowed =false;
+ m_bResizePropAllowed =false;
+ m_bRotateFreeAllowed =false;
+ m_bRotate90Allowed =false;
+ m_bMirrorFreeAllowed =false;
+ m_bMirror45Allowed =false;
+ m_bMirror90Allowed =false;
+ m_bTransparenceAllowed =false;
+ m_bCropAllowed =false;
+ m_bGradientAllowed =false;
+ m_bShearAllowed =false;
+ m_bEdgeRadiusAllowed =false;
+ m_bCanConvToPath =false;
+ m_bCanConvToPoly =false;
+ m_bCanConvToContour =false;
+ m_bMoveProtect =false;
+ m_bResizeProtect =false;
}
void SdrEditView::ImpClearVars()
{
ImpResetPossibilityFlags();
- bPossibilitiesDirty=true; // << Purify didn't like this
+ m_bPossibilitiesDirty=true; // << Purify didn't like this
}
SdrEditView::SdrEditView(
@@ -353,69 +353,69 @@ void SdrEditView::ImpBroadcastEdgesOfMarkedNodes()
void SdrEditView::MarkListHasChanged()
{
SdrMarkView::MarkListHasChanged();
- bPossibilitiesDirty=true;
+ m_bPossibilitiesDirty=true;
}
void SdrEditView::ModelHasChanged()
{
SdrMarkView::ModelHasChanged();
- bPossibilitiesDirty=true;
+ m_bPossibilitiesDirty=true;
}
bool SdrEditView::IsResizeAllowed(bool bProp) const
{
ForcePossibilities();
- if (bResizeProtect) return false;
- if (bProp) return bResizePropAllowed;
- return bResizeFreeAllowed;
+ if (m_bResizeProtect) return false;
+ if (bProp) return m_bResizePropAllowed;
+ return m_bResizeFreeAllowed;
}
bool SdrEditView::IsRotateAllowed(bool b90Deg) const
{
ForcePossibilities();
- if (bMoveProtect) return false;
- if (b90Deg) return bRotate90Allowed;
- return bRotateFreeAllowed;
+ if (m_bMoveProtect) return false;
+ if (b90Deg) return m_bRotate90Allowed;
+ return m_bRotateFreeAllowed;
}
bool SdrEditView::IsMirrorAllowed(bool b45Deg, bool b90Deg) const
{
ForcePossibilities();
- if (bMoveProtect) return false;
- if (b90Deg) return bMirror90Allowed;
- if (b45Deg) return bMirror45Allowed;
- return bMirrorFreeAllowed && !bMoveProtect;
+ if (m_bMoveProtect) return false;
+ if (b90Deg) return m_bMirror90Allowed;
+ if (b45Deg) return m_bMirror45Allowed;
+ return m_bMirrorFreeAllowed && !m_bMoveProtect;
}
bool SdrEditView::IsTransparenceAllowed() const
{
ForcePossibilities();
- return bTransparenceAllowed;
+ return m_bTransparenceAllowed;
}
bool SdrEditView::IsCropAllowed() const
{
ForcePossibilities();
- return bCropAllowed;
+ return m_bCropAllowed;
}
bool SdrEditView::IsGradientAllowed() const
{
ForcePossibilities();
- return bGradientAllowed;
+ return m_bGradientAllowed;
}
bool SdrEditView::IsShearAllowed() const
{
ForcePossibilities();
- if (bResizeProtect) return false;
- return bShearAllowed;
+ if (m_bResizeProtect) return false;
+ return m_bShearAllowed;
}
bool SdrEditView::IsEdgeRadiusAllowed() const
{
ForcePossibilities();
- return bEdgeRadiusAllowed;
+ return m_bEdgeRadiusAllowed;
}
bool SdrEditView::IsCrookAllowed(bool bNoContortion) const
@@ -423,10 +423,10 @@ bool SdrEditView::IsCrookAllowed(bool bNoContortion) const
// CrookMode missing here (no rotations allowed when shearing ...)
ForcePossibilities();
if (bNoContortion) {
- if (!bRotateFreeAllowed) return false;
- return !bMoveProtect && bMoveAllowed;
+ if (!m_bRotateFreeAllowed) return false;
+ return !m_bMoveProtect && m_bMoveAllowed;
} else {
- return !bResizeProtect && bContortionPossible;
+ return !m_bResizeProtect && m_bContortionPossible;
}
}
@@ -436,28 +436,28 @@ bool SdrEditView::IsDistortAllowed(bool bNoContortion) const
if (bNoContortion) {
return false;
} else {
- return !bResizeProtect && bContortionPossible;
+ return !m_bResizeProtect && m_bContortionPossible;
}
}
bool SdrEditView::IsCombinePossible(bool bNoPolyPoly) const
{
ForcePossibilities();
- if (bNoPolyPoly) return bCombineNoPolyPolyPossible;
- else return bCombinePossible;
+ if (bNoPolyPoly) return m_bCombineNoPolyPolyPossible;
+ else return m_bCombinePossible;
}
bool SdrEditView::IsDismantlePossible(bool bMakeLines) const
{
ForcePossibilities();
- if (bMakeLines) return bDismantleMakeLinesPossible;
- else return bDismantlePossible;
+ if (bMakeLines) return m_bDismantleMakeLinesPossible;
+ else return m_bDismantlePossible;
}
void SdrEditView::CheckPossibilities()
{
if (mbSomeObjChgdFlag)
- bPossibilitiesDirty=true;
+ m_bPossibilitiesDirty=true;
if (mbSomeObjChgdFlag)
{
@@ -467,18 +467,18 @@ void SdrEditView::CheckPossibilities()
CheckMarked();
}
- if (bPossibilitiesDirty)
+ if (m_bPossibilitiesDirty)
{
ImpResetPossibilityFlags();
SortMarkedObjects();
const size_t nMarkCount = GetMarkedObjectCount();
if (nMarkCount != 0)
{
- bReverseOrderPossible = (nMarkCount >= 2);
+ m_bReverseOrderPossible = (nMarkCount >= 2);
size_t nMovableCount=0;
- bGroupPossible=nMarkCount>=2;
- bCombinePossible=nMarkCount>=2;
+ m_bGroupPossible=nMarkCount>=2;
+ m_bCombinePossible=nMarkCount>=2;
if (nMarkCount==1)
{
// check bCombinePossible more thoroughly
@@ -488,29 +488,29 @@ void SdrEditView::CheckPossibilities()
bool bGroup=pObj->GetSubList()!=nullptr;
bool bHasText=pObj->GetOutlinerParaObject()!=nullptr;
if (bGroup || bHasText) {
- bCombinePossible=true;
+ m_bCombinePossible=true;
}
}
- bCombineNoPolyPolyPossible=bCombinePossible;
+ m_bCombineNoPolyPolyPossible=m_bCombinePossible;
// accept transformations for now
- bMoveAllowed =true;
- bResizeFreeAllowed=true;
- bResizePropAllowed=true;
- bRotateFreeAllowed=true;
- bRotate90Allowed =true;
- bMirrorFreeAllowed=true;
- bMirror45Allowed =true;
- bMirror90Allowed =true;
- bShearAllowed =true;
- bEdgeRadiusAllowed=false;
- bContortionPossible=true;
- bCanConvToContour = true;
+ m_bMoveAllowed =true;
+ m_bResizeFreeAllowed=true;
+ m_bResizePropAllowed=true;
+ m_bRotateFreeAllowed=true;
+ m_bRotate90Allowed =true;
+ m_bMirrorFreeAllowed=true;
+ m_bMirror45Allowed =true;
+ m_bMirror90Allowed =true;
+ m_bShearAllowed =true;
+ m_bEdgeRadiusAllowed=false;
+ m_bContortionPossible=true;
+ m_bCanConvToContour = true;
// these ones are only allowed when single object is selected
- bTransparenceAllowed = (nMarkCount == 1);
- bGradientAllowed = (nMarkCount == 1);
- bCropAllowed = (nMarkCount == 1);
- if(bGradientAllowed)
+ m_bTransparenceAllowed = (nMarkCount == 1);
+ m_bGradientAllowed = (nMarkCount == 1);
+ m_bCropAllowed = (nMarkCount == 1);
+ if(m_bGradientAllowed)
{
// gradient depends on fill style
const SdrMark* pM = GetSdrMarkByIndex(0);
@@ -527,7 +527,7 @@ void SdrEditView::CheckPossibilities()
if(eFillStyle != drawing::FillStyle_GRADIENT)
{
- bGradientAllowed = false;
+ m_bGradientAllowed = false;
}
}
}
@@ -540,7 +540,7 @@ void SdrEditView::CheckPossibilities()
const SdrObject* pObj=pM->GetMarkedSdrObj();
const SdrPageView* pPV=pM->GetPageView();
if (pPV!=pPV0) {
- if (pPV->IsReadOnly()) bReadOnly=true;
+ if (pPV->IsReadOnly()) m_bReadOnly=true;
pPV0=pPV;
}
@@ -549,62 +549,62 @@ void SdrEditView::CheckPossibilities()
bool bMovPrt=pObj->IsMoveProtect();
bool bSizPrt=pObj->IsResizeProtect();
if (!bMovPrt && aInfo.bMoveAllowed) nMovableCount++; // count MovableObjs
- if (bMovPrt) bMoveProtect=true;
- if (bSizPrt) bResizeProtect=true;
+ if (bMovPrt) m_bMoveProtect=true;
+ if (bSizPrt) m_bResizeProtect=true;
// not allowed when not allowed at one object
if(!aInfo.bTransparenceAllowed)
- bTransparenceAllowed = false;
+ m_bTransparenceAllowed = false;
// If one of these can't do something, none can
- if (!aInfo.bMoveAllowed ) bMoveAllowed =false;
- if (!aInfo.bResizeFreeAllowed) bResizeFreeAllowed=false;
- if (!aInfo.bResizePropAllowed) bResizePropAllowed=false;
- if (!aInfo.bRotateFreeAllowed) bRotateFreeAllowed=false;
- if (!aInfo.bRotate90Allowed ) bRotate90Allowed =false;
- if (!aInfo.bMirrorFreeAllowed) bMirrorFreeAllowed=false;
- if (!aInfo.bMirror45Allowed ) bMirror45Allowed =false;
- if (!aInfo.bMirror90Allowed ) bMirror90Allowed =false;
- if (!aInfo.bShearAllowed ) bShearAllowed =false;
- if (aInfo.bEdgeRadiusAllowed) bEdgeRadiusAllowed=true;
- if (aInfo.bNoContortion ) bContortionPossible=false;
+ if (!aInfo.bMoveAllowed ) m_bMoveAllowed =false;
+ if (!aInfo.bResizeFreeAllowed) m_bResizeFreeAllowed=false;
+ if (!aInfo.bResizePropAllowed) m_bResizePropAllowed=false;
+ if (!aInfo.bRotateFreeAllowed) m_bRotateFreeAllowed=false;
+ if (!aInfo.bRotate90Allowed ) m_bRotate90Allowed =false;
+ if (!aInfo.bMirrorFreeAllowed) m_bMirrorFreeAllowed=false;
+ if (!aInfo.bMirror45Allowed ) m_bMirror45Allowed =false;
+ if (!aInfo.bMirror90Allowed ) m_bMirror90Allowed =false;
+ if (!aInfo.bShearAllowed ) m_bShearAllowed =false;
+ if (aInfo.bEdgeRadiusAllowed) m_bEdgeRadiusAllowed=true;
+ if (aInfo.bNoContortion ) m_bContortionPossible=false;
// For Crook with Contortion: all objects have to be
// Movable and Rotatable, except for a maximum of 1 of them
- if (!bMoreThanOneNoMovRot) {
+ if (!m_bMoreThanOneNoMovRot) {
if (!aInfo.bMoveAllowed || !aInfo.bResizeFreeAllowed) {
- bMoreThanOneNoMovRot=bNoMovRotFound;
+ m_bMoreThanOneNoMovRot=bNoMovRotFound;
bNoMovRotFound=true;
}
}
// Must be resizable to allow cropping
if (!aInfo.bResizeFreeAllowed && !aInfo.bResizePropAllowed)
- bCropAllowed = false;
+ m_bCropAllowed = false;
// if one member cannot be converted, no conversion is possible
if(!aInfo.bCanConvToContour)
- bCanConvToContour = false;
+ m_bCanConvToContour = false;
// Ungroup
- if (!bUnGroupPossible) bUnGroupPossible=pObj->GetSubList()!=nullptr;
+ if (!m_bUnGroupPossible) m_bUnGroupPossible=pObj->GetSubList()!=nullptr;
// ConvertToCurve: If at least one can be converted, that is fine.
- if (aInfo.bCanConvToPath ) bCanConvToPath =true;
- if (aInfo.bCanConvToPoly ) bCanConvToPoly =true;
+ if (aInfo.bCanConvToPath ) m_bCanConvToPath =true;
+ if (aInfo.bCanConvToPoly ) m_bCanConvToPoly =true;
// Combine/Dismantle
- if(bCombinePossible)
+ if(m_bCombinePossible)
{
- bCombinePossible = ImpCanConvertForCombine(pObj);
- bCombineNoPolyPolyPossible = bCombinePossible;
+ m_bCombinePossible = ImpCanConvertForCombine(pObj);
+ m_bCombineNoPolyPolyPossible = m_bCombinePossible;
}
- if (!bDismantlePossible) bDismantlePossible = ImpCanDismantle(pObj, false);
- if (!bDismantleMakeLinesPossible) bDismantleMakeLinesPossible = ImpCanDismantle(pObj, true);
+ if (!m_bDismantlePossible) m_bDismantlePossible = ImpCanDismantle(pObj, false);
+ if (!m_bDismantleMakeLinesPossible) m_bDismantleMakeLinesPossible = ImpCanDismantle(pObj, true);
// check OrthoDesiredOnMarked
- if (!bOrthoDesiredOnMarked && !aInfo.bNoOrthoDesired) bOrthoDesiredOnMarked=true;
+ if (!m_bOrthoDesiredOnMarked && !aInfo.bNoOrthoDesired) m_bOrthoDesiredOnMarked=true;
// check ImportMtf
- if (!bImportMtfPossible)
+ if (!m_bImportMtfPossible)
{
const SdrGrafObj* pSdrGrafObj = dynamic_cast< const SdrGrafObj* >(pObj);
if (pSdrGrafObj != nullptr)
@@ -613,32 +613,32 @@ void SdrEditView::CheckPossibilities()
pSdrGrafObj->isEmbeddedVectorGraphicData() ||
pSdrGrafObj->isEmbeddedPdfData())
{
- bImportMtfPossible = true;
+ m_bImportMtfPossible = true;
}
}
const SdrOle2Obj* pSdrOle2Obj = dynamic_cast< const SdrOle2Obj* >(pObj);
if (pSdrOle2Obj)
{
- bImportMtfPossible = pSdrOle2Obj->GetObjRef().is();
+ m_bImportMtfPossible = pSdrOle2Obj->GetObjRef().is();
}
}
}
- bOneOrMoreMovable=nMovableCount!=0;
- bGrpEnterPossible=bUnGroupPossible;
+ m_bOneOrMoreMovable=nMovableCount!=0;
+ m_bGrpEnterPossible=m_bUnGroupPossible;
}
ImpCheckToTopBtmPossible();
static_cast<SdrPolyEditView*>(this)->ImpCheckPolyPossibilities();
- bPossibilitiesDirty=false;
+ m_bPossibilitiesDirty=false;
- if (bReadOnly) {
- bool bMerker1=bGrpEnterPossible;
+ if (m_bReadOnly) {
+ bool bMerker1=m_bGrpEnterPossible;
ImpResetPossibilityFlags();
- bReadOnly=true;
- bGrpEnterPossible=bMerker1;
+ m_bReadOnly=true;
+ m_bGrpEnterPossible=bMerker1;
}
- if (bMoveAllowed) {
+ if (m_bMoveAllowed) {
// Don't allow moving glued connectors.
// Currently only implemented for single selection.
if (nMarkCount==1) {
@@ -647,7 +647,7 @@ void SdrEditView::CheckPossibilities()
if (pEdge!=nullptr) {
SdrObject* pNode1=pEdge->GetConnectedNode(true);
SdrObject* pNode2=pEdge->GetConnectedNode(false);
- if (pNode1!=nullptr || pNode2!=nullptr) bMoveAllowed=false;
+ if (pNode1!=nullptr || pNode2!=nullptr) m_bMoveAllowed=false;
}
}
}
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index c7b8bf1de5c8..960dd2c58269 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -1562,7 +1562,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
}
// corner radius
- if (bEdgeRadiusAllowed && SfxItemState::SET==rAttr.GetItemState(SDRATTR_ECKENRADIUS,true,&pPoolItem)) {
+ if (m_bEdgeRadiusAllowed && SfxItemState::SET==rAttr.GetItemState(SDRATTR_ECKENRADIUS,true,&pPoolItem)) {
long nRadius=static_cast<const SdrMetricItem*>(pPoolItem)->GetValue();
aSetAttr.Put(makeSdrEckenradiusItem(nRadius));
bSetAttr=true;
@@ -1577,7 +1577,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
}
// change size and height
- if (bChgSiz && (bResizeFreeAllowed || bResizePropAllowed)) {
+ if (bChgSiz && (m_bResizeFreeAllowed || m_bResizePropAllowed)) {
Fraction aWdt(nSizX,aRect.Right()-aRect.Left());
Fraction aHgt(nSizY,aRect.Bottom()-aRect.Top());
Point aRef(ImpGetPoint(aRect,eSizePoint));
@@ -1591,7 +1591,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
}
// rotate
- if (bRotate && (bRotateFreeAllowed || bRotate90Allowed)) {
+ if (bRotate && (m_bRotateFreeAllowed || m_bRotate90Allowed)) {
Point aRef(nRotateX,nRotateY);
if(GetSdrPageView())
@@ -1616,7 +1616,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
}
// shear
- if (bShear && bShearAllowed) {
+ if (bShear && m_bShearAllowed) {
Point aRef(nShearX,nShearY);
if(GetSdrPageView())
@@ -1635,7 +1635,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
}
// change position
- if (bChgPos && bMoveAllowed) {
+ if (bChgPos && m_bMoveAllowed) {
MoveMarkedObj(Size(nPosDX,nPosDY));
}
@@ -1663,11 +1663,11 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
if(bChanged)
{
- bMoveProtect = bProtPos;
+ m_bMoveProtect = bProtPos;
if(bProtPos)
{
- bResizeProtect = true;
+ m_bResizeProtect = true;
}
// #i77187# there is no simple method to get the toolbars updated
@@ -1678,7 +1678,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
}
}
- if(!bMoveProtect)
+ if(!m_bMoveProtect)
{
// protect size
if(SfxItemState::SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_SIZE, true, &pPoolItem))
@@ -1699,7 +1699,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
if(bChanged)
{
- bResizeProtect = bProtSize;
+ m_bResizeProtect = bProtSize;
// #i77187# see above
MarkListHasChanged();
@@ -1716,8 +1716,8 @@ bool SdrEditView::IsAlignPossible() const
ForcePossibilities();
const size_t nCount=GetMarkedObjectCount();
if (nCount==0) return false; // nothing selected!
- if (nCount==1) return bMoveAllowed; // align single object to page
- return bOneOrMoreMovable; // otherwise: MarkCount>=2
+ if (nCount==1) return m_bMoveAllowed; // align single object to page
+ return m_bOneOrMoreMovable; // otherwise: MarkCount>=2
}
void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert)
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index fdfc237ff043..4c9dc54612b8 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -501,12 +501,12 @@ void SdrEditView::ImpCheckToTopBtmPossible()
const size_t nRestrict=pRestrict->GetOrdNum();
if (nRestrict>nMin) nMin=nRestrict;
}
- bToTopPossible=nObjNum<nMax-1;
- bToBtmPossible=nObjNum>nMin;
+ m_bToTopPossible=nObjNum<nMax-1;
+ m_bToBtmPossible=nObjNum>nMin;
} else { // multiple selection
SdrObjList* pOL0=nullptr;
size_t nPos0 = 0;
- for (size_t nm = 0; !bToBtmPossible && nm<nCount; ++nm) { // check 'send to background'
+ for (size_t nm = 0; !m_bToBtmPossible && nm<nCount; ++nm) { // check 'send to background'
SdrObject* pObj=GetMarkedObjectByIndex(nm);
SdrObjList* pOL=pObj->getParentSdrObjListFromSdrObject();
if (pOL!=pOL0) {
@@ -514,13 +514,13 @@ void SdrEditView::ImpCheckToTopBtmPossible()
pOL0=pOL;
}
const size_t nPos = pObj->GetOrdNum();
- bToBtmPossible = nPos && (nPos-1 > nPos0);
+ m_bToBtmPossible = nPos && (nPos-1 > nPos0);
nPos0 = nPos;
}
pOL0=nullptr;
nPos0 = SAL_MAX_SIZE;
- for (size_t nm=nCount; !bToTopPossible && nm>0; ) { // check 'bring to front'
+ for (size_t nm=nCount; !m_bToTopPossible && nm>0; ) { // check 'bring to front'
--nm;
SdrObject* pObj=GetMarkedObjectByIndex(nm);
SdrObjList* pOL=pObj->getParentSdrObjListFromSdrObject();
@@ -529,7 +529,7 @@ void SdrEditView::ImpCheckToTopBtmPossible()
pOL0=pOL;
}
const size_t nPos = pObj->GetOrdNum();
- bToTopPossible = nPos+1 < nPos0;
+ m_bToTopPossible = nPos+1 < nPos0;
nPos0=nPos;
}
}
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index 9cafe342e3a6..5c9c46df21d3 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -856,7 +856,7 @@ void SwDrawView::CheckPossibilities()
&& RndStdIds::FLY_AS_CHAR == pFly->GetFormat()->GetAnchor().GetAnchorId()
&& pDoc->GetDocumentSettingManager().get( DocumentSettingId::MATH_BASELINE_ALIGNMENT );
if (bProtectMathPos)
- bMoveProtect = true;
+ m_bMoveProtect = true;
}
}
else if(pGrfNd)
@@ -891,12 +891,12 @@ void SwDrawView::CheckPossibilities()
}
}
}
- bMoveProtect |= bProtect;
- bResizeProtect |= bProtect || bSzProtect;
+ m_bMoveProtect |= bProtect;
+ m_bResizeProtect |= bProtect || bSzProtect;
// RotGrfFlyFrame: allow rotation when SwGrfNode is selected and not size protected
- bRotateFreeAllowed |= bRotate && !bProtect;
- bRotate90Allowed |= bRotateFreeAllowed;
+ m_bRotateFreeAllowed |= bRotate && !bProtect;
+ m_bRotate90Allowed |= m_bRotateFreeAllowed;
}
/// replace marked <SwDrawVirtObj>-objects by its reference object for delete marked objects.
More information about the Libreoffice-commits
mailing list