Kaydet (Commit) 23248ed8 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

sfx2: sal_Bool -> bool

Change-Id: I2db25fa6f7b9fdc2096e622918b7e55228960a94
üst b53b5081
...@@ -299,13 +299,13 @@ throw (css::uno::RuntimeException, std::exception) ...@@ -299,13 +299,13 @@ throw (css::uno::RuntimeException, std::exception)
{ {
m_pWrkWin->MakeVisible_Impl( true ); m_pWrkWin->MakeVisible_Impl( true );
m_pWrkWin->ShowChildren_Impl(); m_pWrkWin->ShowChildren_Impl();
m_pWrkWin->ArrangeChildren_Impl( sal_True ); m_pWrkWin->ArrangeChildren_Impl( true );
} }
else if ( eLayoutEvent == css::frame::LayoutManagerEvents::INVISIBLE ) else if ( eLayoutEvent == css::frame::LayoutManagerEvents::INVISIBLE )
{ {
m_pWrkWin->MakeVisible_Impl( false ); m_pWrkWin->MakeVisible_Impl( false );
m_pWrkWin->HideChildren_Impl(); m_pWrkWin->HideChildren_Impl();
m_pWrkWin->ArrangeChildren_Impl( sal_True ); m_pWrkWin->ArrangeChildren_Impl( true );
} }
else if ( eLayoutEvent == css::frame::LayoutManagerEvents::LOCK ) else if ( eLayoutEvent == css::frame::LayoutManagerEvents::LOCK )
{ {
...@@ -754,12 +754,12 @@ void SfxWorkWindow::DeleteControllers_Impl() ...@@ -754,12 +754,12 @@ void SfxWorkWindow::DeleteControllers_Impl()
// Virtual method for placing the child window. // Virtual method for placing the child window.
void SfxWorkWindow::ArrangeChildren_Impl( sal_Bool /*bForce*/) void SfxWorkWindow::ArrangeChildren_Impl( bool /*bForce*/)
{ {
Arrange_Impl(); Arrange_Impl();
} }
void SfxFrameWorkWin_Impl::ArrangeChildren_Impl( sal_Bool bForce ) void SfxFrameWorkWin_Impl::ArrangeChildren_Impl( bool bForce )
{ {
if ( pFrame->IsClosing_Impl() || ( m_nLock && !bForce )) if ( pFrame->IsClosing_Impl() || ( m_nLock && !bForce ))
return; return;
...@@ -1235,7 +1235,7 @@ void SfxFrameWorkWin_Impl::UpdateObjectBars_Impl() ...@@ -1235,7 +1235,7 @@ void SfxFrameWorkWin_Impl::UpdateObjectBars_Impl()
pWork = pWork->GetParent_Impl(); pWork = pWork->GetParent_Impl();
} }
ArrangeChildren_Impl( sal_False ); ArrangeChildren_Impl( false );
pWork = pParent; pWork = pParent;
while ( pWork ) while ( pWork )
...@@ -2736,7 +2736,7 @@ void SfxWorkWindow::SetActiveChild_Impl( Window *pChild ) ...@@ -2736,7 +2736,7 @@ void SfxWorkWindow::SetActiveChild_Impl( Window *pChild )
pActiveChild = pChild; pActiveChild = pChild;
} }
bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward ) bool SfxWorkWindow::ActivateNextChild_Impl( bool bForward )
{ {
// Sort all children under list // Sort all children under list
std::vector<sal_uInt16> aList; std::vector<sal_uInt16> aList;
......
...@@ -277,7 +277,7 @@ public: ...@@ -277,7 +277,7 @@ public:
void ShowChildren_Impl(); void ShowChildren_Impl();
void HideChildren_Impl(); void HideChildren_Impl();
bool PrepareClose_Impl(); bool PrepareClose_Impl();
virtual void ArrangeChildren_Impl( sal_Bool bForce = sal_True ); virtual void ArrangeChildren_Impl( bool bForce = true );
void DeleteControllers_Impl(); void DeleteControllers_Impl();
void HidePopups_Impl(bool bHide, bool bParent=false, sal_uInt16 nId=0); void HidePopups_Impl(bool bHide, bool bParent=false, sal_uInt16 nId=0);
void ConfigChild_Impl(SfxChildIdentifier, void ConfigChild_Impl(SfxChildIdentifier,
...@@ -317,7 +317,7 @@ public: ...@@ -317,7 +317,7 @@ public:
bool IsVisible_Impl( sal_uInt16 nMode ) const; bool IsVisible_Impl( sal_uInt16 nMode ) const;
bool IsFloating( sal_uInt16 nId ); bool IsFloating( sal_uInt16 nId );
void SetActiveChild_Impl( Window *pChild ); 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; bool AllowChildWindowCreation_Impl( const SfxChildWin_Impl& i_rCW ) const;
// Methods for StatusBar // Methods for StatusBar
...@@ -334,7 +334,7 @@ class SfxFrameWorkWin_Impl : public SfxWorkWindow ...@@ -334,7 +334,7 @@ class SfxFrameWorkWin_Impl : public SfxWorkWindow
SfxFrame* pFrame; SfxFrame* pFrame;
public: public:
SfxFrameWorkWin_Impl( Window* pWin, SfxFrame* pFrm, SfxFrame* pMaster ); 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 void UpdateObjectBars_Impl() SAL_OVERRIDE;
virtual Rectangle GetTopRect_Impl() SAL_OVERRIDE; virtual Rectangle GetTopRect_Impl() SAL_OVERRIDE;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment