From 23248ed8a525dd7c3e5d565a17b809086c62029d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 12 Sep 2014 11:53:16 +0200 Subject: sfx2: sal_Bool -> bool Change-Id: I2db25fa6f7b9fdc2096e622918b7e55228960a94 --- sfx2/source/appl/workwin.cxx | 12 ++++++------ sfx2/source/inc/workwin.hxx | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'sfx2') diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index b4b12132ce4c..b1f73b57d731 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -299,13 +299,13 @@ throw (css::uno::RuntimeException, std::exception) { m_pWrkWin->MakeVisible_Impl( true ); m_pWrkWin->ShowChildren_Impl(); - m_pWrkWin->ArrangeChildren_Impl( sal_True ); + m_pWrkWin->ArrangeChildren_Impl( true ); } else if ( eLayoutEvent == css::frame::LayoutManagerEvents::INVISIBLE ) { m_pWrkWin->MakeVisible_Impl( false ); m_pWrkWin->HideChildren_Impl(); - m_pWrkWin->ArrangeChildren_Impl( sal_True ); + m_pWrkWin->ArrangeChildren_Impl( true ); } else if ( eLayoutEvent == css::frame::LayoutManagerEvents::LOCK ) { @@ -754,12 +754,12 @@ void SfxWorkWindow::DeleteControllers_Impl() // Virtual method for placing the child window. -void SfxWorkWindow::ArrangeChildren_Impl( sal_Bool /*bForce*/) +void SfxWorkWindow::ArrangeChildren_Impl( bool /*bForce*/) { Arrange_Impl(); } -void SfxFrameWorkWin_Impl::ArrangeChildren_Impl( sal_Bool bForce ) +void SfxFrameWorkWin_Impl::ArrangeChildren_Impl( bool bForce ) { if ( pFrame->IsClosing_Impl() || ( m_nLock && !bForce )) return; @@ -1235,7 +1235,7 @@ void SfxFrameWorkWin_Impl::UpdateObjectBars_Impl() pWork = pWork->GetParent_Impl(); } - ArrangeChildren_Impl( sal_False ); + ArrangeChildren_Impl( false ); pWork = pParent; while ( pWork ) @@ -2736,7 +2736,7 @@ void SfxWorkWindow::SetActiveChild_Impl( Window *pChild ) pActiveChild = pChild; } -bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward ) +bool SfxWorkWindow::ActivateNextChild_Impl( bool bForward ) { // Sort all children under list std::vector aList; diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index 19a0bbc6b4ce..8671f43c06f3 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -277,7 +277,7 @@ public: void ShowChildren_Impl(); void HideChildren_Impl(); bool PrepareClose_Impl(); - virtual void ArrangeChildren_Impl( sal_Bool bForce = sal_True ); + virtual void ArrangeChildren_Impl( bool bForce = true ); void DeleteControllers_Impl(); void HidePopups_Impl(bool bHide, bool bParent=false, sal_uInt16 nId=0); void ConfigChild_Impl(SfxChildIdentifier, @@ -317,7 +317,7 @@ public: bool IsVisible_Impl( sal_uInt16 nMode ) const; bool IsFloating( sal_uInt16 nId ); void SetActiveChild_Impl( Window *pChild ); - virtual bool ActivateNextChild_Impl( sal_Bool bForward = sal_True ); + virtual bool ActivateNextChild_Impl( bool bForward = true ); bool AllowChildWindowCreation_Impl( const SfxChildWin_Impl& i_rCW ) const; // Methods for StatusBar @@ -334,7 +334,7 @@ class SfxFrameWorkWin_Impl : public SfxWorkWindow SfxFrame* pFrame; public: SfxFrameWorkWin_Impl( Window* pWin, SfxFrame* pFrm, SfxFrame* pMaster ); - virtual void ArrangeChildren_Impl( sal_Bool bForce = sal_True ) SAL_OVERRIDE; + virtual void ArrangeChildren_Impl( bool bForce = true ) SAL_OVERRIDE; virtual void UpdateObjectBars_Impl() SAL_OVERRIDE; virtual Rectangle GetTopRect_Impl() SAL_OVERRIDE; }; -- cgit