summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-05 16:23:36 +0200
committerNoel Grandin <noel@peralex.com>2014-03-11 08:18:20 +0200
commitaaee84c4c865ee121de6d9110c27d51c90dc936b (patch)
treed742fce3620d867f949784a425e1c003d2d4d240 /include
parent37a2ed040e0e11ecef115d8955e09845aeff7511 (diff)
svx: sal_Bool->bool
Change-Id: I26a7bded5138d646c67ae396690659ee13ba9f36
Diffstat (limited to 'include')
-rw-r--r--include/svx/relfld.hxx14
-rw-r--r--include/svx/rubydialog.hxx6
-rw-r--r--include/svx/ruler.hxx34
-rw-r--r--include/svx/rulritem.hxx24
4 files changed, 39 insertions, 39 deletions
diff --git a/include/svx/relfld.hxx b/include/svx/relfld.hxx
index 80fa2c4c8034..f841bbf3d3b0 100644
--- a/include/svx/relfld.hxx
+++ b/include/svx/relfld.hxx
@@ -31,9 +31,9 @@ private:
sal_uInt16 nRelMin;
sal_uInt16 nRelMax;
sal_uInt16 nRelStep;
- sal_Bool bRelativeMode;
- sal_Bool bRelative;
- sal_Bool bNegativeEnabled;
+ bool bRelativeMode;
+ bool bRelative;
+ bool bNegativeEnabled;
protected:
void Modify();
@@ -43,10 +43,10 @@ public:
void EnableRelativeMode( sal_uInt16 nMin = 50, sal_uInt16 nMax = 150,
sal_uInt16 nStep = 5 );
- sal_Bool IsRelativeMode() const { return bRelativeMode; }
- void SetRelative( sal_Bool bRelative = sal_False );
- sal_Bool IsRelative() const { return bRelative; }
- void EnableNegativeMode() {bNegativeEnabled = sal_True;}
+ bool IsRelativeMode() const { return bRelativeMode; }
+ void SetRelative( bool bRelative = false );
+ bool IsRelative() const { return bRelative; }
+ void EnableNegativeMode() {bNegativeEnabled = true;}
};
diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx
index b8010ac79155..e6dc19bd990b 100644
--- a/include/svx/rubydialog.hxx
+++ b/include/svx/rubydialog.hxx
@@ -120,7 +120,7 @@ class SvxRubyDialog : public SfxModelessDialog
long nLastPos;
long nCurrentEdit;
- sal_Bool bModified;
+ bool bModified;
com::sun::star::uno::Reference<com::sun::star::view::XSelectionChangeListener> xImpl;
SfxBindings* pBindings;
@@ -148,8 +148,8 @@ class SvxRubyDialog : public SfxModelessDialog
long GetLastPos() const {return nLastPos;}
void SetLastPos(long nSet) {nLastPos = nSet;}
- sal_Bool IsModified() const {return bModified;}
- void SetModified(sal_Bool bSet) {bModified = bSet;}
+ bool IsModified() const {return bModified;}
+ void SetModified(bool bSet) {bModified = bSet;}
void EnableControls(bool bEnable);
diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx
index e12cf2a4aa7a..a3705fecf66d 100644
--- a/include/svx/ruler.hxx
+++ b/include/svx/ruler.hxx
@@ -61,8 +61,8 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
boost::scoped_ptr<SvxRuler_Impl> mpRulerImpl;
- sal_Bool bAppSetNullOffset :1;
- sal_Bool bHorz :1;
+ bool bAppSetNullOffset :1;
+ bool bHorz :1;
long lLogicNullOffset; // in logic coordinates
long lAppNullOffset; // in logic coordinates
long lMinFrame; // minimal frame width in pixels
@@ -97,16 +97,16 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
long nDragOffset;
long nMaxLeft;
long nMaxRight;
- sal_Bool bValid;
- sal_Bool bListening;
- sal_Bool bActive;
+ bool bValid;
+ bool bListening;
+ bool bActive;
bool mbCoarseSnapping;
bool mbSnapping;
void StartListening_Impl();
- long GetCorrectedDragPos(sal_Bool bLeft = sal_True, sal_Bool bRight = sal_True );
- void DrawLine_Impl(long &lTabPos, int, sal_Bool Horizontal=sal_True);
+ long GetCorrectedDragPos(bool bLeft = true, bool bRight = true );
+ void DrawLine_Impl(long &lTabPos, int, bool Horizontal = true);
sal_uInt16 GetObjectBordersOff(sal_uInt16 nIdx) const;
// page borders or surrounding frame
@@ -224,18 +224,18 @@ protected:
// calculation of boundary values for object borders
// values refer to the page
- virtual sal_Bool CalcLimits(long &nMax1, long &nMax2, sal_Bool bFirst) const;
- sal_Bool IsActLastColumn(
- sal_Bool bForceDontConsiderHidden = sal_False,
+ virtual bool CalcLimits(long &nMax1, long &nMax2, bool bFirst) const;
+ bool IsActLastColumn(
+ bool bForceDontConsiderHidden = false,
sal_uInt16 nAct=USHRT_MAX) const;
- sal_Bool IsActFirstColumn(
- sal_Bool bForceDontConsiderHidden = sal_False,
+ bool IsActFirstColumn(
+ bool bForceDontConsiderHidden = false,
sal_uInt16 nAct=USHRT_MAX) const;
sal_uInt16 GetActLeftColumn(
- sal_Bool bForceDontConsiderHidden = sal_False,
+ bool bForceDontConsiderHidden = false,
sal_uInt16 nAct=USHRT_MAX ) const;
sal_uInt16 GetActRightColumn (
- sal_Bool bForceDontConsiderHidden = sal_False,
+ bool bForceDontConsiderHidden = false,
sal_uInt16 nAct=USHRT_MAX ) const;
long CalcPropMaxRight(sal_uInt16 nCol = USHRT_MAX) const;
long GetPageWidth() const;
@@ -272,8 +272,8 @@ public:
return lAppNullOffset;
}
- void SetActive(sal_Bool bOn = sal_True);
- sal_Bool IsActive() const
+ void SetActive(bool bOn = true);
+ bool IsActive() const
{
return bActive;
}
@@ -284,7 +284,7 @@ public:
}
//#i24363# tab stops relative to indent
- void SetTabsRelativeToIndent( sal_Bool bRel = sal_True );
+ void SetTabsRelativeToIndent( bool bRel = true );
};
#endif
diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx
index 9c93036445ff..0891c1003160 100644
--- a/include/svx/rulritem.hxx
+++ b/include/svx/rulritem.hxx
@@ -127,7 +127,7 @@ struct SVX_DLLPUBLIC SvxColumnDescription
{
long nStart; /* Start of the column */
long nEnd; /* End of the column */
- sal_Bool bVisible; /* Visibility */
+ bool bVisible; /* Visibility */
long nEndMin; //min. possible position of end
long nEndMax; //max. possible position of end
@@ -136,10 +136,10 @@ struct SVX_DLLPUBLIC SvxColumnDescription
SvxColumnDescription(const SvxColumnDescription &rCopy);
- SvxColumnDescription(long start, long end, sal_Bool bVis = sal_True);
+ SvxColumnDescription(long start, long end, bool bVis = true);
SvxColumnDescription(long start, long end,
- long endMin, long endMax, sal_Bool bVis = sal_True);
+ long endMin, long endMax, bool bVis = true);
bool operator==(const SvxColumnDescription &rCmp) const;
bool operator!=(const SvxColumnDescription &rCmp) const;
@@ -195,14 +195,14 @@ public:
void SetLeft(long aLeft);
void SetRight(long aRight);
sal_uInt16 GetActColumn() const;
- sal_Bool IsFirstAct() const;
- sal_Bool IsLastAct() const;
+ bool IsFirstAct() const;
+ bool IsLastAct() const;
long GetLeft();
long GetRight();
- sal_Bool IsTable() const;
- sal_Bool CalcOrtho() const;
- void SetOrtho(sal_Bool bVal);
- sal_Bool IsConsistent() const;
+ bool IsTable() const;
+ bool CalcOrtho() const;
+ void SetOrtho(bool bVal);
+ bool IsConsistent() const;
};
// class SvxObjectItem ---------------------------------------------------
@@ -214,7 +214,7 @@ private:
long nEndX; /* End in x direction */
long nStartY; /* Start in y direction */
long nEndY; /* Ende in y direction */
- sal_Bool bLimits; /* boundary limit control by the application */
+ bool bLimits; /* boundary limit control by the application */
protected:
virtual bool operator==( const SfxPoolItem& ) const;
@@ -236,10 +236,10 @@ public:
TYPEINFO();
SvxObjectItem(long nStartX, long nEndX,
long nStartY, long nEndY,
- sal_Bool bLimits = sal_False);
+ bool bLimits = false);
SvxObjectItem(const SvxObjectItem& rCopy);
- sal_Bool HasLimits() const;
+ bool HasLimits() const;
long GetStartX() const;
long GetEndX() const;