diff options
author | Jan Holesovsky <kendy@suse.cz> | 2013-04-09 12:33:21 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2013-04-09 17:44:46 +0200 |
commit | 1dd6e02f15266560c59948c144983ca2ec06d463 (patch) | |
tree | 1cb188bd10ef7557990471d4ea1e7e8f398a9daf /framework | |
parent | be91ca51ee5da0c88de1ba23b3d384731b0dd610 (diff) |
sal_Bool -> bool.
Change-Id: I12eaceb304ef67c533dc23db3f6b666bdb6a7a1f
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/uielement/toolbarmanager.hxx | 18 | ||||
-rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 32 |
2 files changed, 25 insertions, 25 deletions
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index c4f9c7bc23f4..8b77a96cedb2 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -175,15 +175,15 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener typedef BaseHash< SubToolBarControllerVector > SubToolBarToSubToolBarControllerMap; typedef ::boost::unordered_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > > MenuDescriptionMap; - sal_Bool m_bDisposed : 1, - m_bSmallSymbols : 1, - m_bModuleIdentified : 1, - m_bAddedToTaskPaneList : 1, - m_bVerticalTextEnabled : 1, - m_bFrameActionRegistered : 1, - m_bUpdateControllers : 1; - sal_Bool m_bImageOrientationRegistered : 1, - m_bImageMirrored : 1; + bool m_bDisposed : 1, + m_bSmallSymbols : 1, + m_bModuleIdentified : 1, + m_bAddedToTaskPaneList : 1, + m_bVerticalTextEnabled : 1, + m_bFrameActionRegistered : 1, + m_bUpdateControllers : 1, + m_bImageOrientationRegistered : 1, + m_bImageMirrored : 1; long m_lImageRotation; ToolBar* m_pToolBar; OUString m_aModuleIdentifier; diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 5d1000c5eecf..c820f984e257 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -213,14 +213,14 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext, ToolBar* pToolBar ) : ThreadHelpBase( &Application::GetSolarMutex() ), OWeakObject(), - m_bDisposed( sal_False ), + m_bDisposed( false ), m_bSmallSymbols( !SvtMiscOptions().AreCurrentSymbolsLarge() ), - m_bModuleIdentified( sal_False ), - m_bAddedToTaskPaneList( sal_True ), - m_bFrameActionRegistered( sal_False ), - m_bUpdateControllers( sal_False ), - m_bImageOrientationRegistered( sal_False ), - m_bImageMirrored( sal_False ), + m_bModuleIdentified( false ), + m_bAddedToTaskPaneList( true ), + m_bFrameActionRegistered( false ), + m_bUpdateControllers( false ), + m_bImageOrientationRegistered( false ), + m_bImageMirrored( false ), m_lImageRotation( 0 ), m_pToolBar( pToolBar ), m_aResourceName( rResourceName ), @@ -296,7 +296,7 @@ void ToolBarManager::Destroy() if ( pWindow ) ((SystemWindow *)pWindow)->GetTaskPaneList()->RemoveWindow( m_pToolBar ); - m_bAddedToTaskPaneList = sal_False; + m_bAddedToTaskPaneList = false; } // Delete the additional add-ons data @@ -465,7 +465,7 @@ void ToolBarManager::UpdateControllers() if ( !m_bUpdateControllers ) { - m_bUpdateControllers = sal_True; + m_bUpdateControllers = true; ToolBarControllerMap::iterator pIter = m_aControllerMap.begin(); while ( pIter != m_aControllerMap.end() ) @@ -482,7 +482,7 @@ void ToolBarManager::UpdateControllers() ++pIter; } } - m_bUpdateControllers = sal_False; + m_bUpdateControllers = false; } //for update toolbar controller via Support Visible @@ -492,7 +492,7 @@ void ToolBarManager::UpdateController( ::com::sun::star::uno::Reference< ::com:: if ( !m_bUpdateControllers ) { - m_bUpdateControllers = sal_True; + m_bUpdateControllers = true; try { if(xController.is()) { @@ -507,7 +507,7 @@ void ToolBarManager::UpdateController( ::com::sun::star::uno::Reference< ::com:: } - m_bUpdateControllers = sal_False; + m_bUpdateControllers = false; } void ToolBarManager::frameAction( const FrameActionEvent& Action ) @@ -666,7 +666,7 @@ void SAL_CALL ToolBarManager::dispose() throw( RuntimeException ) m_xModuleAcceleratorManager.clear(); m_xDocAcceleratorManager.clear(); - m_bDisposed = sal_True; + m_bDisposed = true; } } @@ -817,7 +817,7 @@ uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const Reference< XModuleManager2 > xModuleManager = ModuleManager::create( m_xContext ); Reference< XInterface > xIfac( m_xFrame, UNO_QUERY ); - m_bModuleIdentified = sal_True; + m_bModuleIdentified = true; m_aModuleIdentifier = xModuleManager->identify( xIfac ); if ( !m_aModuleIdentifier.isEmpty() ) @@ -1124,7 +1124,7 @@ void ToolBarManager::AddFrameActionListener() { if ( !m_bFrameActionRegistered && m_xFrame.is() ) { - m_bFrameActionRegistered = sal_True; + m_bFrameActionRegistered = true; m_xFrame->addFrameActionListener( Reference< XFrameActionListener >( static_cast< ::cppu::OWeakObject *>( this ), UNO_QUERY )); } @@ -1134,7 +1134,7 @@ void ToolBarManager::AddImageOrientationListener() { if ( !m_bImageOrientationRegistered && m_xFrame.is() ) { - m_bImageOrientationRegistered = sal_True; + m_bImageOrientationRegistered = true; ImageOrientationListener* pImageOrientation = new ImageOrientationListener( Reference< XStatusListener >( static_cast< ::cppu::OWeakObject *>( this ), UNO_QUERY ), m_xContext, |