summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-24 11:45:27 +0200
committerNoel Grandin <noel@peralex.com>2014-03-25 14:32:55 +0200
commit2d3a1d2a462c556f58bcae4371376cc8e4b16af3 (patch)
tree59129af882eb76c934e990b55fec5d779fe1b5ca /include
parentbdd2df77234e1df3d9795f45239d2f442e90670c (diff)
svtools: sal_Bool->bool
Change-Id: I6c57a52b4fc3ecb993af4526fefcca352ad269b5
Diffstat (limited to 'include')
-rw-r--r--include/svtools/scrwin.hxx2
-rw-r--r--include/svtools/simptabl.hxx18
-rw-r--r--include/svtools/statusbarcontroller.hxx2
-rw-r--r--include/svtools/stringtransfer.hxx2
-rw-r--r--include/svtools/svlbitm.hxx34
-rw-r--r--include/svtools/svmedit2.hxx4
6 files changed, 31 insertions, 31 deletions
diff --git a/include/svtools/scrwin.hxx b/include/svtools/scrwin.hxx
index 47eb307d481a..512498f2d6d7 100644
--- a/include/svtools/scrwin.hxx
+++ b/include/svtools/scrwin.hxx
@@ -52,7 +52,7 @@ private:
ScrollBar aVScroll; // the scrollbars
ScrollBar aHScroll;
ScrollBarBox aCornerWin; // window in the bottom right corner
- sal_Bool bScrolling:1, // user controlled scrolling
+ bool bScrolling:1, // user controlled scrolling
bHandleDragging:1, // scroll window while dragging
bHCenter:1,
bVCenter:1;
diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx
index 098d3f6e8e30..f1615604420e 100644
--- a/include/svtools/simptabl.hxx
+++ b/include/svtools/simptabl.hxx
@@ -55,10 +55,10 @@ private:
CommandEvent aCEvt;
HeaderBar aHeaderBar;
long nOldPos;
- sal_uInt16 nHeaderItemId;
- sal_Bool bPaintFlag;
- sal_Bool bSortDirection;
- sal_uInt16 nSortCol;
+ sal_uInt16 nHeaderItemId;
+ bool bPaintFlag;
+ bool bSortDirection;
+ sal_uInt16 nSortCol;
DECL_LINK( StartDragHdl, HeaderBar* );
DECL_LINK( DragHdl, HeaderBar* );
@@ -100,20 +100,20 @@ public:
void ShowTable();
void HideTable();
- sal_Bool IsVisible() const;
+ bool IsVisible() const;
void EnableTable();
void DisableTable();
- sal_Bool IsEnabled() const;
+ bool IsEnabled() const;
sal_uInt16 GetSelectedCol();
- void SortByCol(sal_uInt16,sal_Bool bDir=sal_True);
- sal_Bool GetSortDirection(){ return bSortDirection;}
+ void SortByCol(sal_uInt16, bool bDir=true);
+ bool GetSortDirection(){ return bSortDirection;}
sal_uInt16 GetSortedCol(){ return nSortCol;}
SvLBoxItem* GetEntryAtPos( SvTreeListEntry* pEntry, sal_uInt16 nPos ) const;
CommandEvent GetCommandEvent()const;
- inline sal_Bool IsFocusOnCellEnabled() const { return IsCellFocusEnabled(); }
+ inline bool IsFocusOnCellEnabled() const { return IsCellFocusEnabled(); }
void SetCommandHdl( const Link& rLink ) { aCommandLink = rLink; }
const Link& GetCommandHdl() const { return aCommandLink; }
diff --git a/include/svtools/statusbarcontroller.hxx b/include/svtools/statusbarcontroller.hxx
index a6ed6146d5a4..ccb0aaa57774 100644
--- a/include/svtools/statusbarcontroller.hxx
+++ b/include/svtools/statusbarcontroller.hxx
@@ -117,7 +117,7 @@ class SVT_DLLPUBLIC StatusbarController :
void execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs );
void execute( const OUString& aCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs );
- sal_Bool m_bInitialized : 1,
+ bool m_bInitialized : 1,
m_bDisposed : 1;
unsigned short m_nID;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame;
diff --git a/include/svtools/stringtransfer.hxx b/include/svtools/stringtransfer.hxx
index dce78ebd184e..eca545c86e1b 100644
--- a/include/svtools/stringtransfer.hxx
+++ b/include/svtools/stringtransfer.hxx
@@ -60,7 +60,7 @@ namespace svt
/** extracts a string from the system clipboard given
@return <TRUE/> if the extraction was successful, i.e. if the clipboard contained a string content
*/
- SVT_DLLPUBLIC static sal_Bool PasteString( OUString& _rContent, Window* _pWindow = NULL );
+ SVT_DLLPUBLIC static bool PasteString( OUString& _rContent, Window* _pWindow = NULL );
/** starts dragging a simple string
*/
diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx
index c74b1ec0a945..d270cb6c9ef5 100644
--- a/include/svtools/svlbitm.hxx
+++ b/include/svtools/svlbitm.hxx
@@ -48,11 +48,11 @@ private:
long nWidth;
long nHeight;
SvLBoxButtonData_Impl* pImpl;
- sal_Bool bDataOk;
+ bool bDataOk;
SvButtonState eState;
SVT_DLLPRIVATE void SetWidthAndHeight();
- SVT_DLLPRIVATE void InitData( sal_Bool bImagesFromDefault,
+ SVT_DLLPRIVATE void InitData( bool bImagesFromDefault,
bool _bRadioBtn, const Control* pControlForSettings = NULL );
public:
// include creating default images (CheckBox or RadioButton)
@@ -66,7 +66,7 @@ public:
long Height();
void SetLink( const Link& rLink) { aLink=rLink; }
const Link& GetLink() const { return aLink; }
- sal_Bool IsRadio();
+ bool IsRadio();
// weil Buttons nicht von LinkHdl abgeleitet sind
void CallLink();
@@ -85,7 +85,7 @@ public:
void SetDefaultImages( const Control* pControlForSettings = NULL );
// set images acording to the color scheeme of the Control
// pControlForSettings == NULL: settings are taken from Application
- sal_Bool HasDefaultImages( void ) const;
+ bool HasDefaultImages( void ) const;
};
// **********************************************************************
@@ -154,20 +154,20 @@ public:
virtual ~SvLBoxButton();
virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* );
virtual sal_uInt16 GetType() const;
- virtual sal_Bool ClickHdl(SvTreeListBox* pView, SvTreeListEntry* );
+ virtual bool ClickHdl(SvTreeListBox* pView, SvTreeListEntry* );
virtual void Paint(
const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry);
virtual SvLBoxItem* Create() const;
virtual void Clone( SvLBoxItem* pSource );
sal_uInt16 GetButtonFlags() const { return nItemFlags; }
- sal_Bool IsStateChecked() const { return (sal_Bool)(nItemFlags & SV_ITEMSTATE_CHECKED)!=0; }
- sal_Bool IsStateUnchecked() const { return (sal_Bool)(nItemFlags & SV_ITEMSTATE_UNCHECKED)!=0; }
- sal_Bool IsStateTristate() const { return (sal_Bool)(nItemFlags & SV_ITEMSTATE_TRISTATE)!=0; }
- sal_Bool IsStateHilighted() const { return (sal_Bool)(nItemFlags & SV_ITEMSTATE_HILIGHTED)!=0; }
+ bool IsStateChecked() const { return (nItemFlags & SV_ITEMSTATE_CHECKED)!=0; }
+ bool IsStateUnchecked() const { return (nItemFlags & SV_ITEMSTATE_UNCHECKED)!=0; }
+ bool IsStateTristate() const { return (nItemFlags & SV_ITEMSTATE_TRISTATE)!=0; }
+ bool IsStateHilighted() const { return (nItemFlags & SV_ITEMSTATE_HILIGHTED)!=0; }
void SetStateChecked();
void SetStateUnchecked();
void SetStateTristate();
- void SetStateHilighted( sal_Bool bHilight );
+ void SetStateHilighted( bool bHilight );
void SetStateInvisible();
SvLBoxButtonKind GetKind() const { return eKind; }
@@ -195,7 +195,7 @@ inline void SvLBoxButton::SetStateTristate()
nItemFlags &= SV_STATE_MASK;
nItemFlags |= SV_ITEMSTATE_TRISTATE;
}
-inline void SvLBoxButton::SetStateHilighted( sal_Bool bHilight )
+inline void SvLBoxButton::SetStateHilighted( bool bHilight )
{
if ( bHilight )
nItemFlags |= SV_ITEMSTATE_HILIGHTED;
@@ -222,7 +222,7 @@ public:
virtual void Clone( SvLBoxItem* pSource );
- sal_Bool SetModeImages( const Image& _rBitmap1, const Image& _rBitmap2 );
+ bool SetModeImages( const Image& _rBitmap1, const Image& _rBitmap2 );
void GetModeImages( Image& _rBitmap1, Image& _rBitmap2 ) const;
inline void SetBitmap1( const Image& _rImage );
@@ -231,28 +231,28 @@ public:
inline const Image& GetBitmap2( ) const;
private:
- Image& implGetImageStore( sal_Bool _bFirst );
+ Image& implGetImageStore( bool _bFirst );
};
inline void SvLBoxContextBmp::SetBitmap1( const Image& _rImage )
{
- implGetImageStore( sal_True ) = _rImage;
+ implGetImageStore( true ) = _rImage;
}
inline void SvLBoxContextBmp::SetBitmap2( const Image& _rImage )
{
- implGetImageStore( sal_False ) = _rImage;
+ implGetImageStore( false ) = _rImage;
}
inline const Image& SvLBoxContextBmp::GetBitmap1( ) const
{
- Image& rImage = const_cast< SvLBoxContextBmp* >( this )->implGetImageStore( sal_True );
+ Image& rImage = const_cast< SvLBoxContextBmp* >( this )->implGetImageStore( true );
return rImage;
}
inline const Image& SvLBoxContextBmp::GetBitmap2( ) const
{
- Image& rImage = const_cast< SvLBoxContextBmp* >( this )->implGetImageStore( sal_False );
+ Image& rImage = const_cast< SvLBoxContextBmp* >( this )->implGetImageStore( false );
return rImage;
}
diff --git a/include/svtools/svmedit2.hxx b/include/svtools/svmedit2.hxx
index f75a67087b6c..280ce2ba7fb8 100644
--- a/include/svtools/svmedit2.hxx
+++ b/include/svtools/svmedit2.hxx
@@ -32,8 +32,8 @@ public:
~ExtMultiLineEdit();
// methods of TextView
- void InsertText( const OUString& rNew, sal_Bool bSelect = sal_False );
- void SetAutoScroll( sal_Bool bAutoScroll );
+ void InsertText( const OUString& rNew, bool bSelect = false );
+ void SetAutoScroll( bool bAutoScroll );
// methods of TextEngine
void SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd );