summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-28 19:57:37 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-28 20:26:17 +0100
commit0d957046f103605ba51b2a59a8f4c463ca33010a (patch)
tree66acd5576bd19167c14837d8b036673485f252bc /include
parentbd9581d46d78c5742fbb50f1b4a9ff2fc1dae7e8 (diff)
bool improvements
Change-Id: Ic32faa81bfbb66a9d8632fb3db187e33c31188ed
Diffstat (limited to 'include')
-rw-r--r--include/svx/svddrag.hxx8
-rw-r--r--include/svx/svdmodel.hxx2
-rw-r--r--include/svx/svdoedge.hxx2
-rw-r--r--include/svx/svdomeas.hxx2
-rw-r--r--include/svx/svdpage.hxx2
-rw-r--r--include/svx/svdtrans.hxx16
-rw-r--r--include/svx/svdundo.hxx2
7 files changed, 17 insertions, 17 deletions
diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx
index b88d70c5a072..ef29454828ed 100644
--- a/include/svx/svddrag.hxx
+++ b/include/svx/svddrag.hxx
@@ -94,7 +94,7 @@ protected:
SdrDragStatUserData* pUser; // Userdata
public:
SdrDragStat(): aPnts() { pUser=NULL; Reset(); }
- ~SdrDragStat() { Clear(sal_False); }
+ ~SdrDragStat() { Clear(false); }
void Reset();
SdrView* GetView() const { return pView; }
void SetView(SdrView* pV) { pView=pV; }
@@ -124,8 +124,8 @@ public:
void SetShown(bool bOn) { bShown=bOn; }
bool IsMinMoved() const { return bMinMoved; }
- void SetMinMoved() { bMinMoved=sal_True; }
- void ResetMinMoved() { bMinMoved=sal_False; }
+ void SetMinMoved() { bMinMoved=true; }
+ void ResetMinMoved() { bMinMoved=false; }
void SetMinMove(sal_uInt16 nDist) { nMinMov=nDist; if (nMinMov<1) nMinMov=1; }
sal_uInt16 GetMinMove() const { return nMinMov; }
@@ -160,7 +160,7 @@ public:
Point KorregPos(const Point& rNow, const Point& rPrev) const;
void Reset(const Point& rPnt);
void NextMove(const Point& rPnt);
- void NextPoint(bool bSaveReal=sal_False);
+ void NextPoint(bool bSaveReal=false);
void PrevPoint();
bool CheckMinMoved(const Point& rPnt);
long GetDX() const { return GetNow().X()-GetPrev().X(); }
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 81df0c4a9dcb..8a3796ad3640 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -299,7 +299,7 @@ public:
void ClearModel(sal_Bool bCalledFromDestructor);
// Hier kann man erfragen, ob das Model gerade eingrstreamt wird
- bool IsLoading() const { return sal_False /*BFS01 bLoading */; }
+ bool IsLoading() const { return false /*BFS01 bLoading */; }
// Muss z.B. ueberladen werden, um das Swappen/LoadOnDemand von Grafiken
// zu ermoeglichen. Wird rbDeleteAfterUse auf sal_True gesetzt, so wird
// die SvStream-Instanz vom Aufrufer nach Gebrauch destruiert.
diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx
index 95faaba88770..e0b4d28f74af 100644
--- a/include/svx/svdoedge.hxx
+++ b/include/svx/svdoedge.hxx
@@ -232,7 +232,7 @@ public:
// bTail1=TRUE: Linienanfang, sonst LinienEnde
// pObj=NULL: Disconnect
- void SetEdgeTrackDirty() { bEdgeTrackDirty=sal_True; }
+ void SetEdgeTrackDirty() { bEdgeTrackDirty=true; }
void ConnectToNode(bool bTail1, SdrObject* pObj);
void DisconnectFromNode(bool bTail1);
SdrObject* GetConnectedNode(bool bTail1) const;
diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx
index 73c32d09ccff..8167685d3d01 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=sal_True; SetTextSizeDirty(); if (!aOutRect.IsEmpty()) { SetBoundRectDirty(); SetRectsDirty(sal_True); } }
+ void SetTextDirty() { bTextDirty=true; SetTextSizeDirty(); if (!aOutRect.IsEmpty()) { SetBoundRectDirty(); SetRectsDirty(sal_True); } }
void UndirtyText() const;
virtual SdrObjGeoData* NewGeoData() const;
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index 371443d1bc69..c6cfea4defbc 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -107,7 +107,7 @@ public:
// !!! Diese Methode nur fuer Leute, die ganz genau wissen was sie tun !!!
// #110094# This should not be needed (!)
- void SetObjOrdNumsDirty() { bObjOrdNumsDirty=sal_True; }
+ void SetObjOrdNumsDirty() { bObjOrdNumsDirty=true; }
// pModel, pPage, pUpList und pOwnerObj werden Zuweisungeoperator nicht veraendert!
void operator=(const SdrObjList& rSrcList);
void CopyObjects(const SdrObjList& rSrcList);
diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index da234a7971c1..c275e81399f4 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -280,14 +280,14 @@ private:
SVX_DLLPRIVATE void Undirty();
SVX_DLLPRIVATE void ForceUndirty() const { if (bDirty) ((SdrFormatter*)this)->Undirty(); }
public:
- SdrFormatter(MapUnit eSrc, MapUnit eDst) { eSrcMU=eSrc; bSrcFU=sal_False; eDstMU=eDst; bDstFU=sal_False; bDirty=sal_True; }
- SdrFormatter(MapUnit eSrc, FieldUnit eDst) { eSrcMU=eSrc; bSrcFU=sal_False; eDstFU=eDst; bDstFU=sal_True; bDirty=sal_True; }
- SdrFormatter(FieldUnit eSrc, MapUnit eDst) { eSrcFU=eSrc; bSrcFU=sal_True; eDstMU=eDst; bDstFU=sal_False; bDirty=sal_True; }
- SdrFormatter(FieldUnit eSrc, FieldUnit eDst) { eSrcFU=eSrc; bSrcFU=sal_True; eDstFU=eDst; bDstFU=sal_True; bDirty=sal_True; }
- void SetSourceUnit(MapUnit eSrc) { eSrcMU=eSrc; bSrcFU=sal_False; bDirty=sal_True; }
- void SetSourceUnit(FieldUnit eSrc) { eSrcFU=eSrc; bSrcFU=sal_True; bDirty=sal_True; }
- void SetDestinationUnit(MapUnit eDst) { eDstMU=eDst; bDstFU=sal_False; bDirty=sal_True; }
- void SetDestinationUnit(FieldUnit eDst) { eDstFU=eDst; bDstFU=sal_True; bDirty=sal_True; }
+ SdrFormatter(MapUnit eSrc, MapUnit eDst) { eSrcMU=eSrc; bSrcFU=false; eDstMU=eDst; bDstFU=false; bDirty=true; }
+ SdrFormatter(MapUnit eSrc, FieldUnit eDst) { eSrcMU=eSrc; bSrcFU=false; eDstFU=eDst; bDstFU=true; bDirty=true; }
+ SdrFormatter(FieldUnit eSrc, MapUnit eDst) { eSrcFU=eSrc; bSrcFU=true; eDstMU=eDst; bDstFU=false; bDirty=true; }
+ SdrFormatter(FieldUnit eSrc, FieldUnit eDst) { eSrcFU=eSrc; bSrcFU=true; eDstFU=eDst; bDstFU=true; bDirty=true; }
+ void SetSourceUnit(MapUnit eSrc) { eSrcMU=eSrc; bSrcFU=false; bDirty=true; }
+ void SetSourceUnit(FieldUnit eSrc) { eSrcFU=eSrc; bSrcFU=true; bDirty=true; }
+ void SetDestinationUnit(MapUnit eDst) { eDstMU=eDst; bDstFU=false; bDirty=true; }
+ void SetDestinationUnit(FieldUnit eDst) { eDstFU=eDst; bDstFU=true; bDirty=true; }
void TakeStr(long nVal, OUString& rStr) const;
static void TakeUnitStr(MapUnit eUnit, OUString& rStr);
static void TakeUnitStr(FieldUnit eUnit, OUString& rStr);
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index b6a48c20c190..b02f1204152d 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -515,7 +515,7 @@ class SdrUndoDelLayer : public SdrUndoLayer
{
public:
SdrUndoDelLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel)
- : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel) { bItsMine=sal_True; }
+ : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel) { bItsMine=true; }
virtual void Undo();
virtual void Redo();