include/svx/svddrgv.hxx | 26 ++++++------
include/svx/svdedtv.hxx | 76 +++++++++++++++++------------------
include/svx/svdedxv.hxx | 4 -
include/svx/svdmrkv.hxx | 38 ++++++++---------
include/svx/svdpntv.hxx | 102 ++++++++++++++++++++++++------------------------
include/svx/svdpoev.hxx | 10 ++--
include/svx/svdsnpv.hxx | 50 +++++++++++------------
include/svx/svdxcgv.hxx | 14 +++---
8 files changed, 160 insertions(+), 160 deletions(-)
New commits:
commit 9cf5c0b0d82fcd7670ef70262437063601594fd6
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Mon Jun 13 20:45:50 2022 +0200
Commit: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
CommitDate: Mon Jun 13 20:45:50 2022 +0200
svx: remove annoying whitespace in SdrView and subclasses
Change-Id: I3eb1949c0024ab0241a26c7dec410c774b91cdcb
diff --git a/include/svx/svddrgv.hxx b/include/svx/svddrgv.hxx
index c88cf0b30192..4e47a6bd85ea 100644
--- a/include/svx/svddrgv.hxx
+++ b/include/svx/svddrgv.hxx
@@ -45,19 +45,19 @@ protected:
OUString maInsPointUndoStr;
SdrHdlKind meDragHdl;
- bool mbFramDrag : 1; // currently frame
dragging
- bool mbMarkedHitMovesAlways : 1; // Persistent
- bool mbDragLimit : 1; // Limit on SnapRect
instead of BoundRect
- bool mbDragHdl : 1; // TRUE: RefPt is slid
- bool mbDragStripes : 1; // Persistent
- bool mbSolidDragging : 1; // allow solid
create/drag of objects
- bool mbResizeAtCenter : 1;
- bool mbCrookAtCenter : 1;
- bool mbDragWithCopy : 1;
- bool mbInsGluePoint : 1;
- bool mbInsObjPointMode : 1;
- bool mbInsGluePointMode : 1;
- bool mbNoDragXorPolys : 1;
+ bool mbFramDrag : 1; // currently frame dragging
+ bool mbMarkedHitMovesAlways : 1; // Persistent
+ bool mbDragLimit : 1; // Limit on SnapRect instead of BoundRect
+ bool mbDragHdl : 1; // TRUE: RefPt is slid
+ bool mbDragStripes : 1; // Persistent
+ bool mbSolidDragging : 1; // allow solid create/drag of objects
+ bool mbResizeAtCenter : 1;
+ bool mbCrookAtCenter : 1;
+ bool mbDragWithCopy : 1;
+ bool mbInsGluePoint : 1;
+ bool mbInsObjPointMode : 1;
+ bool mbInsGluePointMode : 1;
+ bool mbNoDragXorPolys : 1;
protected:
virtual void SetMarkHandles(SfxViewShell* pOtherShell) override;
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index d2c9b3816f6a..7a34a9d1b75c 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -70,48 +70,48 @@ namespace o3tl
class SVXCORE_DLLPUBLIC SdrEditView : public SdrMarkView
{
- friend class SdrPageView;
- friend class SdrDragDistort;
- friend class SdrDragCrook;
+ friend class SdrPageView;
+ friend class SdrDragDistort;
+ friend class SdrDragCrook;
protected:
// cache the transformation queries, etc. a little
- 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 than
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;
+ 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 than 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 ImpResetPossibilityFlags();
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index cbdecfea5298..33cb757bfdc6 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -60,8 +60,8 @@ enum class SdrEndTextEditKind
class SVXCORE_DLLPUBLIC SdrObjEditView : public SdrGlueEditView, public
EditViewCallbacks
{
- friend class SdrPageView;
- friend class ImpSdrEditPara;
+ friend class SdrPageView;
+ friend class ImpSdrEditPara;
// Now derived from EditViewCallbacks and overriding these callbacks to
// allow own EditText visualization
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index ec9055711c3f..162581fc5def 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -102,36 +102,36 @@ protected:
SdrObject* mpMarkedObj; // If not just one object (
i.e. More than one object ) is marked.
SdrPageView* mpMarkedPV; // If all marked objects
are situated on the same PageView.
- Point maRef1; // Persistent - Rotation
center / axis of reflection
- Point maRef2; // Persistent
- SdrHdlList maHdlList;
+ Point maRef1; // Persistent - Rotation center / axis of reflection
+ Point maRef2; // Persistent
+ SdrHdlList maHdlList;
- sdr::ViewSelection maSdrViewSelection;
+ sdr::ViewSelection maSdrViewSelection;
std::vector<basegfx::B2DRectangle> maSubSelectionList;
- tools::Rectangle maMarkedObjRect;
- tools::Rectangle maMarkedPointsRect;
- tools::Rectangle maMarkedGluePointsRect;
+ tools::Rectangle maMarkedObjRect;
+ tools::Rectangle maMarkedPointsRect;
+ tools::Rectangle maMarkedGluePointsRect;
static constexpr sal_uInt16 mnFrameHandlesLimit = 50;
- SdrDragMode meDragMode; // Persistent
- SdrViewEditMode meEditMode; // Persistent
- SdrViewEditMode meEditMode0; // Persistent
+ SdrDragMode meDragMode; // Persistent
+ SdrViewEditMode meEditMode; // Persistent
+ SdrViewEditMode meEditMode0; // Persistent
- bool mbDesignMode : 1; // DesignMode for
SdrUnoObj
- bool mbForceFrameHandles : 1; // Persistent -
FrameDrag also for single objects
- bool mbPlusHdlAlways : 1; // Persistent
- bool mbInsPolyPoint : 1; // at this time
InsPolyPointDragging
- bool mbMarkedObjRectDirty : 1;
- bool mbMrkPntDirty : 1;
- bool mbMarkedPointsRectsDirty : 1;
+ bool mbDesignMode : 1; // DesignMode for SdrUnoObj
+ bool mbForceFrameHandles : 1; // Persistent - FrameDrag also for single
objects
+ bool mbPlusHdlAlways : 1; // Persistent
+ bool mbInsPolyPoint : 1; // at this time InsPolyPointDragging
+ bool mbMarkedObjRectDirty : 1;
+ bool mbMrkPntDirty : 1;
+ bool mbMarkedPointsRectsDirty : 1;
// flag to completely disable handles at the view
- bool mbMarkHandlesHidden : 1;
+ bool mbMarkHandlesHidden : 1;
// flag indicating whether all x coordinates are negated or not
- bool mbNegativeX : 1;
+ bool mbNegativeX : 1;
// Helper to get a possible GridOffset from SdrObject
bool getPossibleGridOffsetForSdrObject(
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 557846fe01d8..7370c5f1c7ed 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -114,81 +114,81 @@ BitmapEx convertMetafileToBitmapEx(
class SVXCORE_DLLPUBLIC SdrPaintView : public SfxListener, public
SfxRepeatTarget, public SfxBroadcaster, public ::utl::ConfigurationListener
{
private:
- friend class SdrPageView;
- friend class SdrGrafObj;
+ friend class SdrPageView;
+ friend class SdrGrafObj;
// the SdrModel this view was created with, unchanged during lifetime
- SdrModel& mrSdrModelFromSdrView;
+ SdrModel& mrSdrModelFromSdrView;
std::unique_ptr<SdrPageView> mpPageView;
protected:
- SdrModel* mpModel;
- VclPtr<OutputDevice> mpActualOutDev; // Only for comparison
- VclPtr<OutputDevice> mpDragWin;
- SfxStyleSheet* mpDefaultStyleSheet;
+ SdrModel* mpModel;
+ VclPtr<OutputDevice> mpActualOutDev; // Only for comparison
+ VclPtr<OutputDevice> mpDragWin;
+ SfxStyleSheet* mpDefaultStyleSheet;
- OUString maActualLayer; // Current drawing layer
- OUString maMeasureLayer; // Current layer for
measurements
+ OUString maActualLayer; // Current drawing layer
+ OUString maMeasureLayer; // Current layer for measurements
// Container aPagV; // List of SdrPageViews
// All windows this view is displayed on
- std::vector< std::unique_ptr<SdrPaintWindow> > maPaintWindows;
-
- Size maGridBig; // FIXME: We need to get rid of
this eventually
- Size maGridFin; // FIXME: We need to get rid of
this eventually
- SdrDragStat maDragStat;
- tools::Rectangle maMaxWorkArea;
- SfxItemSet maDefaultAttr;
- Idle maComeBackIdle;
-
- SdrAnimationMode meAnimationMode;
-
- sal_uInt16 mnHitTolPix;
- sal_uInt16 mnMinMovPix;
- sal_uInt16 mnHitTolLog;
- sal_uInt16 mnMinMovLog;
-
- bool mbPageVisible : 1;
- bool mbPageShadowVisible : 1;
- bool mbPageBorderVisible : 1;
- bool mbBordVisible : 1;
- bool mbGridVisible : 1;
- bool mbGridFront : 1;
- bool mbHlplVisible : 1;
- bool mbHlplFront : 1;
- bool mbGlueVisible : 1; // Persistent; show
gluepoints
- bool mbGlueVisible2 : 1; // Also show gluepoints
for GluePointEdit
- bool mbGlueVisible3 : 1; // Also show gluepoints
for EdgeTool
- bool mbGlueVisible4 : 1; // Show gluepoints, if
one edge is selected
- bool mbSomeObjChgdFlag : 1;
- bool mbSwapAsynchron : 1;
- bool mbPrintPreview : 1;
+ std::vector<std::unique_ptr<SdrPaintWindow>> maPaintWindows;
+
+ Size maGridBig; // FIXME: We need to get rid of this eventually
+ Size maGridFin; // FIXME: We need to get rid of this eventually
+ SdrDragStat maDragStat;
+ tools::Rectangle maMaxWorkArea;
+ SfxItemSet maDefaultAttr;
+ Idle maComeBackIdle;
+
+ SdrAnimationMode meAnimationMode;
+
+ sal_uInt16 mnHitTolPix;
+ sal_uInt16 mnMinMovPix;
+ sal_uInt16 mnHitTolLog;
+ sal_uInt16 mnMinMovLog;
+
+ bool mbPageVisible : 1;
+ bool mbPageShadowVisible : 1;
+ bool mbPageBorderVisible : 1;
+ bool mbBordVisible : 1;
+ bool mbGridVisible : 1;
+ bool mbGridFront : 1;
+ bool mbHlplVisible : 1;
+ bool mbHlplFront : 1;
+ bool mbGlueVisible : 1; // Persistent; show gluepoints
+ bool mbGlueVisible2 : 1; // Also show gluepoints for GluePointEdit
+ bool mbGlueVisible3 : 1; // Also show gluepoints for EdgeTool
+ bool mbGlueVisible4 : 1; // Show gluepoints, if one edge is selected
+ bool mbSomeObjChgdFlag : 1;
+ bool mbSwapAsynchron : 1;
+ bool mbPrintPreview : 1;
// These bools manage, the status that is displayed
//
- bool mbAnimationPause : 1;
+ bool mbAnimationPause : 1;
// Flag which decides if buffered output for this view is allowed. When
// set, PreRendering for PageView rendering will be used. Default is
sal_False
- bool mbBufferedOutputAllowed : 1;
+ bool mbBufferedOutputAllowed : 1;
// Flag which decides if buffered overlay for this view is allowed. When
// set, the output will be buffered in an overlay vdev. When not, overlay
is
// directly painted to OutDev. Default is sal_False.
- bool mbBufferedOverlayAllowed : 1;
+ bool mbBufferedOverlayAllowed : 1;
// Allow page painting at all?
- bool mbPagePaintingAllowed : 1;
+ bool mbPagePaintingAllowed : 1;
// Is this a preview renderer?
- bool mbPreviewRenderer : 1;
+ bool mbPreviewRenderer : 1;
// Flags for calc and sw for suppressing OLE, CHART or DRAW objects
- bool mbHideOle : 1;
- bool mbHideChart : 1;
- bool mbHideDraw : 1; // hide draw
objects other than form controls
- bool mbHideFormControl : 1; // hide form
controls only
+ bool mbHideOle : 1;
+ bool mbHideChart : 1;
+ bool mbHideDraw : 1; // hide draw objects other than form controls
+ bool mbHideFormControl : 1; // hide form controls only
public:
// Interface for PagePaintingAllowed flag
@@ -206,8 +206,8 @@ public:
virtual rtl::Reference<sdr::overlay::OverlayManager>
CreateOverlayManager(OutputDevice& rDevice) const;
protected:
- svtools::ColorConfig maColorConfig;
- Color maGridColor;
+ svtools::ColorConfig maColorConfig;
+ Color maGridColor;
// Interface to SdrPaintWindow
void DeletePaintWindow(const SdrPaintWindow& rOld);
diff --git a/include/svx/svdpoev.hxx b/include/svx/svdpoev.hxx
index 8c0c8947cd71..089c88903068 100644
--- a/include/svx/svdpoev.hxx
+++ b/include/svx/svdpoev.hxx
@@ -26,13 +26,13 @@
class SVXCORE_DLLPUBLIC SdrPolyEditView : public SdrEditView, public
IPolyPolygonEditorController
{
- friend class SdrEditView;
+ friend class SdrEditView;
- bool bSetMarkedPointsSmoothPossible : 1;
- bool bSetMarkedSegmentsKindPossible : 1;
+ bool bSetMarkedPointsSmoothPossible : 1;
+ bool bSetMarkedSegmentsKindPossible : 1;
- SdrPathSmoothKind eMarkedPointsSmooth;
- SdrPathSegmentKind eMarkedSegmentsKind;
+ SdrPathSmoothKind eMarkedPointsSmooth;
+ SdrPathSegmentKind eMarkedSegmentsKind;
private:
SVX_DLLPRIVATE void ImpResetPolyPossibilityFlags();
diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx
index 1fd8fce3ba97..a7390ad49ad6 100644
--- a/include/svx/svdsnpv.hxx
+++ b/include/svx/svdsnpv.hxx
@@ -99,31 +99,31 @@ protected:
// #114409#-2 Migrate HelpLine
class ImplHelpLineOverlay* mpHelpLineOverlay;
- Size aMagnSiz;
- Fraction aSnapWdtX;
- Fraction aSnapWdtY;
-
- sal_uInt16 nMagnSizPix;
- Degree100 nSnapAngle;
- Degree100 nEliminatePolyPointLimitAngle;
-
- SdrCrookMode eCrookMode;
-
- bool bSnapEnab : 1;
- bool bGridSnap : 1;
- bool bBordSnap : 1;
- bool bHlplSnap : 1;
- bool bOFrmSnap : 1;
- bool bOPntSnap : 1;
- bool bOConSnap : 1;
- bool bMoveSnapOnlyTopLeft : 1; // Special for
dialogeditor
- bool bOrtho : 1;
- bool bBigOrtho : 1;
- bool bAngleSnapEnab : 1;
- bool bMoveOnlyDragging : 1; // only move
objects while Resize/Rotate/...
- bool bSlantButShear : 1; // use slant
instead of shear
- bool bCrookNoContortion : 1; // no contorsion
while Crook
- bool bEliminatePolyPoints : 1;
+ Size aMagnSiz;
+ Fraction aSnapWdtX;
+ Fraction aSnapWdtY;
+
+ sal_uInt16 nMagnSizPix;
+ Degree100 nSnapAngle;
+ Degree100 nEliminatePolyPointLimitAngle;
+
+ SdrCrookMode eCrookMode;
+
+ bool bSnapEnab : 1;
+ bool bGridSnap : 1;
+ bool bBordSnap : 1;
+ bool bHlplSnap : 1;
+ bool bOFrmSnap : 1;
+ bool bOPntSnap : 1;
+ bool bOConSnap : 1;
+ bool bMoveSnapOnlyTopLeft : 1; // Special for dialogeditor
+ bool bOrtho : 1;
+ bool bBigOrtho : 1;
+ bool bAngleSnapEnab : 1;
+ bool bMoveOnlyDragging : 1; // only move objects while
Resize/Rotate/...
+ bool bSlantButShear : 1; // use slant instead of shear
+ bool bCrookNoContortion : 1; // no contorsion while Crook
+ bool bEliminatePolyPoints : 1;
protected:
// #i71538# make constructors of SdrView sub-components protected to avoid
incomplete incarnations which may get casted to SdrView
diff --git a/include/svx/svdxcgv.hxx b/include/svx/svdxcgv.hxx
index 87ea2a28569b..11e16b2ebcdb 100644
--- a/include/svx/svdxcgv.hxx
+++ b/include/svx/svdxcgv.hxx
@@ -30,12 +30,12 @@ class SVXCORE_DLLPUBLIC SdrExchangeView : public
SdrObjEditView
protected:
- void ImpGetPasteObjList(Point& rPos, SdrObjList*& rpLst);
- void ImpPasteObject(SdrObject* pObj, SdrObjList& rLst,
const Point& rCenter, const Size& rSiz, const MapMode& rMap, SdrInsertFlags
nOptions);
- bool ImpGetPasteLayer(const SdrObjList* pObjList,
SdrLayerID& rLayer) const;
+ void ImpGetPasteObjList(Point& rPos, SdrObjList*& rpLst);
+ void ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point&
rCenter, const Size& rSiz, const MapMode& rMap, SdrInsertFlags nOptions);
+ bool ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer)
const;
// Returns true if rPt has changed
- bool ImpLimitToWorkArea(Point& rPt) const;
+ bool ImpLimitToWorkArea(Point& rPt) const;
protected:
// #i71538# make constructors of SdrView sub-components protected to avoid
incomplete incarnations which may get casted to SdrView
@@ -46,7 +46,7 @@ protected:
public:
// Output all marked objects on the specified OutputDevice
::std::vector< SdrObject* > GetMarkedObjects() const;
- virtual void DrawMarkedObj(OutputDevice& rOut) const;
+ virtual void DrawMarkedObj(OutputDevice& rOut) const;
// E.g. for Clipboard, Drag'n'Drop, ...
// Add all marked objects to a metafile.
@@ -106,8 +106,8 @@ public:
virtual bool Paste(
const SdrModel& rMod, const Point& rPos, SdrObjList* pLst,
SdrInsertFlags nOptions);
- bool Paste(const OUString& rStr, const Point& rPos, SdrObjList*
pLst, SdrInsertFlags nOptions);
- bool Paste(SvStream& rInput, EETextFormat eFormat, const Point&
rPos, SdrObjList* pLst, SdrInsertFlags nOptions);
+ bool Paste(const OUString& rStr, const Point& rPos, SdrObjList* pLst,
SdrInsertFlags nOptions);
+ bool Paste(SvStream& rInput, EETextFormat eFormat, const Point& rPos,
SdrObjList* pLst, SdrInsertFlags nOptions);
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
