diff options
author | Noel Grandin <noel@peralex.com> | 2014-05-08 11:42:56 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-05-08 11:48:13 +0200 |
commit | b7d30cb50ede0752f1ee194655f925c77e06879a (patch) | |
tree | e9f1369976e5130ee20704344371060b0637a29a /svtools/source/hatchwindow | |
parent | 2d54aa1d22f404a1a36aaa97d3e3bf5024e89aed (diff) |
svtools: sal_Bool->bool
Change-Id: Idd9a3ccf0eb6d14cec158daa17a6b2da625f7ffa
Diffstat (limited to 'svtools/source/hatchwindow')
-rw-r--r-- | svtools/source/hatchwindow/documentcloser.cxx | 6 | ||||
-rw-r--r-- | svtools/source/hatchwindow/ipwin.cxx | 22 | ||||
-rw-r--r-- | svtools/source/hatchwindow/ipwin.hxx | 10 |
3 files changed, 19 insertions, 19 deletions
diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx index 4b6f5d759c0a..9e64a3dec7f1 100644 --- a/svtools/source/hatchwindow/documentcloser.cxx +++ b/svtools/source/hatchwindow/documentcloser.cxx @@ -51,7 +51,7 @@ class ODocumentCloser : public ::cppu::WeakImplHelper2< ::com::sun::star::lang:: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; ::cppu::OInterfaceContainerHelper* m_pListenersContainer; // list of listeners - sal_Bool m_bDisposed; + bool m_bDisposed; public: ODocumentCloser(const css::uno::Sequence< css::uno::Any >& aArguments); @@ -147,7 +147,7 @@ IMPL_STATIC_LINK( MainThreadFrameCloserRequest, worker, MainThreadFrameCloserReq ODocumentCloser::ODocumentCloser(const css::uno::Sequence< css::uno::Any >& aArguments) : m_pListenersContainer( NULL ) -, m_bDisposed( sal_False ) +, m_bDisposed( false ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_refCount ) @@ -199,7 +199,7 @@ void SAL_CALL ODocumentCloser::dispose() MainThreadFrameCloserRequest::Start( pCloser ); } - m_bDisposed = sal_True; + m_bDisposed = true; } diff --git a/svtools/source/hatchwindow/ipwin.cxx b/svtools/source/hatchwindow/ipwin.cxx index ee7ba35e401f..812601a13dff 100644 --- a/svtools/source/hatchwindow/ipwin.cxx +++ b/svtools/source/hatchwindow/ipwin.cxx @@ -34,7 +34,7 @@ SvResizeHelper::SvResizeHelper() : aBorder( 5, 5 ) , nGrab( -1 ) - , bResizeable( sal_True ) + , bResizeable( true ) { } @@ -151,7 +151,7 @@ void SvResizeHelper::InvalidateBorder( Window * pWin ) |* |* Description *************************************************************************/ -sal_Bool SvResizeHelper::SelectBegin( Window * pWin, const Point & rPos ) +bool SvResizeHelper::SelectBegin( Window * pWin, const Point & rPos ) { if( -1 == nGrab ) { @@ -160,10 +160,10 @@ sal_Bool SvResizeHelper::SelectBegin( Window * pWin, const Point & rPos ) { aSelPos = rPos; // store start position pWin->CaptureMouse(); - return sal_True; + return true; } } - return sal_False; + return false; } /************************************************************************* @@ -421,7 +421,7 @@ void SvResizeHelper::ValidateRect( Rectangle & rValidate ) const |* |* Description *************************************************************************/ -sal_Bool SvResizeHelper::SelectRelease( Window * pWin, const Point & rPos, +bool SvResizeHelper::SelectRelease( Window * pWin, const Point & rPos, Rectangle & rOutPosSize ) { if( -1 != nGrab ) @@ -431,9 +431,9 @@ sal_Bool SvResizeHelper::SelectRelease( Window * pWin, const Point & rPos, nGrab = -1; pWin->ReleaseMouse(); pWin->HideTracking(); - return sal_True; + return true; } - return sal_False; + return false; } /************************************************************************* @@ -463,7 +463,7 @@ SvResizeWindow::SvResizeWindow ) : Window( pParent, WB_CLIPCHILDREN ) , m_nMoveGrab( -1 ) - , m_bActive( sal_False ) + , m_bActive( false ) , m_pWrapper( pWrapper ) { OSL_ENSURE( pParent != NULL && pWrapper != NULL, "Wrong initialization of hatch window!\n" ); @@ -621,7 +621,7 @@ bool SvResizeWindow::PreNotify( NotifyEvent& rEvt ) { if ( rEvt.GetType() == EVENT_GETFOCUS && !m_bActive ) { - m_bActive = sal_True; + m_bActive = true; m_pWrapper->Activated(); } @@ -632,10 +632,10 @@ bool SvResizeWindow::Notify( NotifyEvent& rEvt ) { if ( rEvt.GetType() == EVENT_LOSEFOCUS && m_bActive ) { - sal_Bool bHasFocus = HasChildPathFocus(true); + bool bHasFocus = HasChildPathFocus(true); if ( !bHasFocus ) { - m_bActive = sal_False; + m_bActive = false; m_pWrapper->Deactivated(); } } diff --git a/svtools/source/hatchwindow/ipwin.hxx b/svtools/source/hatchwindow/ipwin.hxx index 357030c0ae0f..f3e9dde7137c 100644 --- a/svtools/source/hatchwindow/ipwin.hxx +++ b/svtools/source/hatchwindow/ipwin.hxx @@ -31,11 +31,11 @@ class SvResizeHelper Rectangle aOuter; short nGrab; // -1 no Grab, 0 - 7, 8 = Move, see FillHandle... Point aSelPos; - sal_Bool bResizeable; + bool bResizeable; public: SvResizeHelper(); - void SetResizeable( sal_Bool b ) { bResizeable = b; } + void SetResizeable( bool b ) { bResizeable = b; } short GetGrab() const { return nGrab; } void SetBorderPixel( const Size & rBorderP ) { aBorder = rBorderP; } @@ -59,12 +59,12 @@ public: void FillMoveRectsPixel( Rectangle aRects[ 4 ] ) const; void Draw( OutputDevice * ); void InvalidateBorder( Window * ); - sal_Bool SelectBegin( Window *, const Point & rPos ); + bool SelectBegin( Window *, const Point & rPos ); short SelectMove( Window * pWin, const Point & rPos ); Point GetTrackPosPixel( const Rectangle & rRect ) const; Rectangle GetTrackRectPixel( const Point & rTrackPos ) const; void ValidateRect( Rectangle & rValidate ) const; - sal_Bool SelectRelease( Window *, const Point & rPos, Rectangle & rOutPosSize ); + bool SelectRelease( Window *, const Point & rPos, Rectangle & rOutPosSize ); void Release( Window * pWin ); }; @@ -76,7 +76,7 @@ class SvResizeWindow : public Window Pointer m_aOldPointer; short m_nMoveGrab; // last pointer type SvResizeHelper m_aResizer; - sal_Bool m_bActive; + bool m_bActive; VCLXHatchWindow* m_pWrapper; public: |