diff options
| author | Noel Grandin <noel@peralex.com> | 2014-03-10 11:09:59 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-03-11 08:18:24 +0200 |
| commit | 6c97bc47177adc1c51f69f17e77b9fe2aeade122 (patch) | |
| tree | f0ae47f9be3c2a72b3b197681ca65644bf82ecfe /include | |
| parent | d1bffe3596d21f205cb7a2697bb5142f190b5627 (diff) | |
svx: sal_Bool->bool
Change-Id: I78da39fc553b2e5040ee6665377ea51a1c4d04d7
Diffstat (limited to 'include')
45 files changed, 604 insertions, 605 deletions
diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx index e03866e16d4f..53507026f72b 100644 --- a/include/svx/cube3d.hxx +++ b/include/svx/cube3d.hxx @@ -62,7 +62,7 @@ public: E3dCubeObj(); virtual sal_uInt16 GetObjIdentifier() const; - virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; virtual E3dCubeObj* Clone() const; diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx index 7770b138ca64..02103ca1bf1c 100644 --- a/include/svx/fmview.hxx +++ b/include/svx/fmview.hxx @@ -109,7 +109,7 @@ public: // for copying complete form structures, not only control models virtual SdrModel* GetMarkedObjModel() const; using E3dView::Paste; - virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); + virtual bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); virtual sal_Bool MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin ); diff --git a/include/svx/lathe3d.hxx b/include/svx/lathe3d.hxx index ae2f2b2eb9e3..1c3dbbddeb2a 100644 --- a/include/svx/lathe3d.hxx +++ b/include/svx/lathe3d.hxx @@ -94,7 +94,7 @@ private: virtual E3dLatheObj* Clone() const; - virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; // TakeObjName...() is for the display in the UI, for example "3 frames selected". virtual OUString TakeObjNameSingul() const; diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx index 18ec02f4603d..1a59ea45fad4 100644 --- a/include/svx/obj3d.hxx +++ b/include/svx/obj3d.hxx @@ -138,7 +138,7 @@ protected: public: TYPEINFO(); virtual void RecalcSnapRect(); - virtual void SetRectsDirty(sal_Bool bNotMyself = sal_False); + virtual void SetRectsDirty(bool bNotMyself = false); virtual ~E3dObject(); diff --git a/include/svx/polygn3d.hxx b/include/svx/polygn3d.hxx index bb139374d9b0..7769a1703a08 100644 --- a/include/svx/polygn3d.hxx +++ b/include/svx/polygn3d.hxx @@ -58,7 +58,7 @@ public: const basegfx::B2DPolyPolygon& GetPolyTexture2D() const { return aPolyTexture2D; } virtual sal_uInt16 GetObjIdentifier() const; - virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; virtual E3dPolygonObj* Clone() const; diff --git a/include/svx/sphere3d.hxx b/include/svx/sphere3d.hxx index b130916b37dd..06c6147de76d 100644 --- a/include/svx/sphere3d.hxx +++ b/include/svx/sphere3d.hxx @@ -56,7 +56,7 @@ public: { return ((const Svx3DVerticalSegmentsItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_VERT_SEGS)).GetValue(); } virtual sal_uInt16 GetObjIdentifier() const; - virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; virtual E3dSphereObj* Clone() const; diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx index 92af4e19d514..728f0321a6cc 100644 --- a/include/svx/svdcrtv.hxx +++ b/include/svx/svdcrtv.hxx @@ -46,15 +46,15 @@ protected: Pointer aAktCreatePointer; - sal_Int32 nAutoCloseDistPix; - sal_Int32 nFreeHandMinDistPix; - sal_uInt32 nAktInvent; // set the current ones - sal_uInt16 nAktIdent; // Obj for re-creating + sal_Int32 nAutoCloseDistPix; + sal_Int32 nFreeHandMinDistPix; + sal_uInt32 nAktInvent; // set the current ones + sal_uInt16 nAktIdent; // Obj for re-creating - unsigned bAutoTextEdit : 1; // Textedit after we start the creation of a text frame - unsigned b1stPointAsCenter : 1; - unsigned bUseIncompatiblePathCreateInterface : 1; - unsigned bAutoClosePolys : 1; + bool bAutoTextEdit : 1; // Textedit after we start the creation of a text frame + bool b1stPointAsCenter : 1; + bool bUseIncompatiblePathCreateInterface : 1; + bool bAutoClosePolys : 1; void ImpClearConnectMarker(); @@ -62,12 +62,12 @@ private: SVX_DLLPRIVATE void ImpClearVars(); protected: - sal_Bool ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut, + bool ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut, sal_Int16 nMinMov, SdrPageView* pPV, const Rectangle& rLogRect, SdrObject* pPreparedFactoryObject); - void ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/); - void HideCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/); - sal_Bool CheckEdgeMode(); + void ShowCreateObj(/*OutputDevice* pOut, bool bFull*/); + void HideCreateObj(/*OutputDevice* pOut, bool bFull*/); + bool CheckEdgeMode(); protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView @@ -75,7 +75,7 @@ protected: virtual ~SdrCreateView(); public: - virtual sal_Bool IsAction() const; + virtual bool IsAction() const; virtual void MovAction(const Point& rPnt); virtual void EndAction(); virtual void BckAction(); @@ -89,9 +89,9 @@ public: // If the MeasureLayer is not set (empty string), then use the active layer for measuring. void SetEditMode(SdrViewEditMode eMode) { SdrDragView::SetEditMode(eMode); CheckEdgeMode(); } - void SetEditMode(sal_Bool bOn=sal_True) { SdrDragView::SetEditMode(bOn); CheckEdgeMode(); } - void SetCreateMode(sal_Bool bOn=sal_True) { SdrDragView::SetCreateMode(bOn); CheckEdgeMode(); } - void SetGluePointEditMode(sal_Bool bOn=sal_True) { SdrDragView::SetGluePointEditMode(bOn); CheckEdgeMode(); } + void SetEditMode(bool bOn=true) { SdrDragView::SetEditMode(bOn); CheckEdgeMode(); } + void SetCreateMode(bool bOn=true) { SdrDragView::SetCreateMode(bOn); CheckEdgeMode(); } + void SetGluePointEditMode(bool bOn=true) { SdrDragView::SetGluePointEditMode(bOn); CheckEdgeMode(); } // Determine whether a text tool is activated bool IsTextTool() const; @@ -108,32 +108,32 @@ public: sal_uInt16 GetCurrentObjIdentifier() const { return nAktIdent; } // Beginning the regular Create - sal_Bool BegCreateObj(const Point& rPnt, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL); - sal_Bool BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov, SdrObject* pPreparedFactoryObject); + bool BegCreateObj(const Point& rPnt, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL); + bool BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov, SdrObject* pPreparedFactoryObject); void MovCreateObj(const Point& rPnt); - sal_Bool EndCreateObj(SdrCreateCmd eCmd); + bool EndCreateObj(SdrCreateCmd eCmd); void BckCreateObj(); // go back one polygon point void BrkCreateObj(); - sal_Bool IsCreateObj() const { return pAktCreate!=NULL; } + bool IsCreateObj() const { return pAktCreate!=NULL; } SdrObject* GetCreateObj() const { return pAktCreate; } // BegCreateCaptionObj() creates a SdrCaptionObj (legend item). // rObjSiz is the initial size of the legend text frame. // Only the length of the tip is dragged - sal_Bool BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL); + bool BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL); // If TextEditAfterCreate is sal_True (the default), // then after the creation of a TextFrame object (OBJ_TEXT, // OBJ_TEXTEXT, OBJ_OUTLINERTEXT, OBJ_TITLETEXT, OBJ_CAPTION) // automatically start a TextEdit (SdrObjEditView: SdrBeginTextEdit) - sal_Bool IsTextEditAfterCreate() const { return bAutoTextEdit; } - void SetTextEditAfterCreate(sal_Bool bOn) { bAutoTextEdit = bOn; } + bool IsTextEditAfterCreate() const { return bAutoTextEdit; } + void SetTextEditAfterCreate(bool bOn) { bAutoTextEdit = bOn; } // Create a circle/rectangle/text frame with the first Point being // the center of the object instead of the upper-left corner. // Persistent flag. Default = FALSE. - sal_Bool IsCreate1stPointAsCenter() const { return b1stPointAsCenter; } - void SetCreate1stPointAsCenter(sal_Bool bOn) { b1stPointAsCenter = bOn; } + bool IsCreate1stPointAsCenter() const { return b1stPointAsCenter; } + void SetCreate1stPointAsCenter(bool bOn) { b1stPointAsCenter = bOn; } // For polylines (OBJ_PLIN) and freehand lines (OBJ_FREELINE). If this // Flag is sal_True, these two types of objects are implicitly closed, and @@ -141,8 +141,8 @@ public: // the distance between the start point and end point of the // Object <= nAutoCloseDistPix pixels. // Default = TRUE. - sal_Bool IsAutoClosePolys() const { return bAutoClosePolys; } - void SetAutoClosePolys(sal_Bool bOn) { bAutoClosePolys=bOn; } + bool IsAutoClosePolys() const { return bAutoClosePolys; } + void SetAutoClosePolys(bool bOn) { bAutoClosePolys=bOn; } // Default = 5 Pixel sal_uInt16 GetAutoCloseDistPix() const { return sal_uInt16(nAutoCloseDistPix); } @@ -162,18 +162,18 @@ public: // This flag should be regarded as temporary. The affected applications should // be changed soon. // Default = sal_False; - sal_Bool IsUseIncompatiblePathCreateInterface() const { return bUseIncompatiblePathCreateInterface; } - void SetUseIncompatiblePathCreateInterface(sal_Bool bOn) { bUseIncompatiblePathCreateInterface = bOn; } + bool IsUseIncompatiblePathCreateInterface() const { return bUseIncompatiblePathCreateInterface; } + void SetUseIncompatiblePathCreateInterface(bool bOn) { bUseIncompatiblePathCreateInterface = bOn; } void SetConnectMarker(const SdrObjConnection& rCon, const SdrPageView& rPV); void HideConnectMarker(); // Attributes of the object that is in the process of being created /* new interface src537 */ - sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const; + bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr=false) const; - sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll); - SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const; - sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr); + bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll); + SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(bool& rOk) const; + bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr); }; #endif // INCLUDED_SVX_SVDCRTV_HXX diff --git a/include/svx/svddrgv.hxx b/include/svx/svddrgv.hxx index f7f0bc5786dd..4dfbf79a3f2e 100644 --- a/include/svx/svddrgv.hxx +++ b/include/svx/svddrgv.hxx @@ -71,7 +71,7 @@ protected: virtual void SetMarkHandles(); void ShowDragObj(); void HideDragObj(); - sal_Bool ImpBegInsObjPoint(sal_Bool bIdxZwang, sal_uInt32 nIdx, const Point& rPnt, sal_Bool bNewObj, OutputDevice* pOut); + bool ImpBegInsObjPoint(bool bIdxZwang, sal_uInt32 nIdx, const Point& rPnt, bool bNewObj, OutputDevice* pOut); protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView @@ -79,7 +79,7 @@ protected: virtual ~SdrDragView(); public: - virtual sal_Bool IsAction() const; + virtual bool IsAction() const; virtual void MovAction(const Point& rPnt); virtual void EndAction(); virtual void BckAction(); @@ -96,68 +96,68 @@ public: // Bei Returncode sal_False konnte ich die Position nicht bestimmen // (z.B. Punktverschiebung, Mehrfachselektion, Schieben der // Spiegelschse, ...) - sal_Bool TakeDragObjAnchorPos(Point& rPos, sal_Bool bTopRight = sal_False ) const; + bool TakeDragObjAnchorPos(Point& rPos, bool bTopRight = false ) const; // Wird pForcedMeth uebergeben, so wird pHdl, ... nicht ausgewerten, sondern diese // Drag-Methode verwendet. Die Instanz geht dabei ins Eigentum der View ueber und // wird zum Ende des Draggings destruiert. - virtual sal_Bool BegDragObj(const Point& rPnt, OutputDevice* pOut=NULL, SdrHdl* pHdl=NULL, short nMinMov=-3, SdrDragMethod* pForcedMeth=NULL); + virtual bool BegDragObj(const Point& rPnt, OutputDevice* pOut=NULL, SdrHdl* pHdl=NULL, short nMinMov=-3, SdrDragMethod* pForcedMeth=NULL); void MovDragObj(const Point& rPnt); - sal_Bool EndDragObj(sal_Bool bCopy=sal_False); + bool EndDragObj(bool bCopy=false); void BrkDragObj(); - sal_Bool IsDragObj() const { return mpCurrentSdrDragMethod && !bInsPolyPoint && !bInsGluePoint; } + bool IsDragObj() const { return mpCurrentSdrDragMethod && !bInsPolyPoint && !bInsGluePoint; } SdrHdl* GetDragHdl() const { return pDragHdl; } SdrDragMethod* GetDragMethod() const { return mpCurrentSdrDragMethod; } - sal_Bool IsDraggingPoints() const { return eDragHdl==HDL_POLY; } - sal_Bool IsDraggingGluePoints() const { return eDragHdl==HDL_GLUE; } + bool IsDraggingPoints() const { return eDragHdl==HDL_POLY; } + bool IsDraggingGluePoints() const { return eDragHdl==HDL_GLUE; } // Wer das beim BegDrag oder mittendrin schon festlegen will. // (Wird bei jedem BegDrag auf sal_False zurueckgesetzt, also nach // BegDrag setzen.) - void SetDragWithCopy(sal_Bool bOn) { bDragWithCopy = bOn; } - sal_Bool IsDragWithCopy() const { return bDragWithCopy; } + void SetDragWithCopy(bool bOn) { bDragWithCopy = bOn; } + bool IsDragWithCopy() const { return bDragWithCopy; } - void SetInsertGluePoint(sal_Bool bOn) { bInsGluePoint = bOn; } - sal_Bool IsInsertGluePoint() const { return bInsGluePoint; } + void SetInsertGluePoint(bool bOn) { bInsGluePoint = bOn; } + bool IsInsertGluePoint() const { return bInsGluePoint; } // Interaktives einfuegen eines neuen Punktes. nIdx=0 => vor dem ersten Punkt. bool IsInsObjPointPossible() const; - sal_Bool BegInsObjPoint(const Point& rPnt, sal_Bool bNewObj) { return ImpBegInsObjPoint(sal_False, 0L, rPnt, bNewObj, 0L); } + bool BegInsObjPoint(const Point& rPnt, bool bNewObj) { return ImpBegInsObjPoint(false, 0L, rPnt, bNewObj, 0L); } void MovInsObjPoint(const Point& rPnt) { MovDragObj(rPnt); } - sal_Bool EndInsObjPoint(SdrCreateCmd eCmd); + bool EndInsObjPoint(SdrCreateCmd eCmd); void BrkInsObjPoint() { BrkDragObj(); } - sal_Bool IsInsObjPoint() const { return mpCurrentSdrDragMethod && bInsPolyPoint; } + bool IsInsObjPoint() const { return mpCurrentSdrDragMethod && bInsPolyPoint; } // Fuer die App zum Verwalten des Status. GetPreferredPointer() wird // spaeter vielleicht einen passenden Pointer dafuer liefern - void SetInsObjPointMode(sal_Bool bOn) { bInsObjPointMode = bOn; } - sal_Bool IsInsObjPointMode() const { return bInsObjPointMode; } + void SetInsObjPointMode(bool bOn) { bInsObjPointMode = bOn; } + bool IsInsObjPointMode() const { return bInsObjPointMode; } - sal_Bool IsInsGluePointPossible() const; - sal_Bool BegInsGluePoint(const Point& rPnt); + bool IsInsGluePointPossible() const; + bool BegInsGluePoint(const Point& rPnt); void MovInsGluePoint(const Point& rPnt) { MovDragObj(rPnt); } - sal_Bool EndInsGluePoint() { return EndDragObj(); } + bool EndInsGluePoint() { return EndDragObj(); } void BrkInsGluePoint() { BrkDragObj(); } - sal_Bool IsInsGluePoint() const { return mpCurrentSdrDragMethod && bInsGluePoint; } + bool IsInsGluePoint() const { return mpCurrentSdrDragMethod && bInsGluePoint; } // Fuer die App zum Verwalten des Status. GetPreferredPointer() wird // spaeter vielleicht einen passenden Pointer dafuer liefern - void SetInsGluePointMode(sal_Bool bOn) { bInsGluePointMode = bOn; } - sal_Bool IsInsGluePointMode() const { return bInsGluePointMode; } + void SetInsGluePointMode(bool bOn) { bInsGluePointMode = bOn; } + bool IsInsGluePointMode() const { return bInsGluePointMode; } // Begrenzungslinien ueber's gesamte Win waehrend des Draggens // Persistent. Default=FALSE. - void SetDragStripes(sal_Bool bOn); - sal_Bool IsDragStripes() const { return bDragStripes; } + void SetDragStripes(bool bOn); + bool IsDragStripes() const { return bDragStripes; } // Handles waehrend des Draggens verstecken - //HMHvoid SetDragHdlHide(sal_Bool bOn); + //HMHvoid SetDragHdlHide(bool bOn); //HMHBOOL IsDragHdlHide() const { return bNoDragHdl; } // Beim Draggen von Polygonpunkten und Klebepunkten // die Maus verstecken. Default=FALSE - void SetMouseHideWhileDraggingPoints(sal_Bool bOn) { bMouseHideWhileDraggingPoints = bOn; } - sal_Bool IsMouseHideWhileDraggingPoints() const { return bMouseHideWhileDraggingPoints; } + void SetMouseHideWhileDraggingPoints(bool bOn) { bMouseHideWhileDraggingPoints = bOn; } + bool IsMouseHideWhileDraggingPoints() const { return bMouseHideWhileDraggingPoints; } // Beim Draggen werden i.d.R. die Konturen der markierten Objekte // als Xor-Polygone dargestellt. Wird dieses Flag hier gesetzt, @@ -166,8 +166,8 @@ public: // hat diese Einstellung keine Auswirkung. // Auch waerend des Draggens umschaltbar. // Default=Off - void SetNoDragXorPolys(sal_Bool bOn); - sal_Bool IsNoDragXorPolys() const { return bNoDragXorPolys; } + void SetNoDragXorPolys(bool bOn); + bool IsNoDragXorPolys() const { return bNoDragXorPolys; } // Uebersteigt die Anzahl der markierten Objekte den hier eingestellten // Wert, wird implizit (temporaer) auf NoDragPolys geschaltet. @@ -190,13 +190,13 @@ public: // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Verbinder an Objektscheitelpunkte ankleben // Default=sal_True=Ja - void SetAutoVertexConnectors(sal_Bool bOn) { bAutoVertexCon = bOn; } - sal_Bool IsAutoVertexConnectors() const { return bAutoVertexCon; } + void SetAutoVertexConnectors(bool bOn) { bAutoVertexCon = bOn; } + bool IsAutoVertexConnectors() const { return bAutoVertexCon; } // Verbinder an Objektecken ankleben // Default=sal_False=Nein - void SetAutoCornerConnectors(sal_Bool bOn) { bAutoCornerCon = bOn; } - sal_Bool IsAutoCornerConnectors() const { return bAutoCornerCon; } + void SetAutoCornerConnectors(bool bOn) { bAutoCornerCon = bOn; } + bool IsAutoCornerConnectors() const { return bAutoCornerCon; } // Dragging von verbundenen Objekten (Nodes): // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -205,7 +205,7 @@ public: // Gummibaender sondern komplette Neuberechnunen sind beim Draggen sichtbar. // Diese detalierte Darstellung ist eh nur beim MoveDrag moeglich. // Defaultwert ist 10 - sal_Bool IsDetailedEdgeDragging() const { return bDetailedEdgeDragging; } + bool IsDetailedEdgeDragging() const { return bDetailedEdgeDragging; } sal_uInt16 GetDetailedEdgeDraggingLimit() const { return nDetailedEdgeDraggingLimit; } @@ -214,7 +214,7 @@ public: // Gemeint sind hier die "Gummibaender", die weniger Rechenzeit benoetigen // als die kompletten Neuberechnungen beim DetailedEdgeDragging. // Defaultwert ist 100 - sal_Bool IsRubberEdgeDragging() const { return bRubberEdgeDragging; } + bool IsRubberEdgeDragging() const { return bRubberEdgeDragging; } // Verbinderhandling also zu deutsch wie folgt (bei Defaulteinstellungen): // - Sind bis max 10 Verbinder betroffen werden diese bei jedem @@ -230,25 +230,25 @@ public: // markierte Objekt immer ein Moven ein, unabhaengig vom gesetzten DragMode. // Dieses Flag ist persistent und sollte von der App fuer den Anwender // konfigurierbar sein! - void SetMarkedHitMovesAlways(sal_Bool bOn) { bMarkedHitMovesAlways = bOn; } - sal_Bool IsMarkedHitMovesAlways() const { return bMarkedHitMovesAlways; } + void SetMarkedHitMovesAlways(bool bOn) { bMarkedHitMovesAlways = bOn; } + bool IsMarkedHitMovesAlways() const { return bMarkedHitMovesAlways; } // Beim Draggen der Spiegelachse das Spiegelbild der markierten Objekte // als Xor darstellen? Persistent. Noch nicht implementiert. Default TRUE. - void SetMirrRefDragObj(sal_Bool bOn) { bMirrRefDragObj = bOn; } - sal_Bool IsMirrRefDragObj() const { return bMirrRefDragObj; } + void SetMirrRefDragObj(bool bOn) { bMirrRefDragObj = bOn; } + bool IsMirrRefDragObj() const { return bMirrRefDragObj; } - sal_Bool IsOrthoDesired() const; + bool IsOrthoDesired() const; // Beim Resize die Mitte als Referenz // Default=FALSE. - sal_Bool IsResizeAtCenter() const { return bResizeAtCenter; } - void SetResizeAtCenter(sal_Bool bOn) { bResizeAtCenter = bOn; } + bool IsResizeAtCenter() const { return bResizeAtCenter; } + void SetResizeAtCenter(bool bOn) { bResizeAtCenter = bOn; } // Symmetrisches Crook // Default=FALSE. - sal_Bool IsCrookAtCenter() const { return bCrookAtCenter; } - void SetCrookAtCenter(sal_Bool bOn) { bCrookAtCenter = bOn; } + bool IsCrookAtCenter() const { return bCrookAtCenter; } + void SetCrookAtCenter(bool bOn) { bCrookAtCenter = bOn; } // Begrenzung des Arbeitsbereichs. Die Begrenzung bezieht sich auf die // View, nicht auf die einzelnen PageViews. Von der View wird diese @@ -276,7 +276,7 @@ public: // Rundungsfehler auftreten koennen, wodurch das LimitRect minnimal // ueberschritten werden koennte... // Implementiert fuer Move und Resize. - virtual sal_Bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const; + virtual bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const; }; #endif // INCLUDED_SVX_SVDDRGV_HXX diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index 376c78d3a0c9..1331498c0b6c 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -119,12 +119,12 @@ protected: void ImpBroadcastEdgesOfMarkedNodes(); // Konvertierung der markierten Objekte in Poly bzw. Bezier. - void ImpConvertTo(sal_Bool bPath, sal_Bool bLineToArea); + void ImpConvertTo(bool bPath, bool bLineToArea); // Konvertiert ein Obj, wirft bei Erfolg das alte as seiner Liste und // fuegt das neue an dessen Position ein. Inkl Undo. Es wird weder ein // MarkEntry noch ein ModelChgBroadcast generiert. - SdrObject* ImpConvertOneObj(SdrObject* pObj, sal_Bool bPath, sal_Bool bLineToArea); + SdrObject* ImpConvertOneObj(SdrObject* pObj, bool bPath, bool bLineToArea); // Setzen der beiden Flags bToTopPossible und bToBtmPossible. // bToTopPossibleDirty und bToBtmPossibleDirty werden dabei gleichzeitig @@ -135,20 +135,20 @@ protected: void ImpCopyAttributes(const SdrObject* pSource, SdrObject* pDest) const; // fuer CombineMarkedObjects - sal_Bool ImpCanConvertForCombine1(const SdrObject* pObj) const; - sal_Bool ImpCanConvertForCombine(const SdrObject* pObj) const; - basegfx::B2DPolyPolygon ImpGetPolyPolygon1(const SdrObject* pObj, sal_Bool bCombine) const; - basegfx::B2DPolyPolygon ImpGetPolyPolygon(const SdrObject* pObj, sal_Bool bCombine) const; + bool ImpCanConvertForCombine1(const SdrObject* pObj) const; + bool ImpCanConvertForCombine(const SdrObject* pObj) const; + basegfx::B2DPolyPolygon ImpGetPolyPolygon1(const SdrObject* pObj, bool bCombine) const; + basegfx::B2DPolyPolygon ImpGetPolyPolygon(const SdrObject* pObj, bool bCombine) const; basegfx::B2DPolygon ImpCombineToSinglePolygon(const basegfx::B2DPolyPolygon& rPolyPolygon) const; // fuer DismantleMarkedObjects - sal_Bool ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPpolygon, sal_Bool bMakeLines) const; - sal_Bool ImpCanDismantle(const SdrObject* pObj, sal_Bool bMakeLines) const; - void ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, sal_uIntPtr& rPos, SdrPageView* pPV, sal_Bool bMakeLines); + bool ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPpolygon, bool bMakeLines) const; + bool ImpCanDismantle(const SdrObject* pObj, bool bMakeLines) const; + void ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, sal_uIntPtr& rPos, SdrPageView* pPV, bool bMakeLines); void ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRad, SdrCrookMode eMode, - sal_Bool bVertical, sal_Bool bNoContortion, sal_Bool bRotate, const Rectangle& rMarkRect); - void ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, sal_Bool bNoContortion); - sal_Bool ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const; + bool bVertical, bool bNoContortion, bool bRotate, const Rectangle& rMarkRect); + void ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion); + bool ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const; void ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID); // Entfernt alle Obj der MarkList aus ihren ObjLists inkl Undo. @@ -201,24 +201,24 @@ public: void ForceMarkedObjToAnotherPage(); void ForceMarkedToAnotherPage() { ForceMarkedObjToAnotherPage(); } - sal_Bool IsReadOnly() const { ForcePossibilities(); return bReadOnly; } + bool IsReadOnly() const { ForcePossibilities(); return bReadOnly; } // Loeschen aller markierten Objekte void DeleteMarkedObj(); - sal_Bool IsDeleteMarkedObjPossible() const { ForcePossibilities(); return bDeletePossible; } + bool IsDeleteMarkedObjPossible() const { ForcePossibilities(); return bDeletePossible; } // Logisch- umschliessendes Rect aller markierten Objekte setzen. // Das das wirklich geschieht ist nicht garantiert, denn eine // waagerechte Linie hat z.B. immer eine Hoehe von 0. - void SetMarkedObjRect(const Rectangle& rRect, sal_Bool bCopy=sal_False); + void SetMarkedObjRect(const Rectangle& rRect, bool bCopy=false); void MoveMarkedObj(const Size& rSiz, bool bCopy=false); void ResizeMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false); void ResizeMultMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, const bool bCopy, const bool bWdh, const bool bHgt); long GetMarkedObjRotate() const; void RotateMarkedObj(const Point& rRef, long nWink, bool bCopy=false); void MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool bCopy=false); - void MirrorMarkedObjHorizontal(sal_Bool bCopy=sal_False); - void MirrorMarkedObjVertical(sal_Bool bCopy=sal_False); + void MirrorMarkedObjHorizontal(bool bCopy=false); + void MirrorMarkedObjVertical(bool bCopy=false); long GetMarkedObjShear() const; void ShearMarkedObj(const Point& rRef, long nWink, bool bVShear=false, bool bCopy=false); void CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookMode eMode, bool bVertical=false, bool bNoContortion=false, bool bCopy=false); @@ -226,28 +226,28 @@ public: // Markierte Objekte kopieren und anstelle der alten markieren void CopyMarkedObj(); - void SetAllMarkedRect(const Rectangle& rRect, sal_Bool bCopy=sal_False) { SetMarkedObjRect(rRect,bCopy); } - void MoveAllMarked(const Size& rSiz, sal_Bool bCopy=sal_False) { MoveMarkedObj (rSiz,bCopy); } - void ResizeAllMarked(const Point& rRef, const Fraction& xFact, const Fraction& yFact, sal_Bool bCopy=sal_False) { ResizeMarkedObj (rRef,xFact,yFact,bCopy); } + void SetAllMarkedRect(const Rectangle& rRect, bool bCopy=false) { SetMarkedObjRect(rRect,bCopy); } + void MoveAllMarked(const Size& rSiz, bool bCopy=false) { MoveMarkedObj (rSiz,bCopy); } + void ResizeAllMarked(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false) { ResizeMarkedObj (rRef,xFact,yFact,bCopy); } long GetAllMarkedRotate() const { return GetMarkedObjRotate(); } - void RotateAllMarked(const Point& rRef, long nWink, sal_Bool bCopy=sal_False) { RotateMarkedObj(rRef,nWink,bCopy); } - void MirrorAllMarked(const Point& rRef1, const Point& rRef2, sal_Bool bCopy=sal_False) { MirrorMarkedObj(rRef1,rRef2,bCopy); } - void MirrorAllMarkedHorizontal(sal_Bool bCopy=sal_False) { MirrorMarkedObjHorizontal(bCopy); } - void MirrorAllMarkedVertical(sal_Bool bCopy=sal_False) { MirrorMarkedObjVertical(bCopy); } + void RotateAllMarked(const Point& rRef, long nWink, bool bCopy=false) { RotateMarkedObj(rRef,nWink,bCopy); } + void MirrorAllMarked(const Point& rRef1, const Point& rRef2, bool bCopy=false) { MirrorMarkedObj(rRef1,rRef2,bCopy); } + void MirrorAllMarkedHorizontal(bool bCopy=false) { MirrorMarkedObjHorizontal(bCopy); } + void MirrorAllMarkedVertical(bool bCopy=false) { MirrorMarkedObjVertical(bCopy); } long GetAllMarkedShear() const { return GetMarkedObjShear(); } - void ShearAllMarked(const Point& rRef, long nWink, sal_Bool bVShear=sal_False, sal_Bool bCopy=sal_False) { ShearMarkedObj(rRef,nWink,bVShear,bCopy); } - void CrookAllMarked(const Point& rRef, const Point& rRad, SdrCrookMode eMode, sal_Bool bVertical=sal_False, sal_Bool bNoContortion=sal_False, sal_Bool bCopy=sal_False) { CrookMarkedObj(rRef,rRad,eMode,bVertical,bNoContortion,bCopy); } + void ShearAllMarked(const Point& rRef, long nWink, bool bVShear=false, bool bCopy=false) { ShearMarkedObj(rRef,nWink,bVShear,bCopy); } + void CrookAllMarked(const Point& rRef, const Point& rRad, SdrCrookMode eMode, bool bVertical=false, bool bNoContortion=false, bool bCopy=false) { CrookMarkedObj(rRef,rRad,eMode,bVertical,bNoContortion,bCopy); } void CopyMarked() { CopyMarkedObj(); } - sal_Bool IsMoveAllowed() const { ForcePossibilities(); return bMoveAllowed && !bMoveProtect; } - sal_Bool IsResizeAllowed(sal_Bool bProp=sal_False) const; - sal_Bool IsRotateAllowed(sal_Bool b90Deg=sal_False) const; - sal_Bool IsMirrorAllowed(sal_Bool b45Deg=sal_False, sal_Bool b90Deg=sal_False) const; - sal_Bool IsTransparenceAllowed() const; - sal_Bool IsGradientAllowed() const; - sal_Bool IsShearAllowed() const; - sal_Bool IsEdgeRadiusAllowed() const; - sal_Bool IsCrookAllowed(sal_Bool bNoContortion=sal_False) const; - sal_Bool IsDistortAllowed(sal_Bool bNoContortion=sal_False) const; + bool IsMoveAllowed() const { ForcePossibilities(); return bMoveAllowed && !bMoveProtect; } + bool IsResizeAllowed(bool bProp=false) const; + bool IsRotateAllowed(bool b90Deg=false) const; + bool IsMirrorAllowed(bool b45Deg=false, bool b90Deg=false) const; + bool IsTransparenceAllowed() const; + bool IsGradientAllowed() const; + bool IsShearAllowed() const; + bool IsEdgeRadiusAllowed() const; + bool IsCrookAllowed(bool bNoContortion=false) const; + bool IsDistortAllowed(bool bNoContortion=false) const; // Vereinigen mehrerer Objekte zu einem PolyPolygon: // - Rechtecke/Kreise/Text... werden implizit gewandelt. @@ -259,7 +259,7 @@ public: // eine Bitmap oder ein OLE-Objekt, wird die gesamte Gruppe nicht // beruecksichtigt. // bNoPolyPoly=TRUE: Alles wird zu einem einzigen Polygon zusammengefasst - void CombineMarkedObjects(sal_Bool bNoPolyPoly = sal_True); + void CombineMarkedObjects(bool bNoPolyPoly = true); // for combining multiple polygons, with direct support of the modes // SID_POLY_MERGE, SID_POLY_SUBSTRACT, SID_POLY_INTERSECT @@ -273,9 +273,9 @@ public: // Memberobjekten um PathObjs handelt. // bMakeLines=TRUE: alle Polygone werden in einzelne Linien bzw. // Beziersegmente zerlegt - void DismantleMarkedObjects(sal_Bool bMakeLines=sal_False); - sal_Bool IsCombinePossible(sal_Bool bNoPolyPoly=sal_False) const; - sal_Bool IsDismantlePossible(sal_Bool bMakeLines=sal_False) const; + void DismantleMarkedObjects(bool bMakeLines=false); + bool IsCombinePossible(bool bNoPolyPoly=false) const; + bool IsDismantlePossible(bool bMakeLines=false) const; // Ein neues bereits fertig konstruiertes Obj einfuegen. Das Obj gehoert // anschliessend dem Model. Nach dem Einfuegen wird das neue Objekt @@ -284,7 +284,7 @@ public: // wenn der Ziel-Layer gesperrt oder nicht sichtbar ist. In diesem Fall // returniert die Methode mit FALSE. // Die Methode generiert u.a. auch eine Undo-Action. - sal_Bool InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, sal_uIntPtr nOptions=0); + bool InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, sal_uIntPtr nOptions=0); // Ein Zeichenobjekt durch ein neues ersetzen. *pNewObj gehoert // anschliessend mir, *pOldObj wandert ins Undo. @@ -294,13 +294,13 @@ public: // ReplaceObject(...); // EndUndo(); - void ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, sal_Bool bMark=sal_True); + void ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, bool bMark=true); - void SetNotPersistAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll); - void MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const; - void MergeAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const; - SfxItemSet GetAttrFromMarked(sal_Bool bOnlyHardAttr) const; - void SetAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll); + void SetNotPersistAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll); + void MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, bool bOnlyHardAttr) const; + void MergeAttrFromMarked(SfxItemSet& rAttr, bool bOnlyHardAttr) const; + SfxItemSet GetAttrFromMarked(bool bOnlyHardAttr) const; + void SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll); // Geometrische Attribute (Position, Groesse, Drehwinkel) // Bei der Position wird ein evtl. gesetzter PageOrigin beruecksichtigt. @@ -315,14 +315,14 @@ public: SfxStyleSheet* GetStyleSheetFromMarked() const; // z.Zt. noch ohne Undo :( - void SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr); + void SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr); /* new interface src537 */ - sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const; + bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const; - sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll); - SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const; - sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr); + bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll); + SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(bool& rOk) const; + bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr); // Alle markierten Objekte zu einer Gruppe zusammenfassen. // Anschliessend wird die neue Gruppe markiert. Bei einer @@ -340,25 +340,25 @@ public: // zusaetzlich markiert. void UnGroupMarked(); - sal_Bool IsGroupPossible() const { ForcePossibilities(); return bGroupPossible; } - sal_Bool IsUnGroupPossible() const { ForcePossibilities(); return bUnGroupPossible; } - sal_Bool IsGroupEnterPossible() const { ForcePossibilities(); return bGrpEnterPossible; } + bool IsGroupPossible() const { ForcePossibilities(); return bGroupPossible; } + bool IsUnGroupPossible() const { ForcePossibilities(); return bUnGroupPossible; } + bool IsGroupEnterPossible() const { ForcePossibilities(); return bGrpEnterPossible; } - // Markierte Objekte in Polygone/Bezierkurven verwandeln. Die sal_Bool- + // Markierte Objekte in Polygone/Bezierkurven verwandeln. Die bool- // Funktionen returnen sal_True, wenn wenigstens eins der markierten // Objekte gewandelt werden kann. Memberobjekte von Gruppenobjekten // werden ebenfalls gewandelt. Naehere Beschreibung siehe SdrObj.HXX. - sal_Bool IsConvertToPathObjPossible(sal_Bool bLineToArea) const { ForcePossibilities(); return sal_Bool(bLineToArea ? bCanConvToPathLineToArea : bCanConvToPath); } - sal_Bool IsConvertToPolyObjPossible(sal_Bool bLineToArea) const { ForcePossibilities(); return sal_Bool(bLineToArea ? bCanConvToPolyLineToArea : bCanConvToPoly); } - sal_Bool IsConvertToContourPossible() const { ForcePossibilities(); return bCanConvToContour; } - void ConvertMarkedToPathObj(sal_Bool bLineToArea); - void ConvertMarkedToPolyObj(sal_Bool bLineToArea); + bool IsConvertToPathObjPossible(bool bLineToArea) const { ForcePossibilities(); return bLineToArea ? bCanConvToPathLineToArea : bCanConvToPath; } + bool IsConvertToPolyObjPossible(bool bLineToArea) const { ForcePossibilities(); return bLineToArea ? bCanConvToPolyLineToArea : bCanConvToPoly; } + bool IsConvertToContourPossible() const { ForcePossibilities(); return bCanConvToContour; } + void ConvertMarkedToPathObj(bool bLineToArea); + void ConvertMarkedToPolyObj(bool bLineToArea); // Alle markierten Objekte untereinander ausrichten. Normalerweise werden // das SnapRect der Obj verwendet. Ist bBoundRects=sal_True, werden stattdessen // die BoundRects ausgerichtet. - void AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, sal_Bool bBoundRects=sal_False); - sal_Bool IsAlignPossible() const; + void AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, bool bBoundRects=false); + bool IsAlignPossible() const; // Markierte Objekte etwas nach "oben" holen void MovMarkedToTop(); @@ -389,9 +389,9 @@ public: // sal_True liefert, MovMarkedToTop() jedoch nichts aendert (z.B. bei // Mehrfachselektion), weil eine von der abgeleiteten View ueber // GetMaxToTopObj() auferlegte Restriktion dies verhindert. - sal_Bool IsToTopPossible() const { ForcePossibilities(); return bToTopPossible; } - sal_Bool IsToBtmPossible() const { ForcePossibilities(); return bToBtmPossible; } - sal_Bool IsReverseOrderPossible() const { ForcePossibilities(); return bReverseOrderPossible; } + bool IsToTopPossible() const { ForcePossibilities(); return bToTopPossible; } + bool IsToBtmPossible() const { ForcePossibilities(); return bToBtmPossible; } + bool IsReverseOrderPossible() const { ForcePossibilities(); return bReverseOrderPossible; } // Ueber diese Methoden stellt die View fest, wie weit ein Objekt // nach vorn bzw. nach hinten gestellt werden darf (Z-Order). Das @@ -410,14 +410,14 @@ public: // liefern, konvertiert diese Methode das Metafile in Drawingobjekte. // Die SdrGrafObjs/SdrOle2Objs werden dann durch die neue Objekte ersetzt. void DoImportMarkedMtf(SvdProgressInfo *pProgrInfo=NULL); - sal_Bool IsImportMtfPossible() const { ForcePossibilities(); return bImportMtfPossible; } + bool IsImportMtfPossible() const { ForcePossibilities(); return bImportMtfPossible; } // Wird der Modus VirtualObjectBundling eingeschaltet, werden beim // ToTop/ToBtm virtuelle Objekte die dasselbe Objekt referenzieren // in ihrer Z-Order buendig zusammengehalten (Writer). // Defaulteinstellung ist sal_False=ausgeschaltet. - void SetVirtualObjectBundling(sal_Bool bOn) { bBundleVirtObj=bOn; } - sal_Bool IsVirtualObjectBundling() const { return bBundleVirtObj; } + void SetVirtualObjectBundling(bool bOn) { bBundleVirtObj=bOn; } + bool IsVirtualObjectBundling() const { return bBundleVirtObj; } // von der SdrMarkView ueberladen fuer den internen gebrauch virtual void MarkListHasChanged(); diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index 2fbbe6c6ff1f..c01b34f8de3f 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -112,7 +112,7 @@ protected: // Feststellen, ob der gesamte Text markiert ist. Liefert auch sal_True wenn // kein Text vorhanden ist. - sal_Bool ImpIsTextEditAllSelected() const; + bool ImpIsTextEditAllSelected() const; void ImpMakeTextCursorAreaVisible(); // Handler fuer AutoGrowing Text bei aktivem Outliner @@ -140,7 +140,7 @@ public: void TextEditDrawing(SdrPaintWindow& rPaintWindow) const; // Actionhandling fuer Macromodus - virtual sal_Bool IsAction() const; + virtual bool IsAction() const; virtual void MovAction(const Point& rPnt); virtual void EndAction(); virtual void BrkAction(); @@ -155,8 +155,8 @@ public: // QuickTextEditMode bedeutet, dass Objekte mit Text sofort beim Anklicken // editiert werden sollen. Default=TRUE. Persistent. - void SetQuickTextEditMode(sal_Bool bOn) { bQuickTextEditMode=bOn; } - sal_Bool IsQuickTextEditMode() const { return bQuickTextEditMode; } + void SetQuickTextEditMode(bool bOn) { bQuickTextEditMode=bOn; } + bool IsQuickTextEditMode() const { return bQuickTextEditMode; } // Starten des TextEditMode. Ist pWin==NULL, wird das erste an der View // angemeldete Win verwendet. @@ -172,29 +172,29 @@ public: // dieser Instanz und ausserdem auch den StatusEventHdl. // Ebenso kann eine spezifische OutlinerView vorgegeben werden. - virtual sal_Bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, ::Window* pWin = 0L, sal_Bool bIsNewObj = sal_False, + virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, ::Window* pWin = 0L, bool bIsNewObj = false, SdrOutliner* pGivenOutliner = 0L, OutlinerView* pGivenOutlinerView = 0L, - sal_Bool bDontDeleteOutliner = sal_False, sal_Bool bOnlyOneView = sal_False, sal_Bool bGrabFocus = sal_True); + bool bDontDeleteOutliner = false, bool bOnlyOneView = false, bool bGrabFocus = true); // bDontDeleteReally ist ein Spezialparameter fuer den Writer. // Ist dieses Flag gesetzt, dann wird ein evtl. leeres Textobjekt // nicht geloescht. Stattdessen gibt es dann einen Returncode // SDRENDTEXTEDIT_SHOULDBEDELETED (anstelle von SDRENDTEXTEDIT_BEDELETED) // der besagt, dass das Objekt geloescht werden sollte. - virtual SdrEndTextEditKind SdrEndTextEdit(sal_Bool bDontDeleteReally = sal_False); + virtual SdrEndTextEditKind SdrEndTextEdit(bool bDontDeleteReally = false); virtual bool IsTextEdit() const; // Diese Methode liefert sal_True, wenn der Punkt rHit innerhalb der // des Objektbereichs oder der OutlinerView liegt. - sal_Bool IsTextEditHit(const Point& rHit, short nTol) const; + bool IsTextEditHit(const Point& rHit, short nTol) const; // Diese Methode liefert sal_True, wenn der Punkt rHit innerhalb des // Handle-dicken Rahmens liegt, der die OutlinerView bei TextFrames // umschliesst. - sal_Bool IsTextEditFrameHit(const Point& rHit) const; + bool IsTextEditFrameHit(const Point& rHit) const; // Bei aktiver Selektion, also zwischen MouseButtonDown und // MouseButtonUp liefert diese Methode immer TRUE. - sal_Bool IsTextEditInSelectionMode() const; + bool IsTextEditInSelectionMode() const; // Wer das z.Zt. im TextEdit befindliche Objekt braucht: SdrObject* GetTextEditObject() const { return mxTextEditObj.get(); } @@ -224,11 +224,11 @@ public: virtual sal_uInt16 GetScriptType() const; /* new interface src537 */ - sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const; + bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr=false) const; - sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll); - SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const; - sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr); + bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll); + SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(bool& rOk) const; + bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr); // Intern: Beim Splitteraufziehen neue OutlinerView... virtual void AddWindowToPaintView(OutputDevice* pNewWin); @@ -243,15 +243,15 @@ public: // Persistent. Default TRUE. SvDraw wertet das Flag u.a. bei // SdrView::GetPreferredPointer() aus. Hat nur Wirkung, wenn das Dokument // Draw-Objekte mit Macrofunktionalitaet hat (SdrObject::HasMacro()==sal_True). - void SetMacroMode(sal_Bool bOn) { bMacroMode=bOn; } - sal_Bool IsMacroMode() const { return bMacroMode; } - sal_Bool BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin); - sal_Bool BegMacroObj(const Point& rPnt, SdrObject* pObj, SdrPageView* pPV, Window* pWin) { return BegMacroObj(rPnt,-2,pObj,pPV,pWin); } + void SetMacroMode(bool bOn) { bMacroMode=bOn; } + bool IsMacroMode() const { return bMacroMode; } + bool BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin); + bool BegMacroObj(const Point& rPnt, SdrObject* pObj, SdrPageView* pPV, Window* pWin) { return BegMacroObj(rPnt,-2,pObj,pPV,pWin); } void MovMacroObj(const Point& rPnt); void BrkMacroObj(); - sal_Bool EndMacroObj(); - sal_Bool IsMacroObj() const { return pMacroObj!=NULL; } - sal_Bool IsMacroObjDown() const { return bMacroDown; } + bool EndMacroObj(); + bool IsMacroObj() const { return pMacroObj!=NULL; } + bool IsMacroObjDown() const { return bMacroDown; } /** fills the given any with a XTextCursor for the current text selection. Leaves the any untouched if there currently is no text selected */ diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx index 54e4346f2a88..918205e36fc6 100644 --- a/include/svx/svdetc.hxx +++ b/include/svx/svdetc.hxx @@ -29,7 +29,7 @@ // ExchangeFormat-Id der DrawingEngine holen. Daten koennen dann per -// static sal_Bool CopyData(pData,nLen,nFormat); +// static bool CopyData(pData,nLen,nFormat); // bereitgestellt werden, wobei pData/nLen einen SvMemoryStream beschreiben in // dem ein SdrModel gestreamt wird an dem fuer die Zeitdauer des Streamens das // Flag SdrModel::SetStreamingSdrModel(sal_True) gesetzt wird. @@ -112,7 +112,7 @@ SVX_DLLPUBLIC bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol); // Ein ItemSet auf Outliner- bzw. EditEngine-Items durchsuchen // Liefert sal_True, wenn der Set solchen Items enthaelt. -sal_Bool SearchOutlinerItems(const SfxItemSet& rSet, sal_Bool bInklDefaults, sal_Bool* pbOnlyEE=NULL); +bool SearchOutlinerItems(const SfxItemSet& rSet, bool bInklDefaults, bool* pbOnlyEE=NULL); // zurueck erhaelt man einen neuen WhichTable den // man dann irgendwann mit delete platthauen muss. @@ -148,13 +148,13 @@ public: void Init( sal_uIntPtr _nSumActionCount, sal_uIntPtr _nObjCount ); - sal_Bool SetNextObject(); + bool SetNextObject(); void SetActionCount( sal_uIntPtr _nActionCount ); void SetInsertCount( sal_uIntPtr _nInsertCount ); - sal_Bool ReportActions( sal_uIntPtr nAnzActions ); - sal_Bool ReportInserts( sal_uIntPtr nAnzInserts ); + bool ReportActions( sal_uIntPtr nAnzActions ); + bool ReportInserts( sal_uIntPtr nAnzInserts ); sal_uIntPtr GetSumActionCount() const { return nSumActionCount; }; sal_uIntPtr GetSumCurAction() const { return nSumCurAction; }; @@ -167,7 +167,7 @@ public: sal_uIntPtr GetInsertCount() const { return nInsertCount; }; sal_uIntPtr GetCurInsert() const { return nCurInsert; }; - sal_Bool ReportRescales( sal_uIntPtr nAnzRescales ); + bool ReportRescales( sal_uIntPtr nAnzRescales ); }; @@ -201,7 +201,7 @@ class OLEObjCache : public std::vector<SdrOle2Obj*> AutoTimer* pTimer; void UnloadOnDemand(); - sal_Bool UnloadObj( SdrOle2Obj* pObj ); + bool UnloadObj( SdrOle2Obj* pObj ); DECL_LINK( UnloadCheckHdl, AutoTimer* ); public: diff --git a/include/svx/svdglev.hxx b/include/svx/svdglev.hxx index 8576da69e678..8a9e420815a2 100644 --- a/include/svx/svdglev.hxx +++ b/include/svx/svdglev.hxx @@ -37,7 +37,7 @@ class SVX_DLLPUBLIC SdrGlueEditView: public SdrPolyEditView void ImpCopyMarkedGluePoints(); typedef void (*PGlueDoFunc)(SdrGluePoint&, const SdrObject* pObj, const void*, const void*, const void*, const void*, const void*); typedef void (*PGlueTrFunc)(Point&, const void*, const void*, const void*, const void*, const void*); - void ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, sal_Bool bConst, const void* p1=NULL, const void* p2=NULL, const void* p3=NULL, const void* p4=NULL, const void* p5=NULL); + void ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, const void* p1=NULL, const void* p2=NULL, const void* p3=NULL, const void* p4=NULL, const void* p5=NULL); void ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1=NULL, const void* p2=NULL, const void* p3=NULL, const void* p4=NULL, const void* p5=NULL); protected: @@ -51,14 +51,14 @@ public: // Moegliche Werte fuer nThisEsc sind z.Zt. // SDRESC_LEFT, SDRESC_RIGHT, SDRESC_TOP und SDRESC_BOTTOM TRISTATE IsMarkedGluePointsEscDir(sal_uInt16 nThisEsc) const; - void SetMarkedGluePointsEscDir(sal_uInt16 nThisEsc, sal_Bool bOn); - sal_Bool IsSetMarkedGluePointsEscDirPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); } + void SetMarkedGluePointsEscDir(sal_uInt16 nThisEsc, bool bOn); + bool IsSetMarkedGluePointsEscDirPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); } // Checken/setzen, ob die Klebepunktpositionen relativ zur // Objektgroesse sind (Percent=sal_True) oder nicht (Percent=sal_False) TRISTATE IsMarkedGluePointsPercent() const; - void SetMarkedGluePointsPercent(sal_Bool bOn); - sal_Bool IsSetMarkedGluePointsPercentPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); } + void SetMarkedGluePointsPercent(bool bOn); + bool IsSetMarkedGluePointsPercentPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); } // bVert=FALSE: Horizontales Alignment checken/setzen // SDRHORZALIGN_CENTER @@ -70,9 +70,9 @@ public: // SDRVERTALIGN_TOP // SDRVERTALIGN_BOTTOM // SDRVERTALIGN_DONTCARE (nur bei Get()) - sal_uInt16 GetMarkedGluePointsAlign(sal_Bool bVert) const; - void SetMarkedGluePointsAlign(sal_Bool bVert, sal_uInt16 nAlign); - sal_Bool IsSetMarkedGluePointsAlignPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); } + sal_uInt16 GetMarkedGluePointsAlign(bool bVert) const; + void SetMarkedGluePointsAlign(bool bVert, sal_uInt16 nAlign); + bool IsSetMarkedGluePointsAlignPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); } // Alle merkierten Klebepunkte entfernen void DeleteMarkedGluePoints(); @@ -80,12 +80,12 @@ public: void MoveMarkedGluePoints (const Size& rSiz, bool bCopy=false); void ResizeMarkedGluePoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false); void RotateMarkedGluePoints(const Point& rRef, long nWink, bool bCopy=false); - void MirrorMarkedGluePoints(const Point& rRef1, const Point& rRef2, sal_Bool bCopy=sal_False); - void MirrorMarkedGluePointsHorizontal(sal_Bool bCopy=sal_False); - void MirrorMarkedGluePointsVertical(sal_Bool bCopy=sal_False); - void ShearMarkedGluePoints(const Point& rRef, long nWink, sal_Bool bVShear=sal_False, sal_Bool bCopy=sal_False); - void CrookMarkedGluePoints(const Point& rRef, const Point& rRad, SdrCrookMode eMode, sal_Bool bVertical=sal_False, sal_Bool bNoContortion=sal_False, sal_Bool bCopy=sal_False); - void DistortMarkedGluePoints(const Rectangle& rRef, const XPolygon& rDistortedRect, sal_Bool bNoContortion=sal_False, sal_Bool bCopy=sal_False); + void MirrorMarkedGluePoints(const Point& rRef1, const Point& rRef2, bool bCopy=false); + void MirrorMarkedGluePointsHorizontal(bool bCopy=false); + void MirrorMarkedGluePointsVertical(bool bCopy=false); + void ShearMarkedGluePoints(const Point& rRef, long nWink, bool bVShear=false, bool bCopy=false); + void CrookMarkedGluePoints(const Point& rRef, const Point& rRad, SdrCrookMode eMode, bool bVertical=false, bool bNoContortion=false, bool bCopy=false); + void DistortMarkedGluePoints(const Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion=false, bool bCopy=false); void AlignMarkedGluePoints(SdrHorAlign eHor, SdrVertAlign eVert); }; diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index fd7cdf65c1dd..fcb9587f10d4 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -162,9 +162,9 @@ protected: sal_uInt32 nPPntNum; // Punktnummer des Polygons sal_uInt32 nSourceHdlNum; // ist noch vollstaendig zu implementieren - unsigned bSelect : 1; // Ein selektierter Polygonpunkt? - unsigned b1PixMore : 1; // True=Handle wird 1 Pixel groesser dargestellt - unsigned bPlusHdl : 1; // u.a. fuer Hld-Paint Optimierung bei MarkPoint/UnmarkPoint, ... + bool bSelect : 1; // Ein selektierter Polygonpunkt? + bool b1PixMore : 1; // True=Handle wird 1 Pixel groesser dargestellt + bool bPlusHdl : 1; // u.a. fuer Hld-Paint Optimierung bei MarkPoint/UnmarkPoint, ... bool mbMoveOutside; // forces this handle to be moved outside of the selection rectangle @@ -203,14 +203,14 @@ public: SdrObject* GetObj() const { return pObj; } void SetObj(SdrObject* pNewObj); - sal_Bool IsSelected() const { return bSelect; } - void SetSelected(sal_Bool bJa=sal_True); + bool IsSelected() const { return bSelect; } + void SetSelected(bool bJa=true); - void Set1PixMore(sal_Bool bJa=sal_True); + void Set1PixMore(bool bJa=true); void SetDrehWink(long n); - sal_Bool IsCornerHdl() const { return eKind==HDL_UPLFT || eKind==HDL_UPRGT || eKind==HDL_LWLFT || eKind==HDL_LWRGT; } - sal_Bool IsVertexHdl() const { return eKind==HDL_UPPER || eKind==HDL_LOWER || eKind==HDL_LEFT || eKind==HDL_RIGHT; } + bool IsCornerHdl() const { return eKind==HDL_UPLFT || eKind==HDL_UPRGT || eKind==HDL_LWLFT || eKind==HDL_LWRGT; } + bool IsVertexHdl() const { return eKind==HDL_UPPER || eKind==HDL_LOWER || eKind==HDL_LEFT || eKind==HDL_RIGHT; } void SetObjHdlNum(sal_uInt32 nNum) { nObjHdlNum=nNum; } sal_uInt32 GetObjHdlNum() const { return nObjHdlNum; } @@ -221,8 +221,8 @@ public: void SetPointNum(sal_uInt32 nNum) { nPPntNum=nNum; } sal_uInt32 GetPointNum() const { return nPPntNum; } - void SetPlusHdl(sal_Bool bOn) { bPlusHdl=bOn; } - sal_Bool IsPlusHdl() const { return bPlusHdl; } + void SetPlusHdl(bool bOn) { bPlusHdl=bOn; } + bool IsPlusHdl() const { return bPlusHdl; } void SetSourceHdlNum(sal_uInt32 nNum) { nSourceHdlNum=nNum; } sal_uInt32 GetSourceHdlNum() const { return nSourceHdlNum; } @@ -231,7 +231,7 @@ public: bool IsHdlHit(const Point& rPnt) const; // #97016# II - virtual sal_Bool IsFocusHdl() const; + virtual bool IsFocusHdl() const; void SetMoveOutside( bool bMoveOutside ); @@ -264,7 +264,7 @@ private: Link aColorChangeHdl; // use luminance values only - unsigned bUseLuminance : 1; + bool bUseLuminance : 1; // create marker for this kind SVX_DLLPRIVATE virtual void CreateB2dIAObject(); @@ -275,13 +275,13 @@ private: SVX_DLLPRIVATE void CallColorChangeLink(); public: - explicit SdrHdlColor(const Point& rRef, Color aCol = Color(COL_BLACK), const Size& rSize = Size(11, 11), sal_Bool bLum = sal_False); + explicit SdrHdlColor(const Point& rRef, Color aCol = Color(COL_BLACK), const Size& rSize = Size(11, 11), bool bLum = false); virtual ~SdrHdlColor(); - sal_Bool IsUseLuminance() const { return bUseLuminance; } + bool IsUseLuminance() const { return bUseLuminance; } Color GetColor() const { return aMarkerColor; } - void SetColor(Color aNew, sal_Bool bCallLink = sal_False); + void SetColor(Color aNew, bool bCallLink = false); const Size& GetSize() const { return aMarkerSize; } void SetSize(const Size& rNew); @@ -303,7 +303,7 @@ private: Point a2ndPos; // is this a gradient or a transparence - unsigned bGradient : 1; + bool bGradient : 1; // select which handle to move bool bMoveSingleHandle : 1; @@ -313,10 +313,10 @@ private: virtual void CreateB2dIAObject(); public: - SdrHdlGradient(const Point& rRef1, const Point& rRef2, sal_Bool bGrad = sal_True); + SdrHdlGradient(const Point& rRef1, const Point& rRef2, bool bGrad = true); virtual ~SdrHdlGradient(); - sal_Bool IsGradient() const { return bGradient; } + bool IsGradient() const { return bGradient; } // set the associated color handles void SetColorHandles(SdrHdlColor* pL1, SdrHdlColor* pL2) { pColHdl1 = pL1; pColHdl2 = pL2; } @@ -330,7 +330,7 @@ public: DECL_LINK(ColorChangeHdl, SdrHdl*); // transformation call, create gradient from this handle - void FromIAOToItem(SdrObject* pObj, sal_Bool bSetItemOnObject, sal_Bool bUndo); + void FromIAOToItem(SdrObject* pObj, bool bSetItemOnObject, bool bUndo); // selection flags for interaction bool IsMoveSingleHandle() const { return bMoveSingleHandle; } @@ -403,7 +403,7 @@ public: void SetLineCode(SdrEdgeLineCode eCode); SdrEdgeLineCode GetLineCode() const { return eLineCode; } - sal_Bool IsHorzDrag() const; + bool IsHorzDrag() const; virtual Pointer GetPointer() const; }; @@ -446,15 +446,15 @@ protected: std::deque<SdrHdl*> aList; sal_uInt16 nHdlSize; - unsigned bRotateShear : 1; - unsigned bDistortShear : 1; - unsigned bMoveOutside : 1; // Handles nach aussen ruecken (fuer TextEdit) + bool bRotateShear : 1; + bool bDistortShear : 1; + bool bMoveOutside : 1; // Handles nach aussen ruecken (fuer TextEdit) private: SVX_DLLPRIVATE SdrHdlList(const SdrHdlList&): aList() {} SVX_DLLPRIVATE void operator=(const SdrHdlList&) {} - SVX_DLLPRIVATE sal_Bool operator==(const SdrHdlList&) const { return sal_False; } - SVX_DLLPRIVATE sal_Bool operator!=(const SdrHdlList&) const { return sal_False; } + SVX_DLLPRIVATE bool operator==(const SdrHdlList&) const { return false; } + SVX_DLLPRIVATE bool operator!=(const SdrHdlList&) const { return false; } public: explicit SdrHdlList(SdrMarkView* pV); @@ -462,7 +462,7 @@ public: void Clear(); // #97016# II - void TravelFocusHdl(sal_Bool bForward); + void TravelFocusHdl(bool bForward); SdrHdl* GetFocusHdl() const; void SetFocusHdl(SdrHdl* pNew); void ResetFocusHdl(); @@ -479,22 +479,22 @@ public: sal_uIntPtr GetHdlNum(const SdrHdl* pHdl) const; void SetHdlSize(sal_uInt16 nSiz); sal_uInt16 GetHdlSize() const { return nHdlSize; } - void SetMoveOutside(sal_Bool bOn); - sal_Bool IsMoveOutside() const { return bMoveOutside; } - void SetRotateShear(sal_Bool bOn); - sal_Bool IsRotateShear() const { return bRotateShear; } - void SetDistortShear(sal_Bool bOn); - sal_Bool IsDistortShear() const { return bDistortShear; } + void SetMoveOutside(bool bOn); + bool IsMoveOutside() const { return bMoveOutside; } + void SetRotateShear(bool bOn); + bool IsRotateShear() const { return bRotateShear; } + void SetDistortShear(bool bOn); + bool IsDistortShear() const { return bDistortShear; } // AddHdl uebernimmt das Handle in sein Eigentum. Es muss // also auf dem Heap stehen, da Clear() ein delete macht. - void AddHdl(SdrHdl* pHdl, sal_Bool bAtBegin=sal_False); + void AddHdl(SdrHdl* pHdl, bool bAtBegin=false); SdrHdl* RemoveHdl(sal_uIntPtr nNum); void RemoveAllByKind(SdrHdlKind eKind); // Zuletzt eingefuegte Handles werden am ehesten getroffen // (wenn Handles uebereinander liegen). - SdrHdl* IsHdlListHit(const Point& rPnt, sal_Bool bBack=sal_False, sal_Bool bNext=sal_False, SdrHdl* pHdl0=NULL) const; + SdrHdl* IsHdlListHit(const Point& rPnt, bool bBack=false, bool bNext=false, SdrHdl* pHdl0=NULL) const; SdrHdl* GetHdl(SdrHdlKind eKind1) const; }; diff --git a/include/svx/svdhlpln.hxx b/include/svx/svdhlpln.hxx index 4a23d575da01..f5b31fa7fa9a 100644 --- a/include/svx/svdhlpln.hxx +++ b/include/svx/svdhlpln.hxx @@ -41,7 +41,7 @@ class SdrHelpLine { // #i27493# // Helper method to draw a hor or ver two-colored dashed line void ImpDrawDashedTwoColorLine(OutputDevice& rOut, sal_Int32 nStart, sal_Int32 nEnd, sal_Int32 nFixPos, - sal_Int32 nStepWidth, Color aColA, Color aColB, sal_Bool bHorizontal) const; + sal_Int32 nStepWidth, Color aColA, Color aColB, bool bHorizontal) const; public: explicit SdrHelpLine(SdrHelpLineKind eNewKind=SDRHELPLINE_POINT): eKind(eNewKind) {} diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx index fc9417d572fd..15d8735b593c 100644 --- a/include/svx/svdmark.hxx +++ b/include/svx/svdmark.hxx @@ -46,8 +46,8 @@ protected: SdrUShortCont* mpPoints; // Selected Points SdrUShortCont* mpLines; // Selected Line SdrUShortCont* mpGluePoints; // Selected Gluepoints (their Id's) - sal_Bool mbCon1; // for Connectors - sal_Bool mbCon2; // for Connectors + bool mbCon1; // for Connectors + bool mbCon2; // for Connectors sal_uInt16 mnUser; // E.g. for CopyObjects, also copy Edges public: @@ -59,8 +59,8 @@ public: virtual void ObjectInDestruction(const SdrObject& rObject); SdrMark& operator=(const SdrMark& rMark); - sal_Bool operator==(const SdrMark& rMark) const; - sal_Bool operator!=(const SdrMark& rMark) const + bool operator==(const SdrMark& rMark) const; + bool operator!=(const SdrMark& rMark) const { return !(operator==(rMark)); } @@ -78,22 +78,22 @@ public: mpPageView = pNewPageView; } - void SetCon1(sal_Bool bOn) + void SetCon1(bool bOn) { mbCon1 = bOn; } - sal_Bool IsCon1() const + bool IsCon1() const { return mbCon1; } - void SetCon2(sal_Bool bOn) + void SetCon2(bool bOn) { mbCon2 = bOn; } - sal_Bool IsCon2() const + bool IsCon2() const { return mbCon2; } @@ -172,25 +172,25 @@ protected: OUString maPointName; OUString maGluePointName; - sal_Bool mbPointNameOk; - sal_Bool mbGluePointNameOk; - sal_Bool mbNameOk; - sal_Bool mbSorted; + bool mbPointNameOk; + bool mbGluePointNameOk; + bool mbNameOk; + bool mbSorted; private: - SVX_DLLPRIVATE sal_Bool operator==(const SdrMarkList& rCmpMarkList) const; + SVX_DLLPRIVATE bool operator==(const SdrMarkList& rCmpMarkList) const; SVX_DLLPRIVATE void ImpForceSort(); private: - SVX_DLLPRIVATE const OUString& GetPointMarkDescription(sal_Bool bGlue) const; + SVX_DLLPRIVATE const OUString& GetPointMarkDescription(bool bGlue) const; public: SdrMarkList() : maList(), - mbPointNameOk(sal_False), - mbGluePointNameOk(sal_False), - mbNameOk(sal_False), - mbSorted(sal_True) + mbPointNameOk(false), + mbGluePointNameOk(false), + mbNameOk(false), + mbSorted(true) { } @@ -209,7 +209,7 @@ public: void ForceSort() const; void SetUnsorted() { - mbSorted = sal_False; + mbSorted = false; } sal_uLong GetMarkCount() const @@ -219,18 +219,18 @@ public: SdrMark* GetMark(sal_uLong nNum) const; sal_uLong FindObject(const SdrObject* pObj) const; - void InsertEntry(const SdrMark& rMark, sal_Bool bChkSort = sal_True); + void InsertEntry(const SdrMark& rMark, bool bChkSort = true); void DeleteMark(sal_uLong nNum); void ReplaceMark(const SdrMark& rNewMark, sal_uLong nNum); - void Merge(const SdrMarkList& rSrcList, sal_Bool bReverse = sal_False); - sal_Bool DeletePageView(const SdrPageView& rPV); - sal_Bool InsertPageView(const SdrPageView& rPV); + void Merge(const SdrMarkList& rSrcList, bool bReverse = false); + bool DeletePageView(const SdrPageView& rPV); + bool InsertPageView(const SdrPageView& rPV); void SetNameDirty() { - mbNameOk = sal_False; - mbPointNameOk = sal_False; - mbGluePointNameOk = sal_False; + mbNameOk = false; + mbPointNameOk = false; + mbGluePointNameOk = false; } // A verbal description of selected objects e.g.: @@ -238,17 +238,17 @@ public: const OUString& GetMarkDescription() const; const OUString& GetPointMarkDescription() const { - return GetPointMarkDescription(sal_False); + return GetPointMarkDescription(false); } const OUString& GetGluePointMarkDescription() const { - return GetPointMarkDescription(sal_True); + return GetPointMarkDescription(true); } // pPage=0L: Selection of everything! Respect Pages - sal_Bool TakeBoundRect(SdrPageView* pPageView, Rectangle& rRect) const; - sal_Bool TakeSnapRect(SdrPageView* pPageView, Rectangle& rRect) const; + bool TakeBoundRect(SdrPageView* pPageView, Rectangle& rRect) const; + bool TakeSnapRect(SdrPageView* pPageView, Rectangle& rRect) const; // Es werden saemtliche Entries kopiert! void operator=(const SdrMarkList& rLst); @@ -267,7 +267,7 @@ namespace sdr std::vector<SdrObject*> maAllMarkedObjects; // bitfield - unsigned mbEdgesOfMarkedNodesDirty : 1; + bool mbEdgesOfMarkedNodesDirty : 1; SVX_DLLPRIVATE void ImpForceEdgesOfMarkedNodes(); SVX_DLLPRIVATE void ImplCollectCompleteSelection(SdrObject* pObj); diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 16603fbf2764..524c86c37b9c 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -265,7 +265,7 @@ private: SVX_DLLPRIVATE bool operator==(const SdrModel& rCmpModel) const; SVX_DLLPRIVATE void ImpPostUndoAction(SdrUndoAction* pUndo); SVX_DLLPRIVATE void ImpSetUIUnit(); - SVX_DLLPRIVATE void ImpSetOutlinerDefaults( SdrOutliner* pOutliner, sal_Bool bInit = sal_False ); + SVX_DLLPRIVATE void ImpSetOutlinerDefaults( SdrOutliner* pOutliner, bool bInit = false ); SVX_DLLPRIVATE void ImpReformatAllTextObjects(); SVX_DLLPRIVATE void ImpReformatAllEdgeObjects(); // #103122# SVX_DLLPRIVATE void ImpCreateTables(); @@ -291,12 +291,11 @@ public: // Zeichenobjekte verwenden moechte. Setzt man degegen nur vom abstrakten // Basisobjekt SdrObject abgeleitete Objekte ein, so ist man frei in der // Wahl des Pools. - explicit SdrModel(SfxItemPool* pPool=NULL, ::comphelper::IEmbeddedHelper* pPers=NULL, sal_Bool bLoadRefCounts = LOADREFCOUNTS); - explicit SdrModel(const OUString& rPath, SfxItemPool* pPool=NULL, ::comphelper::IEmbeddedHelper* pPers=NULL, sal_Bool bLoadRefCounts = LOADREFCOUNTS); - SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS); - SdrModel(const OUString& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS); + explicit SdrModel(); + explicit SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, bool bLoadRefCounts); + explicit SdrModel(const OUString& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, bool bLoadRefCounts); virtual ~SdrModel(); - void ClearModel(sal_Bool bCalledFromDestructor); + void ClearModel(bool bCalledFromDestructor); // Hier kann man erfragen, ob das Model gerade eingrstreamt wird bool IsLoading() const { return false /*BFS01 bLoading */; } @@ -620,8 +619,8 @@ public: SfxStyleSheetBasePool* GetStyleSheetPool() const { return mxStyleSheetPool.get(); } void SetStyleSheetPool(SfxStyleSheetBasePool* pPool) { mxStyleSheetPool=pPool; } - void SetStarDrawPreviewMode(sal_Bool bPreview); - sal_Bool IsStarDrawPreviewMode() { return bStarDrawPreviewMode; } + void SetStarDrawPreviewMode(bool bPreview); + bool IsStarDrawPreviewMode() { return bStarDrawPreviewMode; } bool GetDisableTextEditUsesCommonUndoManager() const { return mbDisableTextEditUsesCommonUndoManager; } void SetDisableTextEditUsesCommonUndoManager(bool bNew) { mbDisableTextEditUsesCommonUndoManager = bNew; } @@ -640,18 +639,18 @@ public: void SetCharCompressType( sal_uInt16 nType ); sal_uInt16 GetCharCompressType() const { return mnCharCompressType; } - void SetKernAsianPunctuation( sal_Bool bEnabled ); - sal_Bool IsKernAsianPunctuation() const { return (sal_Bool)mbKernAsianPunctuation; } + void SetKernAsianPunctuation( bool bEnabled ); + bool IsKernAsianPunctuation() const { return mbKernAsianPunctuation; } - void SetAddExtLeading( sal_Bool bEnabled ); - sal_Bool IsAddExtLeading() const { return (sal_Bool)mbAddExtLeading; } + void SetAddExtLeading( bool bEnabled ); + bool IsAddExtLeading() const { return mbAddExtLeading; } void ReformatAllTextObjects(); SdrOutliner* createOutliner( sal_uInt16 nOutlinerMode ); void disposeOutliner( SdrOutliner* pOutliner ); - sal_Bool IsWriter() const { return !bMyPool; } + bool IsWriter() const { return !bMyPool; } /** returns the numbering type that is used to format page fields in drawing shapes */ virtual SvxNumType GetPageNumType() const; @@ -702,7 +701,7 @@ typedef tools::WeakReference< SdrModel > SdrModelWeakRef; +---+---+ +---+---+ +----+----+ +----+----+ +-----+------+ +------+-----+ |SdrObj | |SdrObj | |SdrLayer | |SdrLayer | |SdrLayerSet | |SdrLayerSet | +-------+ +-------+ +---------+ +---------+ +------------+ +------------+ -This class: SdrModel is the head of the data modells for the StarView Drawing Engine. +This class: SdrModel is the head of the data models for the StarView Drawing Engine. ///////////////////////////////////////////////////////////////////////////////////////////////// */ diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index 5dd5f9177f7c..d6832923dfd8 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -159,15 +159,15 @@ protected: virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay) const; virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const; virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj,const SdrMarkList * pMarkList) const; - sal_Bool ImpIsFrameHandles() const; + bool ImpIsFrameHandles() const; void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal=0, sal_uInt16 nOpt=0) const; // Generates a string including degrees symbol, from an angel specification in 1/100deg - sal_Bool ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark); - virtual sal_Bool MarkPoints(const Rectangle* pRect, sal_Bool bUnmark); - sal_Bool MarkGluePoints(const Rectangle* pRect, sal_Bool bUnmark); + bool ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark); + virtual bool MarkPoints(const Rectangle* pRect, bool bUnmark); + bool MarkGluePoints(const Rectangle* pRect, bool bUnmark); - void SetMoveOutside(sal_Bool bOn); + void SetMoveOutside(bool bOn); protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView @@ -175,7 +175,7 @@ protected: virtual ~SdrMarkView(); public: - virtual sal_Bool IsAction() const; + virtual bool IsAction() const; virtual void MovAction(const Point& rPnt); virtual void EndAction(); virtual void BckAction(); @@ -184,27 +184,27 @@ public: virtual void ClearPageView(); virtual void HideSdrPage(); - virtual sal_Bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const; + virtual bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const; // Returns sal_True if objects, points or glue points are selected by drawing a frame // (as long as the frame is drawn). - sal_Bool IsMarking() const { return IsMarkObj() || IsMarkPoints() || IsMarkGluePoints(); } + bool IsMarking() const { return IsMarkObj() || IsMarkPoints() || IsMarkGluePoints(); } // Marking objects by drawing of a selection frame - sal_Bool BegMarkObj(const Point& rPnt, sal_Bool bUnmark = sal_False); + bool BegMarkObj(const Point& rPnt, bool bUnmark = false); void MovMarkObj(const Point& rPnt); - sal_Bool EndMarkObj(); + bool EndMarkObj(); void BrkMarkObj(); - sal_Bool IsMarkObj() const { return (0L != mpMarkObjOverlay); } + bool IsMarkObj() const { return (0L != mpMarkObjOverlay); } // DragModes: SDRDRAG_CREATE,SDRDRAG_MOVE,SDRDRAG_RESIZE,SDRDRAG_ROTATE,SDRDRAG_MIRROR,SDRDRAG_SHEAR,SDRDRAG_CROOK // Move==Resize // The interface might maybe be changed in the future because of Ortho-Drag void SetDragMode(SdrDragMode eMode); SdrDragMode GetDragMode() const { return eDragMode; } - sal_Bool ChkDragMode(SdrDragMode eMode) const; + bool ChkDragMode(SdrDragMode eMode) const; void SetFrameHandles(bool bOn); - sal_Bool IsFrameHandles() const { return bForceFrameHandles; } + bool IsFrameHandles() const { return bForceFrameHandles; } sal_uIntPtr GetMarkableObjCount() const; @@ -215,20 +215,20 @@ public: void SetEditMode(SdrViewEditMode eMode); SdrViewEditMode GetEditMode() const { return eEditMode; } - void SetEditMode(sal_Bool bOn=sal_True) { SetEditMode(bOn?SDREDITMODE_EDIT:SDREDITMODE_CREATE); } - sal_Bool IsEditMode() const { return eEditMode==SDREDITMODE_EDIT; } - void SetCreateMode(sal_Bool bOn=sal_True) { SetEditMode(bOn?SDREDITMODE_CREATE:SDREDITMODE_EDIT); } - sal_Bool IsCreateMode() const { return eEditMode==SDREDITMODE_CREATE; } - void SetGluePointEditMode(sal_Bool bOn=sal_True) { SetEditMode(bOn?SDREDITMODE_GLUEPOINTEDIT:eEditMode0); } - sal_Bool IsGluePointEditMode() const { return eEditMode==SDREDITMODE_GLUEPOINTEDIT; } + void SetEditMode(bool bOn=true) { SetEditMode(bOn?SDREDITMODE_EDIT:SDREDITMODE_CREATE); } + bool IsEditMode() const { return eEditMode==SDREDITMODE_EDIT; } + void SetCreateMode(bool bOn=true) { SetEditMode(bOn?SDREDITMODE_CREATE:SDREDITMODE_EDIT); } + bool IsCreateMode() const { return eEditMode==SDREDITMODE_CREATE; } + void SetGluePointEditMode(bool bOn=true) { SetEditMode(bOn?SDREDITMODE_GLUEPOINTEDIT:eEditMode0); } + bool IsGluePointEditMode() const { return eEditMode==SDREDITMODE_GLUEPOINTEDIT; } void SetDesignMode(bool bOn = true); - sal_Bool IsDesignMode() const { return bDesignMode; } + bool IsDesignMode() const { return bDesignMode; } - void SetFrameDragSingles(sal_Bool bOn=sal_True) { SetFrameHandles(bOn); } - sal_Bool IsFrameDragSingles() const { return IsFrameHandles(); } + void SetFrameDragSingles(bool bOn=true) { SetFrameHandles(bOn); } + bool IsFrameDragSingles() const { return IsFrameHandles(); } - sal_Bool HasMarkableObj() const; + bool HasMarkableObj() const; // migrate selections @@ -247,12 +247,12 @@ public: SdrObject* GetMarkedObjectByIndex(sal_uIntPtr nNum) const { return (GetMarkedObjectList().GetMark(nNum))->GetMarkedSdrObj(); } sal_uIntPtr GetMarkedObjectCount() const { return GetMarkedObjectList().GetMarkCount(); } void SortMarkedObjects() const { GetMarkedObjectList().ForceSort(); } - sal_Bool AreObjectsMarked() const { return (0L != GetMarkedObjectList().GetMarkCount()); } + bool AreObjectsMarked() const { return (0L != GetMarkedObjectList().GetMarkCount()); } OUString GetDescriptionOfMarkedObjects() const { return GetMarkedObjectList().GetMarkDescription(); } OUString GetDescriptionOfMarkedPoints() const { return GetMarkedObjectList().GetPointMarkDescription(); } OUString GetDescriptionOfMarkedGluePoints() const { return GetMarkedObjectList().GetGluePointMarkDescription(); } - sal_Bool GetBoundRectFromMarkedObjects(SdrPageView* pPageView, Rectangle& rRect) const { return GetMarkedObjectList().TakeBoundRect(pPageView, rRect); } - sal_Bool GetSnapRectFromMarkedObjects(SdrPageView* pPageView, Rectangle& rRect) const { return GetMarkedObjectList().TakeSnapRect(pPageView, rRect); } + bool GetBoundRectFromMarkedObjects(SdrPageView* pPageView, Rectangle& rRect) const { return GetMarkedObjectList().TakeBoundRect(pPageView, rRect); } + bool GetSnapRectFromMarkedObjects(SdrPageView* pPageView, Rectangle& rRect) const { return GetMarkedObjectList().TakeSnapRect(pPageView, rRect); } // Get a list of all those links which are connected to marked nodes, // but which are not marked themselves. @@ -269,8 +269,8 @@ public: void showMarkHandles(); bool areMarkHandlesHidden() const { return mbMarkHandlesHidden; } - sal_Bool IsMarkedHit(const Point& rPnt, short nTol=-2) const { return IsMarkedObjHit(rPnt,nTol); } - sal_Bool IsMarkedObjHit(const Point& rPnt, short nTol=-2) const; + bool IsMarkedHit(const Point& rPnt, short nTol=-2) const { return IsMarkedObjHit(rPnt,nTol); } + bool IsMarkedObjHit(const Point& rPnt, short nTol=-2) const; // Pick: Supported options for nOptions are SEARCH_NEXT, SEARCH_BACKWARD (ni) SdrHdl* PickHandle(const Point& rPnt, sal_uIntPtr nOptions=0, SdrHdl* pHdl0=NULL) const; @@ -279,37 +279,37 @@ public: // SDRSEARCH_DEEP SDRSEARCH_ALSOONMASTER SDRSEARCH_TESTMARKABLE SDRSEARCH_TESTTEXTEDIT // SDRSEARCH_WITHTEXT SDRSEARCH_TESTTEXTAREA SDRSEARCH_BACKWARD SDRSEARCH_MARKED // SDRSEARCH_WHOLEPAGE - virtual sal_Bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions, SdrObject** ppRootObj, sal_uIntPtr* pnMarkNum=NULL, sal_uInt16* pnPassNum=NULL) const; - virtual sal_Bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const; - // sal_Bool PickObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const { return PickObj(rPnt,nHitTolLog,rpObj,rpPV,nOptions); } - sal_Bool MarkObj(const Point& rPnt, short nTol=-2, sal_Bool bToggle=sal_False, sal_Bool bDeep=sal_False); + virtual bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions, SdrObject** ppRootObj, sal_uIntPtr* pnMarkNum=NULL, sal_uInt16* pnPassNum=NULL) const; + virtual bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const; + // bool PickObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const { return PickObj(rPnt,nHitTolLog,rpObj,rpPV,nOptions); } + bool MarkObj(const Point& rPnt, short nTol=-2, bool bToggle=false, bool bDeep=false); // Pick: Supported options for nOptions are SDRSEARCH_PASS2BOUND und SDRSEARCH_PASS3NEAREST - sal_Bool PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr* pnMarkNum=NULL, sal_uIntPtr nOptions=0) const; + bool PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr* pnMarkNum=NULL, sal_uIntPtr nOptions=0) const; // Selects the most upper of the marked objects (O1) and scans from there // towards bottom direction, selecting the first non-marked object (O2). // In case of success the marking of O1 is deleted, a marking is created at // O2 and TRUE is returned. With the parameter bPrev=sal_True the scan // direction is turned to the other direction. - sal_Bool MarkNextObj(sal_Bool bPrev=sal_False); + bool MarkNextObj(bool bPrev=false); // Selects the most upper of the marked objects which is hit by rPnt/nTol // and scans from there to bottom direction, selecting the first non-marked // object (O2). In case of success the marking of O1 is deleted, a marking // is created at O2 and sal_True is returned. With the parameter // bPrev=sal_True the scan direction is turned to the other direction. - sal_Bool MarkNextObj(const Point& rPnt, short nTol=-2, sal_Bool bPrev=sal_False); + bool MarkNextObj(const Point& rPnt, short nTol=-2, bool bPrev=false); // Mark all objects within a rectangular area // Just objects are marked which are inclosed completely - sal_Bool MarkObj(const Rectangle& rRect, sal_Bool bUnmark=sal_False); - void MarkObj(SdrObject* pObj, SdrPageView* pPV, sal_Bool bUnmark=sal_False, sal_Bool bImpNoSetMarkHdl=sal_False); + bool MarkObj(const Rectangle& rRect, bool bUnmark=false); + void MarkObj(SdrObject* pObj, SdrPageView* pPV, bool bUnmark=false, bool bImpNoSetMarkHdl=false); void MarkAllObj(SdrPageView* pPV=NULL); // pPage=NULL => all displayed pages void UnmarkAllObj(SdrPageView* pPV=NULL); // pPage=NULL => all displayed pages // This function is time-consuming intensive, as the MarkList has to be scanned. - sal_Bool IsObjMarked(SdrObject* pObj) const; + bool IsObjMarked(SdrObject* pObj) const; // void MarkAll(SdrPageView* pPV=NULL) { MarkAllObj(pPV); } -> replace with inline void UnMarkAll(SdrPageView* pPV=NULL) { UnmarkAllObj(pPV); } @@ -320,33 +320,33 @@ public: sal_uInt16 GetMarkHdlSizePixel() const; void SetMarkHdlSizePixel(sal_uInt16 nSiz); - virtual sal_Bool HasMarkablePoints() const; + virtual bool HasMarkablePoints() const; virtual sal_uIntPtr GetMarkablePointCount() const; - virtual sal_Bool HasMarkedPoints() const; + virtual bool HasMarkedPoints() const; virtual sal_uIntPtr GetMarkedPointCount() const; // There might be points which can't be marked: - virtual sal_Bool IsPointMarkable(const SdrHdl& rHdl) const; - virtual sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False); + virtual bool IsPointMarkable(const SdrHdl& rHdl) const; + virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark=false); /** should only be used from outside svx for special ui elements */ - sal_Bool MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark); + bool MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark); // Mark all points within this rectangular alle Punkte (View coordinates) - sal_Bool MarkPoints(const Rectangle& rRect, sal_Bool bUnmark=sal_False) { return MarkPoints(&rRect,bUnmark); } - sal_Bool UnmarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,sal_True); } - sal_Bool UnMarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,sal_True); } - sal_Bool IsPointMarked(const SdrHdl& rHdl) const { ForceUndirtyMrkPnt(); return &rHdl!=NULL && rHdl.IsSelected(); } - sal_Bool MarkAllPoints() { return MarkPoints(NULL,sal_False); } - sal_Bool UnmarkAllPoints() { return MarkPoints(NULL,sal_True); } - sal_Bool UnMarkAllPoints() { return MarkPoints(NULL,sal_True); } + bool MarkPoints(const Rectangle& rRect, bool bUnmark=false) { return MarkPoints(&rRect,bUnmark); } + bool UnmarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,true); } + bool UnMarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,true); } + bool IsPointMarked(const SdrHdl& rHdl) const { ForceUndirtyMrkPnt(); return &rHdl!=NULL && rHdl.IsSelected(); } + bool MarkAllPoints() { return MarkPoints(NULL,false); } + bool UnmarkAllPoints() { return MarkPoints(NULL,true); } + bool UnMarkAllPoints() { return MarkPoints(NULL,true); } // Selects the first marked point (P1) which is hit by rPnt // and from there it searches the first non-marked point(P2). // In case of success the marking of // P1 is deleted, a mark is set at P2 and sal_True is returned. // With the parameter bPrev=sal_True the scan direction is turned to the other direction. - sal_Bool MarkNextPoint(const Point& rPnt, sal_Bool bPrev=sal_False); + bool MarkNextPoint(const Point& rPnt, bool bPrev=false); // Search for the number of the suitable handle. In case of empty search result, // CONTAINER_ENTRY_NOTFOUND is returned. @@ -356,23 +356,23 @@ public: // Draw a selection frame for marking of points. // This routine will just be started in case that HasMarkablePoints() returns sal_True. - sal_Bool BegMarkPoints(const Point& rPnt, sal_Bool bUnmark = sal_False); + bool BegMarkPoints(const Point& rPnt, bool bUnmark = false); void MovMarkPoints(const Point& rPnt); - sal_Bool EndMarkPoints(); + bool EndMarkPoints(); void BrkMarkPoints(); - sal_Bool IsMarkPoints() const { return (0L != mpMarkPointsOverlay); } + bool IsMarkPoints() const { return (0L != mpMarkPointsOverlay); } // Select that additional handles are displayed permanently. void SetPlusHandlesAlwaysVisible(bool bOn); - sal_Bool IsPlusHandlesAlwaysVisible() const { return bPlusHdlAlways; } + bool IsPlusHandlesAlwaysVisible() const { return bPlusHdlAlways; } // Are Handles visible during TextEdit (in double size)? // Persistent, default=FALSE - void SetMarkHdlWhenTextEdit(sal_Bool bOn) { bMarkHdlWhenTextEdit=bOn; } - sal_Bool IsMarkHdlWhenTextEdit() const { return bMarkHdlWhenTextEdit; } + void SetMarkHdlWhenTextEdit(bool bOn) { bMarkHdlWhenTextEdit=bOn; } + bool IsMarkHdlWhenTextEdit() const { return bMarkHdlWhenTextEdit; } - sal_Bool HasMarkableGluePoints() const; - sal_Bool HasMarkedGluePoints() const; + bool HasMarkableGluePoints() const; + bool HasMarkedGluePoints() const; // A gluepoint is clearly identified by the SdrObject // (to which it belongs) as well as by a sal_uInt16 nId (as each SdrObject may consist of @@ -385,38 +385,38 @@ public: // Attention: With each change of the glue point status the handle list is re-calculated. // All previously saved SdrHdl* became invalid by this, the same with the point IDs! // Pick: Supported options for nOptions are SEARCH_NEXT, SEARCH_BACKWARD - sal_Bool PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const; - sal_Bool MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV, sal_Bool bUnmark=sal_False); - sal_Bool UnmarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV) { return MarkGluePoint(pObj,nId,pPV,sal_True); } - sal_Bool IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const; + bool PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const; + bool MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV, bool bUnmark=false); + bool UnmarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV) { return MarkGluePoint(pObj,nId,pPV,true); } + bool IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const; // Get the Hdl (handle) of a marked GluePoint. Non-marked // GluePoints don`t have handles SdrHdl* GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) const; - sal_Bool IsGluePoint(const SdrHdl& rHdl) const { return &rHdl!=NULL && rHdl.GetKind()==HDL_GLUE; } + bool IsGluePoint(const SdrHdl& rHdl) const { return &rHdl!=NULL && rHdl.GetKind()==HDL_GLUE; } // Mark all points within this rectangular (View coordinates) - sal_Bool MarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,sal_False); } - sal_Bool UnmarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,sal_True); } - sal_Bool MarkAllGluePoints() { return MarkGluePoints(NULL,sal_False); } - sal_Bool UnmarkAllGluePoints() { return MarkGluePoints(NULL,sal_True); } + bool MarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,false); } + bool UnmarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,true); } + bool MarkAllGluePoints() { return MarkGluePoints(NULL,false); } + bool UnmarkAllGluePoints() { return MarkGluePoints(NULL,true); } // Selects the first marked point (P1) which is hit by rPnt // and from there it searches the first non-marked point(P2). // In case of success the marking of // P1 is deleted, a mark is set at P2 and sal_True is returned. // With the parameter bPrev=sal_True the scan direction is turned to the other direction. - sal_Bool MarkNextGluePoint(const Point& rPnt, sal_Bool bPrev=sal_False); + bool MarkNextGluePoint(const Point& rPnt, bool bPrev=false); // Draw a selection frame for glue point marking. // This routine will just be started in case that HasMarkablePoints() returns sal_True. // The GlueEditMode sal_True is disregarded. - // sal_Bool BegMarkGluePoints(const Point& rPnt, OutputDevice* pOut); - sal_Bool BegMarkGluePoints(const Point& rPnt, sal_Bool bUnmark = sal_False); + // bool BegMarkGluePoints(const Point& rPnt, OutputDevice* pOut); + bool BegMarkGluePoints(const Point& rPnt, bool bUnmark = false); void MovMarkGluePoints(const Point& rPnt); - sal_Bool EndMarkGluePoints(); + bool EndMarkGluePoints(); void BrkMarkGluePoints(); - sal_Bool IsMarkGluePoints() const { return (0L != mpMarkGluePointsOverlay); } + bool IsMarkGluePoints() const { return (0L != mpMarkGluePointsOverlay); } // bRestraintPaint=sal_False causes the handles not to be drawn immediately. // AdjustMarkHdl is just called in case of changes; usually this causes an Invalidate @@ -444,7 +444,7 @@ public: // objects may not be processed in the meantime (until the next // LeaveGroup()). With markings which overlaps pages, every page is processed // separately. The method returns sal_True, if at least one group was entered. - sal_Bool EnterMarkedGroup(); + bool EnterMarkedGroup(); // Get the center point of the last Crook-Dragging. Den kann man // bei einem anschliessenden Rotate sinnvoll als Drehmittelpunkt setzen. diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index ca6be6ca6f7f..be3c7a753761 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -49,8 +49,8 @@ class SdrAShapeObjGeoData : public SdrTextObjGeoData { public: - sal_Bool bMirroredX; - sal_Bool bMirroredY; + bool bMirroredX; + bool bMirroredY; double fObjectRotation; com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > @@ -125,9 +125,9 @@ public: // #i37011# const SdrObject* GetSdrObjectFromCustomShape() const; const SdrObject* GetSdrObjectShadowFromCustomShape() const; - sal_Bool GetTextBounds( Rectangle& rTextBound ) const; - sal_Bool IsTextPath() const; - static basegfx::B2DPolyPolygon GetLineGeometry( const SdrObjCustomShape* pCustomShape, const sal_Bool bBezierAllowed ); + bool GetTextBounds( Rectangle& rTextBound ) const; + bool IsTextPath() const; + static basegfx::B2DPolyPolygon GetLineGeometry( const SdrObjCustomShape* pCustomShape, const bool bBezierAllowed ); protected: @@ -135,13 +135,13 @@ protected: public: - sal_Bool UseNoFillStyle() const; + bool UseNoFillStyle() const; - sal_Bool IsMirroredX() const; - sal_Bool IsMirroredY() const; - bool IsPostRotate() const; - void SetMirroredX( const sal_Bool bMirroredX ); - void SetMirroredY( const sal_Bool bMirroredY ); + bool IsMirroredX() const; + bool IsMirroredY() const; + bool IsPostRotate() const; + void SetMirroredX( const bool bMirroredX ); + void SetMirroredY( const bool bMirroredY ); double GetObjectRotation() const; double GetExtraTextRotation( const bool bPreRotation = false ) const; @@ -168,7 +168,7 @@ public: DEFAULT_HANDLES, DEFAULT_TEXTFRAMES }; - sal_Bool IsDefaultGeometry( const DefaultType eDefaultType ) const; + bool IsDefaultGeometry( const DefaultType eDefaultType ) const; virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; @@ -197,7 +197,7 @@ public: virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const; - virtual void NbcSetStyleSheet( SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr ); + virtual void NbcSetStyleSheet( SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr ); // special drag methods virtual bool hasSpecialDrag() const; @@ -213,8 +213,8 @@ public: virtual bool AdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true); virtual bool IsAutoGrowHeight() const; virtual bool IsAutoGrowWidth() const; - virtual void SetVerticalWriting( sal_Bool bVertical ); - virtual sal_Bool BegTextEdit( SdrOutliner& rOutl ); + virtual void SetVerticalWriting( bool bVertical ); + virtual bool BegTextEdit( SdrOutliner& rOutl ); virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; virtual void EndTextEdit( SdrOutliner& rOutl ); virtual void TakeTextAnchorRect( Rectangle& rAnchorRect ) const; @@ -233,7 +233,7 @@ public: virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject); - virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; virtual void SetPage( SdrPage* pNewPage ); @@ -242,7 +242,7 @@ public: virtual void RestGeoData(const SdrObjGeoData &rGeo); // need to take fObjectRotation instead of aGeo.nWink, replace it temporary - virtual sal_Bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; + virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon); virtual const SdrGluePointList* GetGluePointList() const; diff --git a/include/svx/svdoattr.hxx b/include/svx/svdoattr.hxx index daae14673dd1..d01f57d73d47 100644 --- a/include/svx/svdoattr.hxx +++ b/include/svx/svdoattr.hxx @@ -66,10 +66,10 @@ public: TYPEINFO(); // Detects if bFilledObj && Fill != FillNone - sal_Bool HasFill() const; + bool HasFill() const; // Detects if Line != LineNone - sal_Bool HasLine() const; + bool HasLine() const; virtual const Rectangle& GetSnapRect() const; diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 76f0e2155f05..a6558b9b3fae 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -428,7 +428,7 @@ protected: // This is needed for instance for NbcMove, because usually one moves SnapRect and aOutRect // at the same time to avoid recomputation. public: - virtual void SetRectsDirty(sal_Bool bNotMyself = false); + virtual void SetRectsDirty(bool bNotMyself = false); protected: // override if the class inherits from SdrObjPlusData: @@ -725,7 +725,7 @@ public: // The points of those objects are selected (if necessary multiselection), // deleted, inserted, or as a multiselection moved or rotated... // Only such objects can have PlusHandles (e.g. the weights of an Bezier curve). - virtual sal_Bool IsPolyObj() const; + virtual bool IsPolyObj() const; virtual sal_uInt32 GetPointCount() const; virtual Point GetPoint(sal_uInt32 i) const; void SetPoint(const Point& rPnt, sal_uInt32 i); @@ -764,13 +764,13 @@ public: // if bDontRemoveHardAttr is false, set all attributes, which were set in the style sheet, to their default value // if true, all hard attributes keep their values void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); - virtual void NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr); + virtual void NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); SfxStyleSheet* GetStyleSheet() const; virtual bool HasTextEdit() const; // returns true if TextEditMode started - virtual sal_Bool BegTextEdit(SdrOutliner& rOutl); + virtual bool BegTextEdit(SdrOutliner& rOutl); virtual void EndTextEdit(SdrOutliner& rOutl); // keep text in outliner's format @@ -870,7 +870,7 @@ public: // In the case of the conversion from TextObj to PathObj, // both modi (bLineToArea=true/false) would be identical. // The methods' default implementations report "I'm unable to do this" (false/null). - virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; SdrObject* ConvertToPolyObj(bool bBezier, bool bLineToArea) const; // convert this path object to contour object; bForceLineDash converts even @@ -964,7 +964,7 @@ public: // // gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon // with the base geometry and returns TRUE. Otherwise it returns FALSE. - virtual sal_Bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; + virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; // sets the base geometry of the object using infos contained in the homogen 3x3 matrix. // If it's an SdrPathObj it will use the provided geometry information. The Polygon has diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx index f87ea5d06f93..9db626919cf1 100644 --- a/include/svx/svdocapt.hxx +++ b/include/svx/svdocapt.hxx @@ -61,8 +61,8 @@ protected: private: Polygon aTailPoly; // the whole tail polygon - sal_Bool mbSpecialTextBoxShadow; // for calc special shadow, default FALSE - sal_Bool mbFixedTail; // for calc note box fixed tail, default FALSE + bool mbSpecialTextBoxShadow; // for calc special shadow, default FALSE + bool mbFixedTail; // for calc note box fixed tail, default FALSE Point maFixedTailPos; // for calc note box fixed tail position. private: @@ -85,11 +85,11 @@ public: virtual SdrCaptionObj* Clone() const; // for calc: special shadow only for text box - void SetSpecialTextBoxShadow() { mbSpecialTextBoxShadow = sal_True; } - sal_Bool GetSpecialTextBoxShadow() const { return mbSpecialTextBoxShadow; } + void SetSpecialTextBoxShadow() { mbSpecialTextBoxShadow = true; } + bool GetSpecialTextBoxShadow() const { return mbSpecialTextBoxShadow; } // for calc: fixed note tail position. - void SetFixedTail() { mbFixedTail = sal_True; } + void SetFixedTail() { mbFixedTail = true; } virtual OUString TakeObjNameSingul() const; virtual OUString TakeObjNamePlural() const; @@ -138,7 +138,7 @@ protected: virtual void RestGeoData(const SdrObjGeoData& rGeo); public: - virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; const Point& GetTailPos() const; void SetTailPos(const Point& rPos); diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx index c4e6b23fce1c..3286d55037dd 100644 --- a/include/svx/svdocirc.hxx +++ b/include/svx/svdocirc.hxx @@ -115,7 +115,7 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); virtual void NbcShear (const Point& rRef, long nWink, double tn, bool bVShear); - virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; protected: virtual SdrObjGeoData* NewGeoData() const; diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx index 51417e5ca439..3c9bead8aba1 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -67,14 +67,14 @@ public: void ResetVars(); bool TakeGluePoint(SdrGluePoint& rGP, bool bSetAbsolutePos) const; - inline void SetBestConnection( sal_Bool rB ) { bBestConn = rB; }; - inline void SetBestVertex( sal_Bool rB ) { bBestVertex = rB; }; - inline void SetAutoVertex( sal_Bool rB ) { bAutoVertex = rB; }; + inline void SetBestConnection( bool rB ) { bBestConn = rB; }; + inline void SetBestVertex( bool rB ) { bBestVertex = rB; }; + inline void SetAutoVertex( bool rB ) { bAutoVertex = rB; }; inline void SetConnectorId( sal_uInt16 nId ) { nConId = nId; }; - inline sal_Bool IsBestConnection() const { return bBestConn; }; - inline sal_Bool IsBestVertex() const { return bBestVertex; }; - inline sal_Bool IsAutoVertex() const { return bAutoVertex; }; + inline bool IsBestConnection() const { return bBestConn; }; + inline bool IsBestVertex() const { return bBestVertex; }; + inline bool IsAutoVertex() const { return bAutoVertex; }; inline sal_uInt16 GetConnectorId() const { return nConId; }; inline SdrObject* GetObject() const { return pObj; } }; @@ -133,8 +133,8 @@ public: SdrObjConnection aCon1; // Verbindungszustand des Linienanfangs SdrObjConnection aCon2; // Verbindungszustand des Linienendes XPolygon* pEdgeTrack; - sal_Bool bEdgeTrackDirty;// sal_True=Verbindungsverlauf muss neu berechnet werden. - sal_Bool bEdgeTrackUserDefined; + bool bEdgeTrackDirty;// sal_True=Verbindungsverlauf muss neu berechnet werden. + bool bEdgeTrackUserDefined; SdrEdgeInfoRec aEdgeInfo; public: @@ -189,11 +189,11 @@ protected: public: // #109007# // Interface to default connect suppression - void SetSuppressDefaultConnect(sal_Bool bNew) { mbSuppressDefaultConnect = bNew; } - sal_Bool GetSuppressDefaultConnect() const { return mbSuppressDefaultConnect; } + void SetSuppressDefaultConnect(bool bNew) { mbSuppressDefaultConnect = bNew; } + bool GetSuppressDefaultConnect() const { return mbSuppressDefaultConnect; } // #110649# - sal_Bool IsBoundRectCalculationRunning() const { return mbBoundRectCalculationRunning; } + bool IsBoundRectCalculationRunning() const { return mbBoundRectCalculationRunning; } protected: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); @@ -281,11 +281,11 @@ public: virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; - virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; virtual sal_uInt32 GetSnapPointCount() const; virtual Point GetSnapPoint(sal_uInt32 i) const; - virtual sal_Bool IsPolyObj() const; + virtual bool IsPolyObj() const; virtual sal_uInt32 GetPointCount() const; virtual Point GetPoint(sal_uInt32 i) const; virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i); @@ -301,12 +301,12 @@ public: void Reformat(); // helper methods for the StarOffice api - Point GetTailPoint( sal_Bool bTail ) const; - void SetTailPoint( sal_Bool bTail, const Point& rPt ); - void setGluePointIndex( sal_Bool bTail, sal_Int32 nId = -1 ); - sal_Int32 getGluePointIndex( sal_Bool bTail ); + Point GetTailPoint( bool bTail ) const; + void SetTailPoint( bool bTail, const Point& rPt ); + void setGluePointIndex( bool bTail, sal_Int32 nId = -1 ); + sal_Int32 getGluePointIndex( bool bTail ); - virtual sal_Bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; + virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon); // for geometry access @@ -327,11 +327,11 @@ public: // Objektaustrittswinkel. // Der Winkel, in dem die Verbindungslinie aus dem Objekt austreten darf. // -// sal_Bool EdgeEscAsRay Default FALSE +// bool EdgeEscAsRay Default FALSE // sal_True= die Verbindungslinie tritt aus dem Obj Strahlenfoermig aus. // Also Winkelvorgabe durch die Strecke ObjMitte/Konnektor. // -// sal_Bool EdgeEscUseObjAngle Default FALSE +// bool EdgeEscUseObjAngle Default FALSE // Objektdrehwinkelberuecksichtigung. // sal_True= Bei der Bestimmung des Objektaustrittswinkels wird der // Drehwinkel des Objekts als Offset beruecksichtigt. diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index eab2bf82d81c..5fe8dfdc3ee6 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -47,7 +47,7 @@ namespace sdr class SdrGrafObjGeoData : public SdrTextObjGeoData { public: - sal_Bool bMirrored; + bool bMirrored; SdrGrafObjGeoData() : bMirrored(false) @@ -180,7 +180,7 @@ public: bool isEmbeddedSvg() const; GDIMetaFile getMetafileFromEmbeddedSvg() const; - virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; virtual void AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false ); diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx index 4e0883c61ba2..6717a79dd18c 100644 --- a/include/svx/svdogrp.hxx +++ b/include/svx/svdogrp.hxx @@ -107,7 +107,7 @@ public: virtual void NbcReformatText(); virtual void ReformatText(); - virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; }; #endif // INCLUDED_SVX_SVDOGRP_HXX diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx index da1aa4ec0f6c..d177663fae0f 100644 --- a/include/svx/svdomeas.hxx +++ b/include/svx/svdomeas.hxx @@ -77,7 +77,7 @@ protected: void ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& rPol) const; basegfx::B2DPolyPolygon ImpCalcXPoly(const ImpMeasurePoly& rPol) const; void ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) const; - void SetTextDirty() { bTextDirty=true; SetTextSizeDirty(); if (!aOutRect.IsEmpty()) { SetBoundRectDirty(); SetRectsDirty(sal_True); } } + void SetTextDirty() { bTextDirty=true; SetTextSizeDirty(); if (!aOutRect.IsEmpty()) { SetBoundRectDirty(); SetRectsDirty(true); } } void UndirtyText() const; virtual SdrObjGeoData* NewGeoData() const; @@ -127,14 +127,14 @@ public: virtual sal_uInt32 GetSnapPointCount() const; virtual Point GetSnapPoint(sal_uInt32 i) const; - virtual sal_Bool IsPolyObj() const; + virtual bool IsPolyObj() const; virtual sal_uInt32 GetPointCount() const; virtual Point GetPoint(sal_uInt32 i) const; virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i); - virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; - virtual sal_Bool BegTextEdit(SdrOutliner& rOutl); + virtual bool BegTextEdit(SdrOutliner& rOutl); virtual const Size& GetTextSize() const; virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const; @@ -148,7 +148,7 @@ public: bool bEdit, Color*& rpTxtColor, Color*& rpFldColor, OUString& rRet) const; // #i97878# - virtual sal_Bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; + virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon); }; diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx index 5efa9e84e242..c6fbf3210be4 100644 --- a/include/svx/svdoole2.hxx +++ b/include/svx/svdoole2.hxx @@ -154,10 +154,10 @@ public: virtual void NbcSetLogicRect(const Rectangle& rRect); virtual void SetGeoData(const SdrObjGeoData& rGeo); - static sal_Bool CanUnloadRunningObj( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj, + static bool CanUnloadRunningObj( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ); - static sal_Bool Unload( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ); - sal_Bool Unload(); + static bool Unload( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ); + bool Unload(); void Connect(); void Disconnect(); void ObjectLoaded(); @@ -165,10 +165,10 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getXModel() const; // #109985# - sal_Bool IsChart() const; - sal_Bool IsCalc() const; + bool IsChart() const; + bool IsCalc() const; - sal_Bool UpdateLinkURL_Impl(); + bool UpdateLinkURL_Impl(); void BreakFileLink_Impl(); void DisconnectFileLink_Impl(); void CheckFileLink_Impl(); @@ -179,8 +179,8 @@ public: const OUString& aMediaType ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetParentXModel() const; - sal_Bool CalculateNewScaling( Fraction& aScaleWidth, Fraction& aScaleHeight, Size& aObjAreaSize ); - sal_Bool AddOwnLightClient(); + bool CalculateNewScaling( Fraction& aScaleWidth, Fraction& aScaleHeight, Size& aObjAreaSize ); + bool AddOwnLightClient(); // handy to get the empty replacement graphic without accessing all the old stuff static Graphic GetEmptyOLEReplacementGraphic(); @@ -188,7 +188,7 @@ public: void SetWindow(const com::sun::star::uno::Reference < com::sun::star::awt::XWindow >& _xWindow); // #i118485# missing converter added - virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; }; #endif // INCLUDED_SVX_SVDOOLE2_HXX diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx index 9acd5bfadc35..3ff166553e10 100644 --- a/include/svx/svdopath.hxx +++ b/include/svx/svdopath.hxx @@ -60,15 +60,15 @@ protected: protected: // helper functions for GET, SET, INS etc. PNT - void ImpSetClosed(sal_Bool bClose); + void ImpSetClosed(bool bClose); void ImpForceKind(); void ImpForceLineWink(); ImpPathForDragAndCreate& impGetDAC() const; void impDeleteDAC() const; public: - static sal_Bool ImpFindPolyPnt(const basegfx::B2DPolyPolygon& rPoly, sal_uInt32 nAbsPnt, sal_uInt32& rPolyNum, sal_uInt32& rPointNum); - virtual void SetRectsDirty(sal_Bool bNotMyself = sal_False); + static bool ImpFindPolyPnt(const basegfx::B2DPolyPolygon& rPoly, sal_uInt32 nAbsPnt, sal_uInt32& rPolyNum, sal_uInt32& rPointNum); + virtual void SetRectsDirty(bool bNotMyself = false); double GetBrightness() { return mdBrightness; } public: @@ -122,14 +122,14 @@ public: virtual sal_uInt32 GetSnapPointCount() const; virtual Point GetSnapPoint(sal_uInt32 i) const; - virtual sal_Bool IsPolyObj() const; + virtual bool IsPolyObj() const; virtual sal_uInt32 GetPointCount() const; virtual Point GetPoint(sal_uInt32 nHdlNum) const; virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 nHdlNum); // insert point - sal_uInt32 NbcInsPointOld(const Point& rPos, sal_Bool bNewObj, sal_Bool bHideHim); - sal_uInt32 NbcInsPoint(sal_uInt32 i, const Point& rPos, sal_Bool bNewObj, sal_Bool bHideHim); + sal_uInt32 NbcInsPointOld(const Point& rPos, bool bNewObj, bool bHideHim); + sal_uInt32 NbcInsPoint(sal_uInt32 i, const Point& rPos, bool bNewObj, bool bHideHim); // rip at given point SdrObject* RipPoint(sal_uInt32 nHdlNum, sal_uInt32& rNewPt0Index); @@ -140,7 +140,7 @@ protected: virtual void RestGeoData(const SdrObjGeoData& rGeo); public: - virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; // Bezier-polygon getter/setter const basegfx::B2DPolyPolygon& GetPathPoly() const { return maPathPolygon; } @@ -148,11 +148,11 @@ public: void NbcSetPathPoly(const basegfx::B2DPolyPolygon& rPathPoly); // special functions for Bezier-polygon handling - sal_Bool IsClosed() const { return meKind==OBJ_POLY || meKind==OBJ_PATHPOLY || meKind==OBJ_PATHFILL || meKind==OBJ_FREEFILL || meKind==OBJ_SPLNFILL; } - sal_Bool IsLine() const { return meKind==OBJ_PLIN || meKind==OBJ_PATHPLIN || meKind==OBJ_PATHLINE || meKind==OBJ_FREELINE || meKind==OBJ_SPLNLINE || meKind==OBJ_LINE; } - sal_Bool IsFreeHand() const { return meKind==OBJ_FREELINE || meKind==OBJ_FREEFILL; } - sal_Bool IsBezier() const { return meKind==OBJ_PATHLINE || meKind==OBJ_PATHFILL; } - sal_Bool IsSpline() const { return meKind==OBJ_SPLNLINE || meKind==OBJ_SPLNFILL; } + bool IsClosed() const { return meKind==OBJ_POLY || meKind==OBJ_PATHPOLY || meKind==OBJ_PATHFILL || meKind==OBJ_FREEFILL || meKind==OBJ_SPLNFILL; } + bool IsLine() const { return meKind==OBJ_PLIN || meKind==OBJ_PATHPLIN || meKind==OBJ_PATHLINE || meKind==OBJ_FREELINE || meKind==OBJ_SPLNLINE || meKind==OBJ_LINE; } + bool IsFreeHand() const { return meKind==OBJ_FREELINE || meKind==OBJ_FREEFILL; } + bool IsBezier() const { return meKind==OBJ_PATHLINE || meKind==OBJ_PATHFILL; } + bool IsSpline() const { return meKind==OBJ_SPLNLINE || meKind==OBJ_SPLNFILL; } // close/open path // if opening, move end point by "nOpenDistance" @@ -165,7 +165,7 @@ public: // // gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon // with the base geometry and returns TRUE. Otherwise it returns FALSE. - virtual sal_Bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; + virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; // sets the base geometry of the object using infos contained in the homogen 3x3 matrix. // If it's an SdrPathObj it will use the provided geometry information. The Polygon has // to use (0,0) as upper left and will be scaled to the given size in the matrix. diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx index 021394e72789..f2510afbb9e3 100644 --- a/include/svx/svdorect.hxx +++ b/include/svx/svdorect.hxx @@ -116,7 +116,7 @@ public: virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const; virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const; - virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); }; diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index 4a8502cb08d9..8a1f46ad710a 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -174,7 +174,7 @@ public: // #i121917# virtual bool HasText() const; - sal_Bool IsTextEditActive() const { return (pEdtOutl != 0L); } + bool IsTextEditActive() const { return (pEdtOutl != 0L); } bool IsTextEditActive( const sdr::table::CellPos& rPos ); /** returns true only if we are in edit mode and the user actually changed anything */ @@ -243,7 +243,7 @@ public: virtual void NbcMove(const Size& rSiz); virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); - virtual sal_Bool BegTextEdit(SdrOutliner& rOutl); + virtual bool BegTextEdit(SdrOutliner& rOutl); virtual void EndTextEdit(SdrOutliner& rOutl); virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; virtual void TakeTextEditArea(const sdr::table::CellPos& rPos, Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; @@ -259,8 +259,8 @@ public: void SetTextEditOutliner(SdrOutliner* pOutl) { pEdtOutl=pOutl; } - virtual sal_Bool IsVerticalWriting() const; - virtual void SetVerticalWriting(sal_Bool bVertical); + virtual bool IsVerticalWriting() const; + virtual void SetVerticalWriting(bool bVertical); com::sun::star::text::WritingMode GetWritingMode() const; @@ -277,7 +277,7 @@ public: // gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon // with the base geometry and returns TRUE. Otherwise it returns FALSE. - virtual sal_Bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; + virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; // sets the base geometry of the object using infos contained in the homogen 3x3 matrix. // If it's an SdrPathObj it will use the provided geometry information. The Polygon has diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 2329d16e339b..91a935c83c33 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -148,7 +148,7 @@ private: } // This method is only allowed for sdr::properties::TextProperties - SVX_DLLPRIVATE void SetPortionInfoChecked(sal_Bool bNew) + SVX_DLLPRIVATE void SetPortionInfoChecked(bool bNew) { bPortionInfoChecked = bNew; } @@ -218,15 +218,15 @@ protected: // wird dann hoizontal und vertikal an aRect zentriert. Bei bTextFrame= // sal_True wird der Text in aRect hineinformatiert. Der eigentliche Textrahmen // ist durch ein SdrRectObj mit bTextFrame=sal_True realisiert. - sal_Bool bTextFrame : 1; - sal_Bool bPortionInfoChecked : 1; // Fuer Optimierung von Textobjekten - sal_Bool bNoShear : 1; // Obj darf nicht gesheart werden (->Graf+Ole+TextFrame) - sal_Bool bNoRotate : 1; // Obj darf nicht gedreht werden (->Ole) - sal_Bool bNoMirror : 1; // Obj darf nicht gespiegelt werden (->Ole,TextFrame) - sal_Bool bTextSizeDirty : 1; + bool bTextFrame : 1; + bool bPortionInfoChecked : 1; // Fuer Optimierung von Textobjekten + bool bNoShear : 1; // Obj darf nicht gesheart werden (->Graf+Ole+TextFrame) + bool bNoRotate : 1; // Obj darf nicht gedreht werden (->Ole) + bool bNoMirror : 1; // Obj darf nicht gespiegelt werden (->Ole,TextFrame) + bool bTextSizeDirty : 1; // #101684# - sal_Bool mbInEditMode : 1; // Is this text object in edit mode? + bool mbInEditMode : 1; // Is this text object in edit mode? // Fuer Objekt mit freier Groesse im Draw (Mengentext). Das Flag wird vom // der App beim Create gesetzt. @@ -237,18 +237,18 @@ protected: // Resize in der Breite kann sein: // - Interaktives Resize in Einfach- oder Mehrfachselektion // - Positions+Groesse Dialog - sal_Bool bDisableAutoWidthOnDragging : 1; + bool bDisableAutoWidthOnDragging : 1; // #111096# // Allow text suppression - sal_Bool mbTextHidden : 1; + bool mbTextHidden : 1; // #111096# // Flag for allowing text animation. Default is sal_true. - sal_Bool mbTextAnimationAllowed : 1; + bool mbTextAnimationAllowed : 1; // flag for preventing recursive onEditOutlinerStatusEvent calls - sal_Bool mbInDownScale : 1; + bool mbInDownScale : 1; SdrOutliner& ImpGetDrawOutliner() const; @@ -273,7 +273,7 @@ private: protected: bool ImpCanConvTextToCurve() const; - SdrObject* ImpConvertMakeObj(const basegfx::B2DPolyPolygon& rPolyPolygon, sal_Bool bClosed, sal_Bool bBezier, sal_Bool bNoSetAttr = sal_False) const; + SdrObject* ImpConvertMakeObj(const basegfx::B2DPolyPolygon& rPolyPolygon, bool bClosed, bool bBezier, bool bNoSetAttr = false) const; SdrObject* ImpConvertAddText(SdrObject* pObj, bool bBezier) const; void ImpSetTextStyleSheetListeners(); void ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextSize, const Size& rShapeSize, Fraction& rFitXKorreg) const; @@ -281,10 +281,10 @@ protected: void ImpCheckShear(); Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const; void ImpSetTextEditParams() const; - void SetTextSizeDirty() { bTextSizeDirty=sal_True; } + void SetTextSizeDirty() { bTextSizeDirty=true; } // rAnchorRect ist InOut-Parameter! - void ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, sal_Bool bLineWidth ) const; + void ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, bool bLineWidth ) const; virtual SdrObjGeoData* NewGeoData() const; virtual void SaveGeoData(SdrObjGeoData& rGeo) const; @@ -307,7 +307,7 @@ public: TYPEINFO(); // #101684# - sal_Bool IsInEditMode() const { return mbInEditMode; } + bool IsInEditMode() const { return mbInEditMode; } // via eCharSet kann der CharSet der vorliegenden Datei uebergeben werden. // Bei RTL_TEXTENCODING_DONTKNOW wird der CharSet der aktuellen Plattform verwendet. @@ -340,7 +340,7 @@ public: virtual bool HasText() const; bool HasEditText() const; - sal_Bool IsTextEditActive() const { return (pEdtOutl != 0L); } + bool IsTextEditActive() const { return (pEdtOutl != 0L); } /** returns the currently active text. */ virtual SdrText* getActiveText() const; @@ -460,7 +460,7 @@ public: virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear); virtual bool HasTextEdit() const; - virtual sal_Bool BegTextEdit(SdrOutliner& rOutl); + virtual bool BegTextEdit(SdrOutliner& rOutl); virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; virtual void EndTextEdit(SdrOutliner& rOutl); virtual sal_uInt16 GetOutlinerViewAnchorMode() const; @@ -476,7 +476,7 @@ public: virtual bool CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos, bool bEdit, Color*& rpTxtColor, Color*& rpFldColor, OUString& rRet) const; - virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; void SetTextEditOutliner(SdrOutliner* pOutl) { pEdtOutl=pOutl; } @@ -512,8 +512,8 @@ public: */ void UpdateOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaintRect ) const; void ForceOutlinerParaObject(); - virtual sal_Bool IsVerticalWriting() const; - virtual void SetVerticalWriting(sal_Bool bVertical); + virtual bool IsVerticalWriting() const; + virtual void SetVerticalWriting(bool bVertical); /** called from the SdrObjEditView during text edit when the status of the edit outliner changes */ virtual void onEditOutlinerStatusEvent( EditStatus* pEditStatus ); @@ -528,7 +528,7 @@ public: // gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon // with the base geometry and returns TRUE. Otherwise it returns FALSE. - virtual sal_Bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; + virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; // sets the base geometry of the object using infos contained in the homogen 3x3 matrix. // If it's an SdrPathObj it will use the provided geometry information. The Polygon has @@ -547,7 +547,7 @@ public: // #111096# // Access to TextAnimationAllowed flag - void SetTextAnimationAllowed(sal_Bool bNew); + void SetTextAnimationAllowed(bool bNew); // #i8824# // Set single item at the local ItemSet. *Does not use* AllowItemChange(), diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx index 32180a86c1ae..4d366cf64f41 100644 --- a/include/svx/svdouno.hxx +++ b/include/svx/svdouno.hxx @@ -53,7 +53,7 @@ class SVX_DLLPUBLIC SdrUnoObj : public SdrRectObj OUString aUnoControlModelTypeName; OUString aUnoControlTypeName; - sal_Bool bOwnUnoControlModel; + bool bOwnUnoControlModel; protected: ::com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > xUnoControlModel; // kann auch von aussen gesetzt werden @@ -66,10 +66,10 @@ private: public: TYPEINFO(); - explicit SdrUnoObj(const OUString& rModelName, sal_Bool bOwnsModel = sal_True); + explicit SdrUnoObj(const OUString& rModelName, bool bOwnsModel = true); SdrUnoObj(const OUString& rModelName, const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac, - sal_Bool bOwnsModel = sal_True); + bool bOwnsModel = true); virtual ~SdrUnoObj(); virtual void SetPage(SdrPage* pNewPage); diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx index 79347b99c484..1fe569246f92 100644 --- a/include/svx/svdovirt.hxx +++ b/include/svx/svdovirt.hxx @@ -127,7 +127,7 @@ public: virtual sal_uInt32 GetSnapPointCount() const; virtual Point GetSnapPoint(sal_uInt32 i) const; - virtual sal_Bool IsPolyObj() const; + virtual bool IsPolyObj() const; virtual sal_uInt32 GetPointCount() const; virtual Point GetPoint(sal_uInt32 i) const; virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i); diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index 465c540f1454..a573365b071d 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -525,7 +525,7 @@ public: virtual void SetModel(SdrModel* pNewModel); // New MasterPage interface - sal_Bool TRG_HasMasterPage() const { return (0L != mpMasterPageDescriptor); } + bool TRG_HasMasterPage() const { return (0L != mpMasterPageDescriptor); } void TRG_SetMasterPage(SdrPage& rNew); void TRG_ClearMasterPage(); SdrPage& TRG_GetMasterPage() const; diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index ae516010d1c9..0785eded905b 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -71,8 +71,8 @@ private: Rectangle aMarkBound; // wird Rectangle aMarkSnap; // von - sal_Bool mbHasMarked; - sal_Bool mbVisible; + bool mbHasMarked; + bool mbVisible; SetOfByte aLayerVisi; // Menge der sichtbaren Layer SetOfByte aLayerLock; // Menge der nicht editierbaren Layer @@ -157,7 +157,7 @@ public: */ void SetDesignMode( bool _bDesignMode ) const; - sal_Bool IsVisible() const { return mbVisible; } + bool IsVisible() const { return mbVisible; } // Invalidiert den gesamten Bereich der Page void InvalidateAllWin(); @@ -187,8 +187,8 @@ public: // Betretene Gruppe und Liste setzen void SetAktGroupAndList(SdrObject* pNewGroup, SdrObjList* pNewList); - sal_Bool HasMarkedObjPageView() const { return mbHasMarked; } - void SetHasMarkedObj(sal_Bool bOn) { mbHasMarked = bOn; } + bool HasMarkedObjPageView() const { return mbHasMarked; } + void SetHasMarkedObj(bool bOn) { mbHasMarked = bOn; } const Rectangle& MarkBound() const { return aMarkBound; } const Rectangle& MarkSnap() const { return aMarkSnap; } @@ -198,14 +198,14 @@ public: void SetLayerVisible(const OUString& rName, bool bShow = true) { SetLayer(rName, aLayerVisi, bShow); if(!bShow) AdjHdl(); InvalidateAllWin(); } bool IsLayerVisible(const OUString& rName) const { return IsLayer(rName, aLayerVisi); } - void SetLayerLocked(const OUString& rName, sal_Bool bLock = sal_True) { SetLayer(rName, aLayerLock, bLock); if(bLock) AdjHdl(); } - sal_Bool IsLayerLocked(const OUString& rName) const { return IsLayer(rName,aLayerLock); } + void SetLayerLocked(const OUString& rName, bool bLock = true) { SetLayer(rName, aLayerLock, bLock); if(bLock) AdjHdl(); } + bool IsLayerLocked(const OUString& rName) const { return IsLayer(rName,aLayerLock); } - void SetLayerPrintable(const OUString& rName, sal_Bool bPrn = sal_True) { SetLayer(rName, aLayerPrn, bPrn); } - sal_Bool IsLayerPrintable(const OUString& rName) const { return IsLayer(rName, aLayerPrn); } + void SetLayerPrintable(const OUString& rName, bool bPrn = true) { SetLayer(rName, aLayerPrn, bPrn); } + bool IsLayerPrintable(const OUString& rName) const { return IsLayer(rName, aLayerPrn); } // PV stellt eine RefPage oder eine SubList eines RefObj dar oder Model ist ReadOnly - sal_Bool IsReadOnly() const; + bool IsReadOnly() const; // der Origin bezieht sich immer auf die obere linke Ecke der Page const Point& GetPageOrigin() const { return aPgOrg; } @@ -234,13 +234,13 @@ public: // Liefert sal_True, wenn Layer des Obj sichtbar und nicht gesperrt. // Beim Gruppenobjekt muss wenigstens ein Member sichtbar sein, // gesperrt sein darf keiner. - sal_Bool IsObjMarkable(SdrObject* pObj) const; + bool IsObjMarkable(SdrObject* pObj) const; // Betreten (Editieren) einer Objektgruppe. Anschliessend liegen alle // Memberobjekte der Gruppe im direkten Zugriff. Alle anderen Objekte // koennen waerendessen nicht bearbeitet werden (bis zum naechsten // LeaveGroup()). (wie MsDos chdir bla). - sal_Bool EnterGroup(SdrObject* pObj); + bool EnterGroup(SdrObject* pObj); // Verlassen einer betretenen Objektgruppe. (wie MsDos chdir ..) void LeaveOneGroup(); diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index c7c61bad46ae..751120655708 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -183,7 +183,7 @@ protected: bool bSwapAsynchron : 1; bool bPrintPreview : 1; - // sal_Bool fuer die Verwaltung des anzuzeigenden Status + // 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. @@ -224,7 +224,7 @@ public: void SetBufferedOverlayAllowed(bool bNew); // allow page painting at all? - sal_Bool IsPagePaintingAllowed() const; + bool IsPagePaintingAllowed() const; void SetPagePaintingAllowed(bool bNew); protected: @@ -258,12 +258,12 @@ protected: 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; } + bool ImpIsGlueVisible2() const { return bGlueVisible2; } + bool ImpIsGlueVisible3() const { return bGlueVisible3; } + bool ImpIsGlueVisible4() const { return bGlueVisible4; } public: - sal_Bool ImpIsGlueVisible() { return bGlueVisible || bGlueVisible2 || bGlueVisible3 || bGlueVisible4; } + bool ImpIsGlueVisible() { return bGlueVisible || bGlueVisible2 || bGlueVisible3 || bGlueVisible4; } protected: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); @@ -289,7 +289,7 @@ public: virtual void ClearPageView(); SdrModel* GetModel() const { return pMod; } - virtual sal_Bool IsAction() const; + virtual bool IsAction() const; virtual void MovAction(const Point& rPnt); virtual void EndAction(); virtual void BckAction(); @@ -317,8 +317,8 @@ public: sal_uInt16 getMinMovLog() const { return nMinMovLog; } // Flag zur Visualisierung von Gruppen abfragen/testen - sal_Bool DoVisualizeEnteredGroup() const { return bVisualizeEnteredGroup; } - void SetVisualizeEnteredGroup(sal_Bool bNew) { bVisualizeEnteredGroup = bNew; } + bool DoVisualizeEnteredGroup() const { return bVisualizeEnteredGroup; } + void SetVisualizeEnteredGroup(bool bNew) { bVisualizeEnteredGroup = bNew; } // Am DragStatus laesst sich beispielsweise erfragen, welche // entfernung bereits gedraggd wurde, etc. @@ -356,10 +356,10 @@ public: void SetLayerVisible(const OUString& rName, bool bShow=true); bool IsLayerVisible(const OUString& rName) const; - void SetLayerLocked(const OUString& rName, sal_Bool bLock=sal_True); + void SetLayerLocked(const OUString& rName, bool bLock=true); bool IsLayerLocked(const OUString& rName) const; - void SetLayerPrintable(const OUString& rName, sal_Bool bPrn=sal_True); + void SetLayerPrintable(const OUString& rName, bool bPrn=true); bool IsLayerPrintable(const OUString& rName) const; // PrePaint call forwarded from app windows @@ -398,14 +398,14 @@ protected: Region OptimizeDrawLayersRegion(OutputDevice* pOut, const Region& rReg, bool bDisableIntersect); public: - sal_Bool IsPageVisible() const { return bPageVisible; } // Seite (weisse Flaeche) malen oder nicht - sal_Bool IsPageBorderVisible() const { return bPageBorderVisible; } // Seite (weisse Flaeche) malen oder nicht - sal_Bool IsBordVisible() const { return bBordVisible; } // Seitenrandlinie malen oder nicht - sal_Bool IsGridVisible() const { return bGridVisible; } // Rastergitter malen oder nicht - sal_Bool IsGridFront() const { return bGridFront ; } // Rastergitter ueber die Objekte druebermalen oder dahinter - sal_Bool IsHlplVisible() const { return bHlplVisible; } // Hilfslinien der Seiten malen oder nicht - sal_Bool IsHlplFront() const { return bHlplFront ; } // Hilfslinie ueber die Objekte druebermalen oder dahinter - sal_Bool IsGlueVisible() const { return bGlueVisible; } // Konnektoren der objekte sichtbar oder nicht + bool IsPageVisible() const { return bPageVisible; } // Seite (weisse Flaeche) malen oder nicht + bool IsPageBorderVisible() const { return bPageBorderVisible; } // Seite (weisse Flaeche) malen oder nicht + bool IsBordVisible() const { return bBordVisible; } // Seitenrandlinie malen oder nicht + bool IsGridVisible() const { return bGridVisible; } // Rastergitter malen oder nicht + bool IsGridFront() const { return bGridFront ; } // Rastergitter ueber die Objekte druebermalen oder dahinter + bool IsHlplVisible() const { return bHlplVisible; } // Hilfslinien der Seiten malen oder nicht + bool IsHlplFront() const { return bHlplFront ; } // Hilfslinie ueber die Objekte druebermalen oder dahinter + bool IsGlueVisible() const { return bGlueVisible; } // Konnektoren der objekte sichtbar oder nicht Color GetGridColor() const; void SetPageVisible(bool bOn = true) { bPageVisible=bOn; InvalidateAllWin(); } void SetPageBorderVisible(bool bOn = true) { bPageBorderVisible=bOn; InvalidateAllWin(); } @@ -417,7 +417,7 @@ public: 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; } + bool IsPreviewRenderer() const { return mbPreviewRenderer; } void SetPreviewRenderer(bool bOn) { mbPreviewRenderer=bOn; } // access methods for calc and sw hide object modes @@ -436,7 +436,7 @@ public: const Size& GetGridFine() const { return aGridFin; } void InvalidateAllWin(); - void InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix=sal_False); + void InvalidateAllWin(const Rectangle& rRect, bool bPlus1Pix=false); // Wenn die View kein Invalidate() an den Fenstern durchfuehren soll, muss // man diese beiden folgenden Methoden ueberladen und entsprechend anders @@ -460,13 +460,13 @@ public: // DefaultAttribute an der View: Neu erzeugte Objekte bekommen diese // Attribute direkt nach dem Erzeugen erstmal zugewiesen. - void SetDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll); + void SetDefaultAttr(const SfxItemSet& rAttr, bool bReplaceAll); const SfxItemSet& GetDefaultAttr() const { return aDefaultAttr; } - void SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr); + void SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr); SfxStyleSheet* GetDefaultStyleSheet() const { return pDefaultStyleSheet; } - void SetNotPersistDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll); - void MergeNotPersistDefaultAttr(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const; + void SetNotPersistDefaultAttr(const SfxItemSet& rAttr, bool bReplaceAll); + void MergeNotPersistDefaultAttr(SfxItemSet& rAttr, bool bOnlyHardAttr) const; // use this mode as mode to draw all internal GraphicManager objects with sal_uIntPtr GetGraphicManagerDrawMode() const { return nGraphicManagerDrawMode; } @@ -477,24 +477,24 @@ public: // Nach Abschluss des Nachladens wird das Objekt dann angezeigt. // Hat nur z.Zt. Wirkung, wenn SwapGraphics am Model eingeschaltet ist. // Default=FALSE. Flag ist nicht persistent. - sal_Bool IsSwapAsynchron() const { return bSwapAsynchron; } - void SetSwapAsynchron(sal_Bool bJa=sal_True) { bSwapAsynchron=bJa; } + bool IsSwapAsynchron() const { return bSwapAsynchron; } + void SetSwapAsynchron(bool bJa=true) { bSwapAsynchron=bJa; } virtual sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin); virtual sal_Bool MouseButtonDown(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return sal_False; } virtual sal_Bool MouseButtonUp(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return sal_False; } virtual sal_Bool MouseMove(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return sal_False; } virtual sal_Bool Command(const CommandEvent& /*rCEvt*/, Window* /*pWin*/) { return sal_False; } - sal_Bool Cut(sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return sal_False; } - sal_Bool Yank(sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return sal_False; } - sal_Bool Paste(Window* /*pWin*/=NULL, sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return sal_False; } + bool Cut(sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return false; } + bool Yank(sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return false; } + bool Paste(Window* /*pWin*/=NULL, sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return false; } /* new interface src537 */ - sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const; + bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr=false) const; - sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll); - SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const; - sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr); + bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll); + SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(bool& rOk) const; + bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr); virtual void MakeVisible(const Rectangle& rRect, Window& rWin); @@ -504,8 +504,8 @@ public: // Animation aktivieren/deaktivieren fuer ::Paint // wird z.Zt. ausgewertet von SdrGrafObj, wenn in dem eine Animation steckt // Das Unterbinden der automatischen Animation wird z.B. fuer die Dia-Show benoetigt - sal_Bool IsAnimationEnabled() const { return ( SDR_ANIMATION_ANIMATE == eAnimationMode ); } - void SetAnimationEnabled( sal_Bool bEnable=sal_True ); + bool IsAnimationEnabled() const { return ( SDR_ANIMATION_ANIMATE == eAnimationMode ); } + void SetAnimationEnabled( bool bEnable=true ); // set/unset pause state for animations bool IsAnimationPause() const { return bAnimationPause; } @@ -520,8 +520,8 @@ public: // bei bShow=sal_False wird der Browser destruiert #ifdef DBG_UTIL - void ShowItemBrowser(sal_Bool bShow=sal_True); - sal_Bool IsItemBrowserVisible() const { return pItemBrowser!=NULL && ((Window*)pItemBrowser)->IsVisible(); } + void ShowItemBrowser(bool bShow=true); + bool IsItemBrowserVisible() const { return pItemBrowser!=NULL && ((Window*)pItemBrowser)->IsVisible(); } Window* GetItemBrowser() const { return (Window*)pItemBrowser; } #endif @@ -530,7 +530,7 @@ public: void VisAreaChanged(const OutputDevice* pOut=NULL); void VisAreaChanged(const SdrPageWindow& rWindow); - sal_Bool IsPrintPreview() const { return bPrintPreview; } + bool IsPrintPreview() const { return bPrintPreview; } void SetPrintPreview(bool bOn = true) { bPrintPreview=bOn; } const svtools::ColorConfig& getColorConfig() const; diff --git a/include/svx/svdpoev.hxx b/include/svx/svdpoev.hxx index 700607c8056c..f3b79e13c8c1 100644 --- a/include/svx/svdpoev.hxx +++ b/include/svx/svdpoev.hxx @@ -30,8 +30,8 @@ class SVX_DLLPUBLIC SdrPolyEditView: public SdrEditView, public IPolyPolygonEdit friend class SdrEditView; protected: - sal_Bool bSetMarkedPointsSmoothPossible : 1; - sal_Bool bSetMarkedSegmentsKindPossible : 1; + bool bSetMarkedPointsSmoothPossible : 1; + bool bSetMarkedSegmentsKindPossible : 1; SdrPathSmoothKind eMarkedPointsSmooth; SdrPathSegmentKind eMarkedSegmentsKind; diff --git a/include/svx/svdpool.hxx b/include/svx/svdpool.hxx index d2fd7799e2dd..93b23fd14781 100644 --- a/include/svx/svdpool.hxx +++ b/include/svx/svdpool.hxx @@ -32,7 +32,7 @@ class XFillAttrSetItem; class SVX_DLLPUBLIC SdrItemPool : public XOutdevItemPool { public: - SdrItemPool(SfxItemPool* pMaster = 0L, sal_Bool bLoadRefCounts = sal_True); + SdrItemPool(SfxItemPool* pMaster = 0L, bool bLoadRefCounts = true); SdrItemPool(const SdrItemPool& rPool); protected: virtual ~SdrItemPool(); diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx index 879a72423b03..feee90765a76 100644 --- a/include/svx/svdsnpv.hxx +++ b/include/svx/svdsnpv.hxx @@ -91,7 +91,7 @@ protected: virtual ~SdrSnapView(); public: - virtual sal_Bool IsAction() const; + virtual bool IsAction() const; virtual void MovAction(const Point& rPnt); virtual void EndAction(); virtual void BckAction(); @@ -120,66 +120,66 @@ public: void CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBestXSnap, long& nBestYSnap, bool& bXSnapped, bool& bYSnapped) const; // Alle Fangeinstellungen sind Persistent. - sal_Bool IsSnapEnabled() const { return bSnapEnab; } - sal_Bool IsGridSnap() const { return bGridSnap; } // Fang auf Rastergitter - sal_Bool IsBordSnap() const { return bBordSnap; } // Fang auf Seitenraender - sal_Bool IsHlplSnap() const { return bHlplSnap; } // Fang auf Hilfslinien - sal_Bool IsOFrmSnap() const { return bOFrmSnap; } // Fang auf LogFram von umgebenden Zeichenobjekten - sal_Bool IsOPntSnap() const { return bOPntSnap; } // Fang auf ausgepraegte Punkte von umgebenden Zeichenobjekten - sal_Bool IsOConSnap() const { return bOConSnap; } // Fang auf Konnektoren der Zeichenobjekte - void SetSnapEnabled(sal_Bool bOn) { bSnapEnab=bOn; } - void SetGridSnap(sal_Bool bOn) { bGridSnap=bOn; } - void SetBordSnap(sal_Bool bOn) { bBordSnap=bOn; } - void SetHlplSnap(sal_Bool bOn) { bHlplSnap=bOn; } - void SetOFrmSnap(sal_Bool bOn) { bOFrmSnap=bOn; } - void SetOPntSnap(sal_Bool bOn) { bOPntSnap=bOn; } - void SetOConSnap(sal_Bool bOn) { bOConSnap=bOn; } + bool IsSnapEnabled() const { return bSnapEnab; } + bool IsGridSnap() const { return bGridSnap; } // Fang auf Rastergitter + bool IsBordSnap() const { return bBordSnap; } // Fang auf Seitenraender + bool IsHlplSnap() const { return bHlplSnap; } // Fang auf Hilfslinien + bool IsOFrmSnap() const { return bOFrmSnap; } // Fang auf LogFram von umgebenden Zeichenobjekten + bool IsOPntSnap() const { return bOPntSnap; } // Fang auf ausgepraegte Punkte von umgebenden Zeichenobjekten + bool IsOConSnap() const { return bOConSnap; } // Fang auf Konnektoren der Zeichenobjekte + void SetSnapEnabled(bool bOn) { bSnapEnab=bOn; } + void SetGridSnap(bool bOn) { bGridSnap=bOn; } + void SetBordSnap(bool bOn) { bBordSnap=bOn; } + void SetHlplSnap(bool bOn) { bHlplSnap=bOn; } + void SetOFrmSnap(bool bOn) { bOFrmSnap=bOn; } + void SetOPntSnap(bool bOn) { bOPntSnap=bOn; } + void SetOConSnap(bool bOn) { bOConSnap=bOn; } // Normalerweise werden beim Move-Dragging von Zeichenobjekten alle // 4 Ecken des Object-SnapRects gefangen. Folgende Einstellmoeglichkeit, // wenn man nur auf die linke obere Ecke fangen will (z.B. DialogEditor): // Persistent, Default=FALSE. - void SetMoveSnapOnlyTopLeft(sal_Bool bOn) { bMoveSnapOnlyTopLeft=bOn; } - sal_Bool IsMoveSnapOnlyTopLeft() const { return bMoveSnapOnlyTopLeft; } + void SetMoveSnapOnlyTopLeft(bool bOn) { bMoveSnapOnlyTopLeft=bOn; } + bool IsMoveSnapOnlyTopLeft() const { return bMoveSnapOnlyTopLeft; } // Hilfslinien fixiert (nicht verschiebbar) // Persistent, Default=FALSE. - sal_Bool IsHlplFixed() const { return bHlplFixed; } - void SetHlplFixed(sal_Bool bOn) { bHlplFixed=bOn; } + bool IsHlplFixed() const { return bHlplFixed; } + void SetHlplFixed(bool bOn) { bHlplFixed=bOn; } - sal_Bool IsMoveMFrmSnap() const { return bMoveMFrmSnap; } // Fang des LogFram aller markierten Objekte - sal_Bool IsMoveOFrmSnap() const { return bMoveOFrmSnap; } // Fang aller LogFram der markierten Objekte - sal_Bool IsMoveOPntSnap() const { return bMoveOPntSnap; } // Fang ausgepraegter Punkte der markierten Objekte - sal_Bool IsMoveOConSnap() const { return bMoveOConSnap; } // Fang der Konnektoren der markierten Objekte + bool IsMoveMFrmSnap() const { return bMoveMFrmSnap; } // Fang des LogFram aller markierten Objekte + bool IsMoveOFrmSnap() const { return bMoveOFrmSnap; } // Fang aller LogFram der markierten Objekte + bool IsMoveOPntSnap() const { return bMoveOPntSnap; } // Fang ausgepraegter Punkte der markierten Objekte + bool IsMoveOConSnap() const { return bMoveOConSnap; } // Fang der Konnektoren der markierten Objekte - void SetMoveMFrmSnap(sal_Bool bOn) { bMoveMFrmSnap=bOn; } - void SetMoveOFrmSnap(sal_Bool bOn) { bMoveOFrmSnap=bOn; } - void SetMoveOPntSnap(sal_Bool bOn) { bMoveOPntSnap=bOn; } - void SetMoveOConSnap(sal_Bool bOn) { bMoveOConSnap=bOn; } + void SetMoveMFrmSnap(bool bOn) { bMoveMFrmSnap=bOn; } + void SetMoveOFrmSnap(bool bOn) { bMoveOFrmSnap=bOn; } + void SetMoveOPntSnap(bool bOn) { bMoveOPntSnap=bOn; } + void SetMoveOConSnap(bool bOn) { bMoveOConSnap=bOn; } // #114409#-1 Migrate PageOrigin - sal_Bool BegSetPageOrg(const Point& rPnt); + bool BegSetPageOrg(const Point& rPnt); void MovSetPageOrg(const Point& rPnt); - sal_Bool EndSetPageOrg(); + bool EndSetPageOrg(); void BrkSetPageOrg(); - sal_Bool IsSetPageOrg() const { return (0L != mpPageOriginOverlay); } + bool IsSetPageOrg() const { return (0L != mpPageOriginOverlay); } // HitTest. Bei sal_True steht in rnHelpLineNum die Nummer der Hilfslinie und in rpPV // die zugehoerige PageView. - sal_Bool PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, sal_uInt16& rnHelpLineNum, SdrPageView*& rpPV) const; + bool PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, sal_uInt16& rnHelpLineNum, SdrPageView*& rpPV) const; // Verschieben einer vorhandenen Hilfslinie. nHelpLineNum und pPV von PickHelpLine verwenden. - sal_Bool BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV); + bool BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV); // Interaktives einfuegen einer neuen Hilfslinie - sal_Bool BegDragHelpLine(const Point& rPnt, SdrHelpLineKind eNewKind); + bool BegDragHelpLine(const Point& rPnt, SdrHelpLineKind eNewKind); Pointer GetDraggedHelpLinePointer() const; // Aendern des Hilfslinientyps waerend des draggens // void SetDraggedHelpLineKind(SdrHelpLineKind eNewKind); void MovDragHelpLine(const Point& rPnt); - sal_Bool EndDragHelpLine(); + bool EndDragHelpLine(); void BrkDragHelpLine(); - sal_Bool IsDragHelpLine() const { return (0L != mpHelpLineOverlay); } + bool IsDragHelpLine() const { return (0L != mpHelpLineOverlay); } // SnapAngle ist fuer Winkel im Kreis, RotateDragging, ... // Der Winkelfang wird unterdrueckt, wenn er mit @@ -193,8 +193,8 @@ public: // - Shear (Dragging) // - Kreisbogen/-sektor/-abschnitt Winkel (Create und Dragging) // Persistent. - void SetAngleSnapEnabled(sal_Bool bOn) { bAngleSnapEnab=bOn; } - sal_Bool IsAngleSnapEnabled() const { return bAngleSnapEnab; } + void SetAngleSnapEnabled(bool bOn) { bAngleSnapEnab=bOn; } + bool IsAngleSnapEnabled() const { return bAngleSnapEnab; } void SetSnapAngle(long nWink) { nSnapAngle=nWink; } long GetSnapAngle() const { return nSnapAngle; } @@ -238,16 +238,16 @@ public: // nur das Zentrum der markierten Objekte transformiert. Groesse, Form // und Drehwinkel der Objekte bleiben erhalten, nur ihre Positionen // aendern sich. Persistent. Default=FALSE. (ni) - void SetMoveOnlyDragging(sal_Bool bOn) { bMoveOnlyDragging=bOn; } - sal_Bool IsMoveOnlyDragging() const { return bMoveOnlyDragging; } + void SetMoveOnlyDragging(bool bOn) { bMoveOnlyDragging=bOn; } + bool IsMoveOnlyDragging() const { return bMoveOnlyDragging; } // Slant anstelle von Shear anwenden. Persistent. Default=FALSE. - void SetSlantButShear(sal_Bool bOn) { bSlantButShear=bOn; } - sal_Bool IsSlantButShear() const { return bSlantButShear; } + void SetSlantButShear(bool bOn) { bSlantButShear=bOn; } + bool IsSlantButShear() const { return bSlantButShear; } // Objekte bei Crook nicht verzerren. Persistent. Default=FALSE. (ni) - void SetCrookNoContortion(sal_Bool bOn) { bCrookNoContortion=bOn; } - sal_Bool IsCrookNoContortion() const { return bCrookNoContortion; } + void SetCrookNoContortion(bool bOn) { bCrookNoContortion=bOn; } + bool IsCrookNoContortion() const { return bCrookNoContortion; } // Crook-Modus. Persistent. Default=SDRCROOK_ROTATE. (ni) void SetCrookMode(SdrCrookMode eMode) { eCrookMode=eMode; } @@ -256,8 +256,8 @@ public: // Special fuer IBM: Beim Draggen eines Polygonpunkts wird dieser // geloescht, wenn seine beiden angrenzenden Linien eh' fast eine // durchgehende Linie sind. - void SetEliminatePolyPoints(sal_Bool bOn) { bEliminatePolyPoints=bOn; } - sal_Bool IsEliminatePolyPoints() const { return bEliminatePolyPoints; } + void SetEliminatePolyPoints(bool bOn) { bEliminatePolyPoints=bOn; } + bool IsEliminatePolyPoints() const { return bEliminatePolyPoints; } void SetEliminatePolyPointLimitAngle(long nAngle) { nEliminatePolyPointLimitAngle=nAngle; } long GetEliminatePolyPointLimitAngle() const { return nEliminatePolyPointLimitAngle; } }; diff --git a/include/svx/svdsob.hxx b/include/svx/svdsob.hxx index e049b5b96294..da66a2a477d7 100644 --- a/include/svx/svdsob.hxx +++ b/include/svx/svdsob.hxx @@ -37,17 +37,17 @@ protected: sal_uInt8 aData[32]; public: - explicit SetOfByte(sal_Bool bInitVal = sal_False) + explicit SetOfByte(bool bInitVal = false) { memset(aData, bInitVal ? 0xFF : 0x00, sizeof(aData)); } - sal_Bool operator==(const SetOfByte& rCmpSet) const + bool operator==(const SetOfByte& rCmpSet) const { return (memcmp(aData, rCmpSet.aData, sizeof(aData)) == 0); } - sal_Bool operator!=(const SetOfByte& rCmpSet) const + bool operator!=(const SetOfByte& rCmpSet) const { return (memcmp(aData, rCmpSet.aData, sizeof(aData))!=0); } @@ -62,7 +62,7 @@ public: aData[a/8] &= ~(1<<a%8); } - void Set(sal_uInt8 a, sal_Bool b) + void Set(sal_uInt8 a, bool b) { if(b) Set(a); @@ -70,7 +70,7 @@ public: Clear(a); } - sal_Bool IsSet(sal_uInt8 a) const + bool IsSet(sal_uInt8 a) const { return (aData[a/8] & 1<<a%8) != 0; } @@ -85,7 +85,7 @@ public: memset(aData, 0x00, sizeof(aData)); } - sal_Bool IsEmpty() const; + bool IsEmpty() const; void operator&=(const SetOfByte& r2ndSet); void operator|=(const SetOfByte& r2ndSet); diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index c51e77ed3e33..55aaebe17d8c 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -416,7 +416,7 @@ protected: OutlinerParaObject* pOldText; OutlinerParaObject* pNewText; bool bNewTextAvailable; - sal_Bool bEmptyPresObj; + bool bEmptyPresObj; sal_Int32 mnText; public: @@ -677,7 +677,7 @@ public: class SdrUndoPageMasterPage : public SdrUndoPage { protected: - sal_Bool mbOldHadMasterPage; + bool mbOldHadMasterPage; SetOfByte maOldSet; sal_uInt16 maOldMasterPageNumber; @@ -712,7 +712,7 @@ public: class SVX_DLLPUBLIC SdrUndoPageChangeMasterPage : public SdrUndoPageMasterPage { protected: - sal_Bool mbNewHadMasterPage; + bool mbNewHadMasterPage; SetOfByte maNewSet; sal_uInt16 maNewMasterPageNumber; diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx index 3da285411b55..bfe5bc8bfc0c 100644 --- a/include/svx/svdview.hxx +++ b/include/svx/svdview.hxx @@ -179,20 +179,20 @@ public: // pSdrView->DoMouseEvent(aVEvt); // SetPointer(GetPreferredPointer(...)) // CaptureMouse(...) - void EnableExtendedMouseEventDispatcher(sal_Bool bOn) { bNoExtendedMouseDispatcher = !bOn; } - sal_Bool IsExtendedMouseEventDispatcherEnabled() const { return bNoExtendedMouseDispatcher; } + void EnableExtendedMouseEventDispatcher(bool bOn) { bNoExtendedMouseDispatcher = !bOn; } + bool IsExtendedMouseEventDispatcherEnabled() const { return bNoExtendedMouseDispatcher; } - void EnableExtendedKeyInputDispatcher(sal_Bool bOn) { bNoExtendedKeyDispatcher=!bOn; } - sal_Bool IsExtendedKeyInputDispatcherEnabled() const { return bNoExtendedKeyDispatcher; } + void EnableExtendedKeyInputDispatcher(bool bOn) { bNoExtendedKeyDispatcher=!bOn; } + bool IsExtendedKeyInputDispatcherEnabled() const { return bNoExtendedKeyDispatcher; } - void EnableExtendedCommandEventDispatcher(sal_Bool bOn) { bNoExtendedCommandDispatcher=!bOn; } - sal_Bool IsExtendedCommandEventDispatcherEnabled() const { return bNoExtendedCommandDispatcher; } + void EnableExtendedCommandEventDispatcher(bool bOn) { bNoExtendedCommandDispatcher=!bOn; } + bool IsExtendedCommandEventDispatcherEnabled() const { return bNoExtendedCommandDispatcher; } - void EnableTextEditOnObjectsWithoutTextIfTextTool(sal_Bool bOn) { bTextEditOnObjectsWithoutTextIfTextTool=bOn; } - sal_Bool IsEnableTextEditOnObjectsWithoutTextIfTextToolEnabled() const { return bTextEditOnObjectsWithoutTextIfTextTool; } + void EnableTextEditOnObjectsWithoutTextIfTextTool(bool bOn) { bTextEditOnObjectsWithoutTextIfTextTool=bOn; } + bool IsEnableTextEditOnObjectsWithoutTextIfTextToolEnabled() const { return bTextEditOnObjectsWithoutTextIfTextTool; } - void SetMasterPagePaintCaching(sal_Bool bOn); - sal_Bool IsMasterPagePaintCaching() const { return mbMasterPagePaintCaching; } + void SetMasterPagePaintCaching(bool bOn); + bool IsMasterPagePaintCaching() const { return mbMasterPagePaintCaching; } sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin); virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin); @@ -202,21 +202,21 @@ public: virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); - sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll=sal_False) { return SdrCreateView::SetAttributes(rSet,bReplaceAll); } - sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr=sal_False) { return SdrCreateView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); } + bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll=false) { return SdrCreateView::SetAttributes(rSet,bReplaceAll); } + bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr=false) { return SdrCreateView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); } /* new interface src537 */ - sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const; + bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr=false) const; SfxStyleSheet* GetStyleSheet() const; // unvollstaendige Implementation: // Das OutputDevice ist notwendig, damit ich die HandleSize ermitteln kann. // Bei NULL wird das 1. angemeldete Win verwendet. - Pointer GetPreferredPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier=0, sal_Bool bLeftDown=sal_False) const; + Pointer GetPreferredPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier=0, bool bLeftDown=false) const; SdrHitKind PickAnything(const MouseEvent& rMEvt, sal_uInt16 nMouseDownOrMoveOrUp, SdrViewEvent& rVEvt) const; SdrHitKind PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) const; - sal_Bool DoMouseEvent(const SdrViewEvent& rVEvt); + bool DoMouseEvent(const SdrViewEvent& rVEvt); virtual SdrViewContext GetContext() const; // Die Methoden beruecksichtigen den jeweiligen Kontex: @@ -237,7 +237,7 @@ public: // bAddMark=TRUE: zur bestehenden Selektion hinzumarkieren (->Shift) // bUnmark=TRUE: Bereits selektierte Objekte/Punkte/Klebepunkte die innerhalb // des aufgezogenen Rahmens liegen werden deselektiert. - sal_Bool BegMark(const Point& rPnt, sal_Bool bAddMark=sal_False, sal_Bool bUnmark=sal_False); + bool BegMark(const Point& rPnt, bool bAddMark=false, bool bUnmark=false); // Folgende Actions sind moeglich: // - ObjectCreating diff --git a/include/svx/svdviter.hxx b/include/svx/svdviter.hxx index 8bee35f2c424..a5cf00479284 100644 --- a/include/svx/svdviter.hxx +++ b/include/svx/svdviter.hxx @@ -73,16 +73,16 @@ class SVX_DLLPUBLIC SdrViewIter sal_uInt32 mnOutDevNum; // bitfield - unsigned mbNoMasterPage : 1; + bool mbNoMasterPage : 1; private: SVX_DLLPRIVATE void ImpInitVars(); SVX_DLLPRIVATE SdrView* ImpFindView(); - SVX_DLLPRIVATE sal_Bool ImpCheckPageView(SdrPageView* pPV) const; + SVX_DLLPRIVATE bool ImpCheckPageView(SdrPageView* pPV) const; public: - SdrViewIter(const SdrPage* pPage, sal_Bool bNoMasterPage = sal_False); - SdrViewIter(const SdrObject* pObject, sal_Bool bNoMasterPage = sal_False); + SdrViewIter(const SdrPage* pPage, bool bNoMasterPage = false); + SdrViewIter(const SdrObject* pObject, bool bNoMasterPage = false); SdrView* FirstView(); SdrView* NextView(); diff --git a/include/svx/svdxcgv.hxx b/include/svx/svdxcgv.hxx index 010df2e0af0e..fa18cb5631b5 100644 --- a/include/svx/svdxcgv.hxx +++ b/include/svx/svdxcgv.hxx @@ -33,10 +33,10 @@ protected: void ImpGetPasteObjList(Point& rPos, SdrObjList*& rpLst); void ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, sal_uInt32 nOptions); - sal_Bool ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const; + bool ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const; // liefert True, wenn rPt geaendert wurde - sal_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 @@ -103,16 +103,16 @@ public: // View angezeigt wird. // Gueltige Werte fuer nOptions sind SDRINSERT_DONTMARK und // SDRINSERT_ADDMARK (siehe svdedtv.hxx). - virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); - sal_Bool Paste(const OUString& rStr, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); - sal_Bool Paste(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); + virtual bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); + bool Paste(const OUString& rStr, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); + bool Paste(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); - sal_Bool Cut( sal_uIntPtr nFormat = SDR_ANYFORMAT ); + bool Cut( sal_uIntPtr nFormat = SDR_ANYFORMAT ); - sal_Bool Yank( sal_uIntPtr nFormat = SDR_ANYFORMAT ); + bool Yank( sal_uIntPtr nFormat = SDR_ANYFORMAT ); - sal_Bool Paste( Window* pWin = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT ); - sal_Bool PasteClipboard( OutputDevice* pOut = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT, sal_uInt32 nOptions = 0 ); + bool Paste( Window* pWin = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT ); + bool PasteClipboard( OutputDevice* pOut = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT, sal_uInt32 nOptions = 0 ); }; #endif // INCLUDED_SVX_SVDXCGV_HXX diff --git a/include/svx/view3d.hxx b/include/svx/view3d.hxx index 943cdb39cbbe..db502f55f785 100644 --- a/include/svx/view3d.hxx +++ b/include/svx/view3d.hxx @@ -86,7 +86,7 @@ public: // Access to the default attributes. E3dDefaultAttributes& Get3DDefaultAttributes() { return a3DDefaultAttr; } - virtual sal_Bool BegDragObj(const Point& rPnt, OutputDevice* pOut = NULL, SdrHdl* pHdl = NULL, short nMinMov = -3, SdrDragMethod* pForcedMeth = NULL); + virtual bool BegDragObj(const Point& rPnt, OutputDevice* pOut = NULL, SdrHdl* pHdl = NULL, short nMinMov = -3, SdrDragMethod* pForcedMeth = NULL); virtual void CheckPossibilities(); // Get/Set Event @@ -98,7 +98,7 @@ public: // On Paste: We need to insert the objects of the Scene, but not the Scene itself using SdrView::Paste; - virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); + virtual bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); // #83403# Service routine used from local Clone() and from SdrCreateView::EndCreateObj(...) bool ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point aOffset); |