summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-17 17:05:29 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-17 18:45:15 +0100
commit03725013b64e74473e1a9e925b24927e7e61d412 (patch)
tree3f7c276d44feda7071b296f0c73b4b7c111b5011 /include
parent20223e2374bb6a966e44471c224d22d968d19025 (diff)
bool improvements
Change-Id: Ic46fa46c200b94e2e6c5a073ba89b9aae5c14542
Diffstat (limited to 'include')
-rw-r--r--include/svx/dlgctl3d.hxx4
-rw-r--r--include/svx/obj3d.hxx8
-rw-r--r--include/svx/rulritem.hxx4
-rw-r--r--include/svx/scene3d.hxx2
-rw-r--r--include/svx/sdr/contact/displayinfo.hxx8
-rw-r--r--include/svx/sdr/contact/objectcontact.hxx2
-rw-r--r--include/svx/sdr/contact/viewcontactofsdrpage.hxx4
-rw-r--r--include/svx/sdr/contact/viewobjectcontact.hxx2
-rw-r--r--include/svx/sdr/overlay/overlaymanagerbuffered.hxx2
-rw-r--r--include/svx/sdr/overlay/overlayobject.hxx8
-rw-r--r--include/svx/sdr/overlay/overlayrollingrectangle.hxx4
-rw-r--r--include/svx/sdr/overlay/overlayselection.hxx2
-rw-r--r--include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx6
-rw-r--r--include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx4
-rw-r--r--include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx6
-rw-r--r--include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx20
-rw-r--r--include/svx/sdrpaintwindow.hxx4
-rw-r--r--include/svx/srchdlg.hxx2
-rw-r--r--include/svx/svddrgmt.hxx6
-rw-r--r--include/svx/svddrgv.hxx40
-rw-r--r--include/svx/svdedtv.hxx82
-rw-r--r--include/svx/svdedxv.hxx12
-rw-r--r--include/svx/svdmrkv.hxx24
-rw-r--r--include/svx/svdoedge.hxx22
-rw-r--r--include/svx/svdpage.hxx10
-rw-r--r--include/svx/svdpntv.hxx60
-rw-r--r--include/svx/svdsnpv.hxx42
-rw-r--r--include/svx/svdview.hxx38
28 files changed, 214 insertions, 214 deletions
diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx
index b2e02ef48807..6f37b018f743 100644
--- a/include/svx/dlgctl3d.hxx
+++ b/include/svx/dlgctl3d.hxx
@@ -102,8 +102,8 @@ class SVX_DLLPUBLIC Svx3DLightControl : public Svx3DPreviewControl
double mfSaveActionStartRotZ;
// bitfield
- unsigned mbMouseMoved : 1;
- unsigned mbGeometrySelected : 1;
+ bool mbMouseMoved : 1;
+ bool mbGeometrySelected : 1;
void Construct2();
void ConstructLightObjects();
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index d93c98b7c8c9..6b97a8b3262a 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -116,8 +116,8 @@ private:
basegfx::B3DHomMatrix maFullTransform; // global transformation (including. parents)
// Flags
- unsigned mbTfHasChanged : 1;
- unsigned mbIsSelected : 1;
+ bool mbTfHasChanged : 1;
+ bool mbIsSelected : 1;
public:
void SetBoundVolInvalid();
@@ -229,8 +229,8 @@ protected:
Color aMaterialAmbientColor;
// attributes for geometry creation
- unsigned bCreateNormals : 1;
- unsigned bCreateTexture : 1;
+ bool bCreateNormals : 1;
+ bool bCreateTexture : 1;
protected:
void SetDefaultAttributes(E3dDefaultAttributes& rDefault);
diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx
index db32d35be00f..9c93036445ff 100644
--- a/include/svx/rulritem.hxx
+++ b/include/svx/rulritem.hxx
@@ -141,8 +141,8 @@ struct SVX_DLLPUBLIC SvxColumnDescription
SvxColumnDescription(long start, long end,
long endMin, long endMax, sal_Bool bVis = sal_True);
- int operator==(const SvxColumnDescription &rCmp) const;
- int operator!=(const SvxColumnDescription &rCmp) const;
+ bool operator==(const SvxColumnDescription &rCmp) const;
+ bool operator!=(const SvxColumnDescription &rCmp) const;
long GetWidth() const;
};
diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx
index 1a2356241aa4..eb6965db213b 100644
--- a/include/svx/scene3d.hxx
+++ b/include/svx/scene3d.hxx
@@ -73,7 +73,7 @@ protected:
Imp3DDepthRemapper* mp3DDepthRemapper;
// Flag to determine if only selected objects should be drawn
- unsigned bDrawOnlySelected : 1;
+ bool bDrawOnlySelected : 1;
virtual void NewObjectInserted(const E3dObject* p3DObj);
virtual void StructureChanged();
diff --git a/include/svx/sdr/contact/displayinfo.hxx b/include/svx/sdr/contact/displayinfo.hxx
index 03bc55af9cc7..40b799790517 100644
--- a/include/svx/sdr/contact/displayinfo.hxx
+++ b/include/svx/sdr/contact/displayinfo.hxx
@@ -45,25 +45,25 @@ namespace sdr
// the rasters will be suppressed as if mbPageProcessingActive is set (see there).
// This flag is set internally from the processing mechanism to avoid double page
// painting when the control layer needs to be painted as last layer
- unsigned mbControlLayerProcessingActive : 1;
+ bool mbControlLayerProcessingActive : 1;
// Internal flag to decide if page stuff (background, border, MasterPage, grid, etc...)
// will be processed at all. This flag is user-defined and will not be changed from the
// processing mechanism. Default is true, thus set to false if PagePainting should be suppressed.
// For more granular switching page stuff painting on and off, use the according flags at the
// view (->Is*Visible())
- unsigned mbPageProcessingActive : 1;
+ bool mbPageProcessingActive : 1;
// Internal flag to remember if EnteredGroupDrawMode is active. Default is true
// since this mode starts activated and gets switched off when reacing
// the current group level. Should only be changed by instances which do
// primitive processing
- unsigned mbGhostedDrawModeActive : 1;
+ bool mbGhostedDrawModeActive : 1;
// Internal flag to know if a MasterPage is processed as SubContent of another
// page. Initialized to false, this should only be changed from the instance which
// is processing the MasterPage asSubContent and knows what it does
- unsigned mbSubContentActive : 1;
+ bool mbSubContentActive : 1;
public:
// basic constructor.
diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx
index b4422a153e7e..b586927a4750 100644
--- a/include/svx/sdr/contact/objectcontact.hxx
+++ b/include/svx/sdr/contact/objectcontact.hxx
@@ -87,7 +87,7 @@ namespace sdr
// bitfield
// flag for preview renderer
- unsigned mbIsPreviewRenderer : 1;
+ bool mbIsPreviewRenderer : 1;
// method to create a EventHandler. Needs to give a result.
sdr::event::TimerEventHandler* CreateEventHandler();
diff --git a/include/svx/sdr/contact/viewcontactofsdrpage.hxx b/include/svx/sdr/contact/viewcontactofsdrpage.hxx
index b819aa80c9c6..b18f37a77144 100644
--- a/include/svx/sdr/contact/viewcontactofsdrpage.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrpage.hxx
@@ -198,7 +198,7 @@ namespace sdr
{
protected:
// bitfield
- unsigned mbFront : 1;
+ bool mbFront : 1;
virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact);
virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const;
@@ -222,7 +222,7 @@ namespace sdr
{
protected:
// bitfield
- unsigned mbFront : 1;
+ bool mbFront : 1;
virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact);
virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const;
diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx b/include/svx/sdr/contact/viewobjectcontact.hxx
index 0940d59495f9..d68c6f9138d4 100644
--- a/include/svx/sdr/contact/viewobjectcontact.hxx
+++ b/include/svx/sdr/contact/viewobjectcontact.hxx
@@ -69,7 +69,7 @@ namespace sdr
// bitfield
// This bool gets set when the object gets invalidated by ActionChanged() and
// can be used from the OC to late-invalidates
- unsigned mbLazyInvalidate : 1;
+ bool mbLazyInvalidate : 1;
protected:
// make redirector a protected friend, it needs to call createPrimitives as default action
diff --git a/include/svx/sdr/overlay/overlaymanagerbuffered.hxx b/include/svx/sdr/overlay/overlaymanagerbuffered.hxx
index d631a5915e37..c95a0f2e32d5 100644
--- a/include/svx/sdr/overlay/overlaymanagerbuffered.hxx
+++ b/include/svx/sdr/overlay/overlaymanagerbuffered.hxx
@@ -50,7 +50,7 @@ namespace sdr
// bitfield
// Flag to decide if PreRendering shall be used for overlay refreshes.
// Default is false.
- unsigned mbRefreshWithPreRendering : 1;
+ bool mbRefreshWithPreRendering : 1;
// link for timer
DECL_LINK(ImpBufferTimerHandler, AutoTimer*);
diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx
index 238a5a0ab19c..420b5aff0da7 100644
--- a/include/svx/sdr/overlay/overlayobject.hxx
+++ b/include/svx/sdr/overlay/overlayobject.hxx
@@ -93,20 +93,20 @@ namespace sdr
// bitfield
// Flag for visibility
- unsigned mbIsVisible : 1;
+ bool mbIsVisible : 1;
// Flag to control hittability
- unsigned mbIsHittable : 1;
+ bool mbIsHittable : 1;
// Flag to hold info if this objects supports animation. Default is
// false. If true, the Trigger() method should be overloaded
// to implement the animation effect and to re-initiate the event.
- unsigned mbAllowsAnimation : 1;
+ bool mbAllowsAnimation : 1;
// Flag tocontrol if this OverlayObject allows AntiAliased visualisation.
// Default is true, but e.g. for selection visualisation in SC and SW,
// it is switched to false
- unsigned mbAllowsAntiAliase : 1;
+ bool mbAllowsAntiAliase : 1;
// set changed flag. Call after change, since the old range is invalidated
// and then the new one is calculated and invalidated, too. This will only
diff --git a/include/svx/sdr/overlay/overlayrollingrectangle.hxx b/include/svx/sdr/overlay/overlayrollingrectangle.hxx
index 8cedaf6c3565..22df07292943 100644
--- a/include/svx/sdr/overlay/overlayrollingrectangle.hxx
+++ b/include/svx/sdr/overlay/overlayrollingrectangle.hxx
@@ -36,10 +36,10 @@ namespace sdr
// bitfield
// Flag to switch on/off long lines to the OutputDevice bounds
- unsigned mbExtendedLines : 1;
+ bool mbExtendedLines : 1;
// Flag to switch on/off the bounds itself
- unsigned mbShowBounds : 1;
+ bool mbShowBounds : 1;
// geometry creation for OverlayObject
virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
diff --git a/include/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx
index 34fe6b198692..dbe521b2557d 100644
--- a/include/svx/sdr/overlay/overlayselection.hxx
+++ b/include/svx/sdr/overlay/overlayselection.hxx
@@ -53,7 +53,7 @@ namespace sdr
sal_uInt16 mnLastTransparence;
// bitfield
- unsigned mbBorder : 1;
+ bool mbBorder : 1;
// geometry creation for OverlayObject, can use local *Last* values
virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
diff --git a/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
index 2aa60d1a67b7..0bc3af68214a 100644
--- a/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
@@ -43,14 +43,14 @@ namespace drawinglayer
// bitfield
// defines if SdrTextWordWrapItem was set at SdrObjCustomShape which means
// that the text needs to be block formatted
- unsigned mbWordWrap : 1;
+ bool mbWordWrap : 1;
// defines that the object contains/is a 3D AutoShape. Needed for
// making exceptions with shadow generation
- unsigned mb3DShape : 1;
+ bool mb3DShape : 1;
// #SJ# Allow text clipping against TextBox in special cases (used for SC)
- unsigned mbForceTextClipToTextRange : 1;
+ bool mbForceTextClipToTextRange : 1;
protected:
// local decomposition.
diff --git a/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx
index 9b0850440415..6dca6d6abc5c 100644
--- a/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx
@@ -74,8 +74,8 @@ namespace drawinglayer
double mfEndAngle;
// bitfield
- unsigned mbCloseSegment : 1;
- unsigned mbCloseUsingCenter : 1;
+ bool mbCloseSegment : 1;
+ bool mbCloseUsingCenter : 1;
protected:
// local decomposition.
diff --git a/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
index 1b06c42f8114..e663c5dd90b9 100644
--- a/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
@@ -61,9 +61,9 @@ namespace drawinglayer
double mfRightDelta;
// bitfield
- unsigned mbBelow : 1;
- unsigned mbTextRotation : 1;
- unsigned mbTextAutoAngle : 1;
+ bool mbBelow : 1;
+ bool mbTextRotation : 1;
+ bool mbTextAutoAngle : 1;
// internal decomposition helper
Primitive2DReference impCreatePart(
diff --git a/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
index 548e01de602e..37b9433ae34c 100644
--- a/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
@@ -72,9 +72,9 @@ namespace drawinglayer
// bitfield
// is there a PageNumber, Header, Footer or DateTimeField used? Evaluated at construction
- unsigned mbContainsPageField : 1;
- unsigned mbContainsPageCountField : 1;
- unsigned mbContainsOtherFields : 1;
+ bool mbContainsPageField : 1;
+ bool mbContainsPageCountField : 1;
+ bool mbContainsOtherFields : 1;
protected:
// support for XTEXT_PAINTSHAPE_BEGIN/XTEXT_PAINTSHAPE_END Metafile comments
@@ -203,11 +203,11 @@ namespace drawinglayer
SdrTextVertAdjust maSdrTextVertAdjust;
// bitfield
- unsigned mbFixedCellHeight : 1;
- unsigned mbUnlimitedPage : 1; // force layout with no text break
- unsigned mbCellText : 1; // this is a cell text as block text
- unsigned mbWordWrap : 1; // for CustomShapes text layout
- unsigned mbClipOnBounds : 1; // for CustomShapes text layout
+ bool mbFixedCellHeight : 1;
+ bool mbUnlimitedPage : 1; // force layout with no text break
+ bool mbCellText : 1; // this is a cell text as block text
+ bool mbWordWrap : 1; // for CustomShapes text layout
+ bool mbClipOnBounds : 1; // for CustomShapes text layout
protected:
// local decomposition.
@@ -261,7 +261,7 @@ namespace drawinglayer
basegfx::B2DHomMatrix maTextRangeTransform;
// bitfield
- unsigned mbFixedCellHeight : 1;
+ bool mbFixedCellHeight : 1;
protected:
// local decomposition.
@@ -302,7 +302,7 @@ namespace drawinglayer
::basegfx::B2DHomMatrix maTextRangeTransform; // text range transformation from unit range ([0.0 .. 1.0]) to text range
// bitfield
- unsigned mbWordWrap : 1; // for CustomShapes text layout
+ bool mbWordWrap : 1; // for CustomShapes text layout
protected:
// local decomposition.
diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx
index 036682baef45..741ebb90f280 100644
--- a/include/svx/sdrpaintwindow.hxx
+++ b/include/svx/sdrpaintwindow.hxx
@@ -89,7 +89,7 @@ private:
// bitfield
// #i72889# flag if this is only a temporary target for repaint, default is false
- unsigned mbTemporaryTarget : 1;
+ bool mbTemporaryTarget : 1;
/** Remember whether the mxOverlayManager supports buffering. Using
this flags expensive dynamic_casts on mxOverlayManager in order to
@@ -141,7 +141,7 @@ public:
// #i72889# read/write access to TempoparyTarget
bool getTemporaryTarget() const { return (bool)mbTemporaryTarget; }
- void setTemporaryTarget(bool bNew) { if(bNew != (bool)mbTemporaryTarget) mbTemporaryTarget = bNew; }
+ void setTemporaryTarget(bool bNew) { mbTemporaryTarget = bNew; }
// #i72889# get target output device, take into account output buffering
OutputDevice& GetTargetOutputDevice() { if(mpPreRenderDevice) return mpPreRenderDevice->GetPreRenderDevice(); else return mrOutputDevice; }
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 316a977f27d8..b6401009f2d8 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -235,7 +235,7 @@ private:
void Construct_Impl();
void InitControls_Impl();
void ShowOptionalControls_Impl();
- void Init_Impl( int bHasItemSet );
+ void Init_Impl( bool bHasItemSet );
void InitAttrList_Impl( const SfxItemSet* pSSet,
const SfxItemSet* pRSet );
void Remember_Impl( const OUString &rStr,sal_Bool bSearch );
diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx
index e5f9e0d1fbfe..6b81fc498ad1 100644
--- a/include/svx/svddrgmt.hxx
+++ b/include/svx/svddrgmt.hxx
@@ -31,7 +31,7 @@ class SVX_DLLPUBLIC SdrDragEntry
{
private:
// bitfield
- unsigned mbAddToTransparent : 1;
+ bool mbAddToTransparent : 1;
protected:
// access for derived classes
@@ -125,8 +125,8 @@ private:
SdrDragView& mrSdrDragView;
// bitfield
- unsigned mbMoveOnly : 1;
- unsigned mbSolidDraggingActive : 1;
+ bool mbMoveOnly : 1;
+ bool mbSolidDraggingActive : 1;
protected:
// access for derivated classes to maSdrDragEntries
diff --git a/include/svx/svddrgv.hxx b/include/svx/svddrgv.hxx
index 3f492b20a801..f7f0bc5786dd 100644
--- a/include/svx/svddrgv.hxx
+++ b/include/svx/svddrgv.hxx
@@ -43,26 +43,26 @@ protected:
sal_uIntPtr nDragXorPointLimit;
sal_uInt16 nDetailedEdgeDraggingLimit;
- unsigned bFramDrag : 1; // currently frame dragging
- unsigned bDragSpecial : 1; // currently Special Obj-dragging
- unsigned bMarkedHitMovesAlways : 1; // Persistent
- unsigned bDragLimit : 1; // Limit on SnapRect instead of BoundRect
- unsigned bDragHdl : 1; // TRUE: RefPt is slid
- unsigned bDragStripes : 1; // Persistent
- unsigned bMirrRefDragObj : 1; // Persistent - During the drag, show the mirror axis of the mirrored objects as Xor
- unsigned mbSolidDragging : 1; // allow solid create/drag of objects
- unsigned bMouseHideWhileDraggingPoints : 1;
- unsigned bResizeAtCenter : 1;
- unsigned bCrookAtCenter : 1;
- unsigned bDragWithCopy : 1;
- unsigned bInsGluePoint : 1;
- unsigned bInsObjPointMode : 1;
- unsigned bInsGluePointMode : 1;
- unsigned bNoDragXorPolys : 1;
- unsigned bAutoVertexCon : 1; // Automatische Konnektorgenerierung an den Scheitelpunkten
- unsigned bAutoCornerCon : 1; // Automatische Konnektorgenerierung an den Eckpunkten
- unsigned bRubberEdgeDragging : 1;
- unsigned bDetailedEdgeDragging : 1;
+ bool bFramDrag : 1; // currently frame dragging
+ bool bDragSpecial : 1; // currently Special Obj-dragging
+ bool bMarkedHitMovesAlways : 1; // Persistent
+ bool bDragLimit : 1; // Limit on SnapRect instead of BoundRect
+ bool bDragHdl : 1; // TRUE: RefPt is slid
+ bool bDragStripes : 1; // Persistent
+ bool bMirrRefDragObj : 1; // Persistent - During the drag, show the mirror axis of the mirrored objects as Xor
+ bool mbSolidDragging : 1; // allow solid create/drag of objects
+ bool bMouseHideWhileDraggingPoints : 1;
+ bool bResizeAtCenter : 1;
+ bool bCrookAtCenter : 1;
+ bool bDragWithCopy : 1;
+ bool bInsGluePoint : 1;
+ bool bInsObjPointMode : 1;
+ bool bInsGluePointMode : 1;
+ bool bNoDragXorPolys : 1;
+ bool bAutoVertexCon : 1; // Automatische Konnektorgenerierung an den Scheitelpunkten
+ bool bAutoCornerCon : 1; // Automatische Konnektorgenerierung an den Eckpunkten
+ bool bRubberEdgeDragging : 1;
+ bool bDetailedEdgeDragging : 1;
private:
SVX_DLLPRIVATE void ImpClearVars();
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index c6c7401b0483..10b198da4bae 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -68,48 +68,48 @@ class SVX_DLLPUBLIC SdrEditView: public SdrMarkView
protected:
// Die Transformationsnachfragen, etc. etwas cachen
- unsigned bPossibilitiesDirty : 1;
- unsigned bReadOnly : 1;
- unsigned bGroupPossible : 1;
- unsigned bUnGroupPossible : 1;
- unsigned bGrpEnterPossible : 1;
- unsigned bDeletePossible : 1;
- unsigned bToTopPossible : 1;
- unsigned bToBtmPossible : 1;
- unsigned bReverseOrderPossible : 1;
- unsigned bImportMtfPossible : 1;
- unsigned bCombinePossible : 1;
- unsigned bDismantlePossible : 1;
- unsigned bCombineNoPolyPolyPossible : 1;
- unsigned bDismantleMakeLinesPossible : 1;
- unsigned bOrthoDesiredOnMarked : 1;
- unsigned bMoreThanOneNotMovable : 1; // Es ist mehr als ein Objekt nicht verschiebbar
- unsigned bOneOrMoreMovable : 1; // Wenigstens 1 Obj verschiebbar
- unsigned bMoreThanOneNoMovRot : 1; // Es ist mehr als ein Objekt nicht verschieb- und drehbar (Crook)
- unsigned bContortionPossible : 1; // Alles Polygone (ggf. gruppiert)
- unsigned bAllPolys : 1; // Alles Polygone (nicht gruppiert)
- unsigned bOneOrMorePolys : 1; // Mindestens 1 Polygon (nicht gruppiert)
- unsigned bMoveAllowed : 1;
- unsigned bResizeFreeAllowed : 1;
- unsigned bResizePropAllowed : 1;
- unsigned bRotateFreeAllowed : 1;
- unsigned bRotate90Allowed : 1;
- unsigned bMirrorFreeAllowed : 1;
- unsigned bMirror45Allowed : 1;
- unsigned bMirror90Allowed : 1;
- unsigned bShearAllowed : 1;
- unsigned bEdgeRadiusAllowed : 1;
- unsigned bTransparenceAllowed : 1;
- unsigned bGradientAllowed : 1;
- unsigned bCanConvToPath : 1;
- unsigned bCanConvToPoly : 1;
- unsigned bCanConvToContour : 1;
- unsigned bCanConvToPathLineToArea : 1;
- unsigned bCanConvToPolyLineToArea : 1;
- unsigned bMoveProtect : 1;
- unsigned bResizeProtect : 1;
+ bool bPossibilitiesDirty : 1;
+ bool bReadOnly : 1;
+ bool bGroupPossible : 1;
+ bool bUnGroupPossible : 1;
+ bool bGrpEnterPossible : 1;
+ bool bDeletePossible : 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 bMoreThanOneNotMovable : 1; // Es ist mehr als ein Objekt nicht verschiebbar
+ bool bOneOrMoreMovable : 1; // Wenigstens 1 Obj verschiebbar
+ bool bMoreThanOneNoMovRot : 1; // Es ist mehr als ein Objekt nicht verschieb- und drehbar (Crook)
+ bool bContortionPossible : 1; // Alles Polygone (ggf. gruppiert)
+ bool bAllPolys : 1; // Alles Polygone (nicht gruppiert)
+ bool bOneOrMorePolys : 1; // Mindestens 1 Polygon (nicht gruppiert)
+ 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 bGradientAllowed : 1;
+ bool bCanConvToPath : 1;
+ bool bCanConvToPoly : 1;
+ bool bCanConvToContour : 1;
+ bool bCanConvToPathLineToArea : 1;
+ bool bCanConvToPolyLineToArea : 1;
+ bool bMoveProtect : 1;
+ bool bResizeProtect : 1;
// Z-Order von virtuellen Objekten zusammenhalten (Writer)
- unsigned bBundleVirtObj : 1;
+ bool bBundleVirtObj : 1;
private:
SVX_DLLPRIVATE void ImpClearVars();
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index ce9062f46964..d1a9963fd944 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -80,12 +80,12 @@ protected:
sal_uInt16 nMacroTol;
- unsigned bTextEditDontDelete : 1; // Outliner und View bei SdrEndTextEdit nicht deleten (f. Rechtschreibpruefung)
- unsigned bTextEditOnlyOneView : 1; // Nur eine OutlinerView (f. Rechtschreibpruefung)
- unsigned bTextEditNewObj : 1; // Aktuell editiertes Objekt wurde gerade neu erzeugt
- unsigned bQuickTextEditMode : 1; // persistent(->CrtV). Default=TRUE
- unsigned bMacroMode : 1; // persistent(->CrtV). Default=TRUE
- unsigned bMacroDown : 1;
+ bool bTextEditDontDelete : 1; // Outliner und View bei SdrEndTextEdit nicht deleten (f. Rechtschreibpruefung)
+ bool bTextEditOnlyOneView : 1; // Nur eine OutlinerView (f. Rechtschreibpruefung)
+ bool bTextEditNewObj : 1; // Aktuell editiertes Objekt wurde gerade neu erzeugt
+ bool bQuickTextEditMode : 1; // persistent(->CrtV). Default=TRUE
+ bool bMacroMode : 1; // persistent(->CrtV). Default=TRUE
+ bool bMacroDown : 1;
rtl::Reference< sdr::SelectionController > mxSelectionController;
rtl::Reference< sdr::SelectionController > mxLastSelectionController;
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index ecf2b207a1a4..f3cc8015550c 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -120,20 +120,20 @@ protected:
SdrViewEditMode eEditMode; // Persistent
SdrViewEditMode eEditMode0; // Persistent
- //HMHunsigned bHdlShown : 1;
- unsigned bRefHdlShownOnly : 1; // Axis of reflextion during dragging (ni)
- unsigned bDesignMode : 1; // DesignMode for SdrUnoObj
- unsigned bForceFrameHandles : 1; // Persistent - FrameDrag auch bei Einzelobjekten
- unsigned bPlusHdlAlways : 1; // Persistent
- unsigned bMarkHdlWhenTextEdit : 1; // Persistent, default=FALSE
- unsigned bInsPolyPoint : 1; // at this time InsPolyPointDragging
- unsigned bMarkedObjRectDirty : 1;
- unsigned bMrkPntDirty : 1;
- unsigned bMarkedPointsRectsDirty : 1;
- unsigned bMarkableObjCountDirty : 1;
+ //HMHbool bHdlShown : 1;
+ bool bRefHdlShownOnly : 1; // Axis of reflextion during dragging (ni)
+ bool bDesignMode : 1; // DesignMode for SdrUnoObj
+ bool bForceFrameHandles : 1; // Persistent - FrameDrag auch bei Einzelobjekten
+ bool bPlusHdlAlways : 1; // Persistent
+ bool bMarkHdlWhenTextEdit : 1; // Persistent, default=FALSE
+ bool bInsPolyPoint : 1; // at this time InsPolyPointDragging
+ bool bMarkedObjRectDirty : 1;
+ bool bMrkPntDirty : 1;
+ bool bMarkedPointsRectsDirty : 1;
+ bool bMarkableObjCountDirty : 1;
// flag to completely disable handles at the view
- unsigned mbMarkHandlesHidden : 1;
+ bool mbMarkHandlesHidden : 1;
private:
SVX_DLLPRIVATE void ImpClearVars();
diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx
index 900fd2ae27dd..95faaba88770 100644
--- a/include/svx/svdoedge.hxx
+++ b/include/svx/svdoedge.hxx
@@ -53,12 +53,12 @@ protected:
sal_uInt16 nConId; // Konnektornummer
// bitfield
- unsigned bBestConn : 1; // sal_True= es wird der guenstigste Konnektor gesucht
- unsigned bBestVertex : 1; // sal_True= es wird der guenstigste Scheitelpunkt zum konnekten gesucht
- unsigned bXDistOvr : 1; // sal_True= Hor. Objektabstand wurde gedragt (Overwrite)
- unsigned bYDistOvr : 1; // sal_True= Vert. Objektabstand wurde gedragt (Overwrite)
- unsigned bAutoVertex : 1; // AutoConnector am Scheitelpunkt nCon
- unsigned bAutoCorner : 1; // AutoConnector am Eckpunkt nCon
+ bool bBestConn : 1; // sal_True= es wird der guenstigste Konnektor gesucht
+ bool bBestVertex : 1; // sal_True= es wird der guenstigste Scheitelpunkt zum konnekten gesucht
+ bool bXDistOvr : 1; // sal_True= Hor. Objektabstand wurde gedragt (Overwrite)
+ bool bYDistOvr : 1; // sal_True= Vert. Objektabstand wurde gedragt (Overwrite)
+ bool bAutoVertex : 1; // AutoConnector am Scheitelpunkt nCon
+ bool bAutoCorner : 1; // AutoConnector am Eckpunkt nCon
public:
SdrObjConnection() { ResetVars(); }
@@ -167,24 +167,24 @@ protected:
SdrEdgeInfoRec aEdgeInfo;
// bitfield
- unsigned bEdgeTrackDirty : 1; // sal_True=Verbindungsverlauf muss neu berechnet werden.
- unsigned bEdgeTrackUserDefined : 1;
+ bool bEdgeTrackDirty : 1; // sal_True=Verbindungsverlauf muss neu berechnet werden.
+ bool bEdgeTrackUserDefined : 1;
// #109007#
// Bool to allow supporession of default connects at object
// inside test (HitTest) and object center test (see ImpFindConnector())
- unsigned mbSuppressDefaultConnect : 1;
+ bool mbSuppressDefaultConnect : 1;
// #110649#
// Flag value for avoiding death loops when calculating BoundRects
// from circularly connected connectors. A coloring algorythm is used
// here. When the GetCurrentBoundRect() calculation of a SdrEdgeObj
// is running, the flag is set, else it is always sal_False.
- unsigned mbBoundRectCalculationRunning : 1;
+ bool mbBoundRectCalculationRunning : 1;
// #i123048# need to remember if layouting was suppressed before to get
// to a correct state for first real layouting
- unsigned mbSuppressed : 1;
+ bool mbSuppressed : 1;
public:
// #109007#
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index caa8212df817..371443d1bc69 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -469,13 +469,13 @@ protected:
sal_uInt16 nPageNum;
// bitfield
- unsigned mbMaster : 1; // flag if this is a MasterPage
- unsigned mbInserted : 1;
- unsigned mbObjectsNotPersistent : 1;
- unsigned mbSwappingLocked : 1;
+ bool mbMaster : 1; // flag if this is a MasterPage
+ bool mbInserted : 1;
+ bool mbObjectsNotPersistent : 1;
+ bool mbSwappingLocked : 1;
// #i93597#
- unsigned mbPageBorderOnlyLeftRight : 1;
+ bool mbPageBorderOnlyLeftRight : 1;
void SetUnoPage(::com::sun::star::uno::Reference<
::com::sun::star::drawing::XDrawPage> const&);
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 817da1a3c1ce..89ce07a243d7 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -167,51 +167,51 @@ protected:
// hold an incarnation of Drawinglayer configuration options
SvtOptionsDrawinglayer maDrawinglayerOpt;
- unsigned bPageVisible : 1;
- unsigned bPageBorderVisible : 1;
- unsigned bBordVisible : 1;
- unsigned bGridVisible : 1;
- unsigned bGridFront : 1;
- unsigned bHlplVisible : 1;
- unsigned bHlplFront : 1;
- unsigned bGlueVisible : 1; // Persistent. Klebepunkte anzeigen
- unsigned bGlueVisible2 : 1; // Klebepunkte auch bei GluePointEdit anzeigen
- unsigned bGlueVisible3 : 1; // Klebepunkte auch bei EdgeTool anzeigen
- unsigned bGlueVisible4 : 1; // Klebepunkte anzeigen, wenn 1 Edge markiert
- unsigned bRestoreColors : 1; // Pens und Brushes werden zurueckgesetzt.
- unsigned bSomeObjChgdFlag : 1;
- unsigned bSwapAsynchron : 1;
- unsigned bPrintPreview : 1;
+ bool bPageVisible : 1;
+ bool bPageBorderVisible : 1;
+ bool bBordVisible : 1;
+ bool bGridVisible : 1;
+ bool bGridFront : 1;
+ bool bHlplVisible : 1;
+ bool bHlplFront : 1;
+ bool bGlueVisible : 1; // Persistent. Klebepunkte anzeigen
+ bool bGlueVisible2 : 1; // Klebepunkte auch bei GluePointEdit anzeigen
+ bool bGlueVisible3 : 1; // Klebepunkte auch bei EdgeTool anzeigen
+ bool bGlueVisible4 : 1; // Klebepunkte anzeigen, wenn 1 Edge markiert
+ bool bRestoreColors : 1; // Pens und Brushes werden zurueckgesetzt.
+ bool bSomeObjChgdFlag : 1;
+ bool bSwapAsynchron : 1;
+ bool bPrintPreview : 1;
// sal_Bool fuer die Verwaltung des anzuzeigenden Status
// Gruppe Betreten/Verlassen. Default ist sal_True, wird aber
// beispielsweise beim Chart auf sal_False gesetzt, da dort
// die Ghosted-Effekte zur Darstellug unerwuenscht sind.
- unsigned bVisualizeEnteredGroup : 1;
- unsigned bAnimationPause : 1;
+ bool bVisualizeEnteredGroup : 1;
+ bool bAnimationPause : 1;
// #114898#
// Flag which decides if buffered output for this view is allowed. When
// set, PreRendering for PageView rendering will be used. Default is sal_False
- unsigned mbBufferedOutputAllowed : 1;
+ bool mbBufferedOutputAllowed : 1;
// #114898#
// 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.
- unsigned mbBufferedOverlayAllowed : 1;
+ bool mbBufferedOverlayAllowed : 1;
// allow page painting at all?
- unsigned mbPagePaintingAllowed : 1;
+ bool mbPagePaintingAllowed : 1;
// is this a preview renderer?
- unsigned mbPreviewRenderer : 1;
+ bool mbPreviewRenderer : 1;
// flags for calc and sw for suppressing OLE, CHART or DRAW objects
- unsigned mbHideOle : 1;
- unsigned mbHideChart : 1;
- unsigned mbHideDraw : 1; // hide draw objects other than form controls
- unsigned 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:
// #114898#
@@ -255,9 +255,9 @@ protected:
// Wenn man den IdleStatus des Systems nicht abwarten will (auf const geschummelt):
void FlushComeBackTimer() const;
void TheresNewMapMode();
- void ImpSetGlueVisible2(bool bOn) { if (bGlueVisible2!=(unsigned)bOn) { bGlueVisible2=bOn; if (!bGlueVisible && !bGlueVisible3 && !bGlueVisible4) GlueInvalidate(); } }
- void ImpSetGlueVisible3(bool bOn) { if (bGlueVisible3!=(unsigned)bOn) { bGlueVisible3=bOn; if (!bGlueVisible && !bGlueVisible2 && !bGlueVisible4) GlueInvalidate(); } }
- void ImpSetGlueVisible4(bool bOn) { if (bGlueVisible4!=(unsigned)bOn) { bGlueVisible4=bOn; if (!bGlueVisible && !bGlueVisible2 && !bGlueVisible3) GlueInvalidate(); } }
+ void ImpSetGlueVisible2(bool bOn) { if (bGlueVisible2!=bOn) { bGlueVisible2=bOn; if (!bGlueVisible && !bGlueVisible3 && !bGlueVisible4) GlueInvalidate(); } }
+ void ImpSetGlueVisible3(bool bOn) { if (bGlueVisible3!=bOn) { bGlueVisible3=bOn; if (!bGlueVisible && !bGlueVisible2 && !bGlueVisible4) GlueInvalidate(); } }
+ void ImpSetGlueVisible4(bool bOn) { if (bGlueVisible4!=bOn) { bGlueVisible4=bOn; if (!bGlueVisible && !bGlueVisible2 && !bGlueVisible3) GlueInvalidate(); } }
sal_Bool ImpIsGlueVisible2() const { return bGlueVisible2; }
sal_Bool ImpIsGlueVisible3() const { return bGlueVisible3; }
sal_Bool ImpIsGlueVisible4() const { return bGlueVisible4; }
@@ -414,11 +414,11 @@ public:
void SetGridFront(bool bOn = true) { bGridFront =bOn; InvalidateAllWin(); }
void SetHlplVisible(bool bOn = true) { bHlplVisible=bOn; InvalidateAllWin(); }
void SetHlplFront(bool bOn = true) { bHlplFront =bOn; InvalidateAllWin(); }
- void SetGlueVisible(bool bOn = true) { if (bGlueVisible!=(unsigned)bOn) { bGlueVisible=bOn; if (!bGlueVisible2 && !bGlueVisible3 && !bGlueVisible4) GlueInvalidate(); } }
+ void SetGlueVisible(bool bOn = true) { if (bGlueVisible!=bOn) { bGlueVisible=bOn; if (!bGlueVisible2 && !bGlueVisible3 && !bGlueVisible4) GlueInvalidate(); } }
void SetGridColor( Color aColor );
sal_Bool IsPreviewRenderer() const { return (sal_Bool )mbPreviewRenderer; }
- void SetPreviewRenderer(bool bOn) { if((unsigned)bOn != mbPreviewRenderer) { mbPreviewRenderer=bOn; }}
+ void SetPreviewRenderer(bool bOn) { mbPreviewRenderer=bOn; }
// access methods for calc and sw hide object modes
bool getHideOle() const { return mbHideOle; }
diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx
index e02157457ca9..6c290cf96137 100644
--- a/include/svx/svdsnpv.hxx
+++ b/include/svx/svdsnpv.hxx
@@ -60,27 +60,27 @@ protected:
SdrCrookMode eCrookMode;
- unsigned bSnapEnab : 1;
- unsigned bGridSnap : 1;
- unsigned bSnapTo1Pix : 1; // Wenn GridSnap aus, auf ein Pixel fangen um Werte wie 10.01 zu vermeiden
- unsigned bBordSnap : 1;
- unsigned bHlplSnap : 1;
- unsigned bOFrmSnap : 1;
- unsigned bOPntSnap : 1;
- unsigned bOConSnap : 1;
- unsigned bMoveMFrmSnap : 1;
- unsigned bMoveOFrmSnap : 1;
- unsigned bMoveOPntSnap : 1;
- unsigned bMoveOConSnap : 1;
- unsigned bMoveSnapOnlyTopLeft : 1; // Speacial fuer den Dialogeditor
- unsigned bOrtho : 1;
- unsigned bBigOrtho : 1;
- unsigned bAngleSnapEnab : 1;
- unsigned bMoveOnlyDragging : 1; // Objekte nur verschieben bei Resize/Rotate/...
- unsigned bSlantButShear : 1; // Slant anstelle von Shear anwenden
- unsigned bCrookNoContortion : 1; // Objekte bei Crook nicht verzerren
- unsigned bHlplFixed : 1; // sal_True=Hilfslinien fixiert, also nicht verschiebbar
- unsigned bEliminatePolyPoints : 1;
+ bool bSnapEnab : 1;
+ bool bGridSnap : 1;
+ bool bSnapTo1Pix : 1; // Wenn GridSnap aus, auf ein Pixel fangen um Werte wie 10.01 zu vermeiden
+ bool bBordSnap : 1;
+ bool bHlplSnap : 1;
+ bool bOFrmSnap : 1;
+ bool bOPntSnap : 1;
+ bool bOConSnap : 1;
+ bool bMoveMFrmSnap : 1;
+ bool bMoveOFrmSnap : 1;
+ bool bMoveOPntSnap : 1;
+ bool bMoveOConSnap : 1;
+ bool bMoveSnapOnlyTopLeft : 1; // Speacial fuer den Dialogeditor
+ bool bOrtho : 1;
+ bool bBigOrtho : 1;
+ bool bAngleSnapEnab : 1;
+ bool bMoveOnlyDragging : 1; // Objekte nur verschieben bei Resize/Rotate/...
+ bool bSlantButShear : 1; // Slant anstelle von Shear anwenden
+ bool bCrookNoContortion : 1; // Objekte bei Crook nicht verzerren
+ bool bHlplFixed : 1; // sal_True=Hilfslinien fixiert, also nicht verschiebbar
+ bool bEliminatePolyPoints : 1;
private:
SVX_DLLPRIVATE void ClearVars();
diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx
index cc6fcb06e60f..3fe604ddf27a 100644
--- a/include/svx/svdview.hxx
+++ b/include/svx/svdview.hxx
@@ -111,20 +111,20 @@ struct SVX_DLLPUBLIC SdrViewEvent
sal_uInt16 nHlplIdx;
sal_uInt16 nGlueId;
- unsigned bMouseDown : 1;
- unsigned bMouseUp : 1;
- unsigned bDoubleHdlSize : 1; // Doppelte Handlegroesse wg. TextEdit
- unsigned bIsAction : 1; // Action ist aktiv
- unsigned bIsTextEdit : 1; // TextEdit laeuft zur Zeit
- unsigned bTextEditHit : 1; // offene OutlinerView getroffen
- unsigned bAddMark : 1;
- unsigned bUnmark : 1;
- unsigned bPrevNextMark : 1;
- unsigned bMarkPrev : 1;
- unsigned bInsPointNewObj : 1;
- unsigned bDragWithCopy : 1;
- unsigned bCaptureMouse : 1;
- unsigned bReleaseMouse : 1;
+ bool bMouseDown : 1;
+ bool bMouseUp : 1;
+ bool bDoubleHdlSize : 1; // Doppelte Handlegroesse wg. TextEdit
+ bool bIsAction : 1; // Action ist aktiv
+ bool bIsTextEdit : 1; // TextEdit laeuft zur Zeit
+ bool bTextEditHit : 1; // offene OutlinerView getroffen
+ bool bAddMark : 1;
+ bool bUnmark : 1;
+ bool bPrevNextMark : 1;
+ bool bMarkPrev : 1;
+ bool bInsPointNewObj : 1;
+ bool bDragWithCopy : 1;
+ bool bCaptureMouse : 1;
+ bool bReleaseMouse : 1;
public:
SdrViewEvent();
@@ -159,11 +159,11 @@ class SVX_DLLPUBLIC SdrView: public SdrCreateView, public tools::WeakBase< SdrVi
{
friend class SdrPageView;
- unsigned bNoExtendedMouseDispatcher : 1;
- unsigned bNoExtendedKeyDispatcher : 1;
- unsigned bNoExtendedCommandDispatcher : 1;
- unsigned bTextEditOnObjectsWithoutTextIfTextTool : 1;
- unsigned mbMasterPagePaintCaching : 1;
+ bool bNoExtendedMouseDispatcher : 1;
+ bool bNoExtendedKeyDispatcher : 1;
+ bool bNoExtendedCommandDispatcher : 1;
+ bool bTextEditOnObjectsWithoutTextIfTextTool : 1;
+ bool mbMasterPagePaintCaching : 1;
protected:
SvtAccessibilityOptions maAccessibilityOptions;