diff options
author | Noel Grandin <noel@peralex.com> | 2014-04-04 15:53:21 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-04-07 13:53:49 +0200 |
commit | a6287e21f1dab6ae382c24ceeb4c0212b7cad2d7 (patch) | |
tree | f0bb68a88c56647fc9165ec69cc05cd5bc441ea6 /framework/source/uifactory | |
parent | c2e98d3cc9e2642d746a9933fcd91230a7378aa1 (diff) |
framework: sal_Bool->bool
Change-Id: Ia6e87e2b382bd4005637e14088bde9e809996a25
Diffstat (limited to 'framework/source/uifactory')
6 files changed, 40 insertions, 40 deletions
diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx index 26f61b472bd8..fc61ca299836 100644 --- a/framework/source/uifactory/addonstoolbarfactory.cxx +++ b/framework/source/uifactory/addonstoolbarfactory.cxx @@ -81,7 +81,7 @@ public: // XUIElementFactory virtual css::uno::Reference< css::ui::XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const css::uno::Sequence< css::beans::PropertyValue >& Args ) throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - sal_Bool hasButtonsInContext( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rPropSeq, + bool hasButtonsInContext( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rPropSeq, const css::uno::Reference< css::frame::XFrame >& rFrame ); private: @@ -100,10 +100,10 @@ AddonsToolBarFactory::~AddonsToolBarFactory() { } -static sal_Bool IsCorrectContext( const OUString& rModuleIdentifier, const OUString& aContextList ) +static bool IsCorrectContext( const OUString& rModuleIdentifier, const OUString& aContextList ) { if ( aContextList.isEmpty() ) - return sal_True; + return true; if ( !rModuleIdentifier.isEmpty() ) { @@ -111,10 +111,10 @@ static sal_Bool IsCorrectContext( const OUString& rModuleIdentifier, const OUStr return ( nIndex >= 0 ); } - return sal_False; + return false; } -sal_Bool AddonsToolBarFactory::hasButtonsInContext( +bool AddonsToolBarFactory::hasButtonsInContext( const Sequence< Sequence< PropertyValue > >& rPropSeqSeq, const Reference< XFrame >& rFrame ) { @@ -135,8 +135,8 @@ sal_Bool AddonsToolBarFactory::hasButtonsInContext( // the current frame context. for ( sal_uInt32 i = 0; i < (sal_uInt32)rPropSeqSeq.getLength(); i++ ) { - sal_Bool bIsButton( sal_True ); - sal_Bool bIsCorrectContext( sal_False ); + bool bIsButton( true ); + bool bIsCorrectContext( false ); sal_uInt32 nPropChecked( 0 ); const Sequence< PropertyValue >& rPropSeq = rPropSeqSeq[i]; @@ -162,10 +162,10 @@ sal_Bool AddonsToolBarFactory::hasButtonsInContext( } if ( bIsButton && bIsCorrectContext ) - return sal_True; + return true; } - return sal_False; + return false; } // XUIElementFactory diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx index 6836b3a82477..3f69ae5b299e 100644 --- a/framework/source/uifactory/factoryconfiguration.cxx +++ b/framework/source/uifactory/factoryconfiguration.cxx @@ -60,7 +60,7 @@ ConfigurationAccess_ControllerFactory::ConfigurationAccess_ControllerFactory( co m_aPropController( "Controller" ), m_aPropValue( "Value" ), m_sRoot(_sRoot), - m_bConfigAccessInitialized( sal_False ), + m_bConfigAccessInitialized( false ), m_bAskValue(_bAskValue) { m_xConfigProvider = configuration::theDefaultProvider::get( rxContext ); @@ -208,7 +208,7 @@ void ConfigurationAccess_ControllerFactory::readConfigurationData() { } - m_bConfigAccessInitialized = sal_True; + m_bConfigAccessInitialized = true; } if ( m_xConfigAccess.is() ) @@ -264,7 +264,7 @@ void ConfigurationAccess_ControllerFactory::updateConfigurationData() } } -sal_Bool ConfigurationAccess_ControllerFactory::impl_getElementProps( const Any& aElement, OUString& aCommand, OUString& aModule, OUString& aServiceSpecifier,OUString& aValue ) const +bool ConfigurationAccess_ControllerFactory::impl_getElementProps( const Any& aElement, OUString& aCommand, OUString& aModule, OUString& aServiceSpecifier,OUString& aValue ) const { Reference< XPropertySet > xPropertySet; aElement >>= xPropertySet; @@ -281,15 +281,15 @@ sal_Bool ConfigurationAccess_ControllerFactory::impl_getElementProps( const Any& } catch ( const com::sun::star::beans::UnknownPropertyException& ) { - return sal_False; + return false; } catch ( const com::sun::star::lang::WrappedTargetException& ) { - return sal_False; + return false; } } - return sal_True; + return true; } } // namespace framework diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx index 78dfb910d745..1a139c4f76ec 100644 --- a/framework/source/uifactory/menubarfactory.cxx +++ b/framework/source/uifactory/menubarfactory.cxx @@ -75,8 +75,8 @@ void MenuBarFactory::CreateUIElement(const OUString& ResourceURL Reference< XUIConfigurationManager > xConfigSource; Reference< XFrame > xFrame; OUString aResourceURL( ResourceURL ); - sal_Bool bPersistent( sal_True ); - sal_Bool bExtraMode( sal_False ); + bool bPersistent( true ); + bool bExtraMode( false ); for ( sal_Int32 n = 0; n < Args.getLength(); n++ ) { diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx index ed52637ae649..50b19fe57c82 100644 --- a/framework/source/uifactory/uicontrollerfactory.cxx +++ b/framework/source/uifactory/uicontrollerfactory.cxx @@ -60,7 +60,7 @@ public: protected: UIControllerFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString &rUINode ); - sal_Bool m_bConfigRead; + bool m_bConfigRead; css::uno::Reference< css::uno::XComponentContext > m_xContext; ConfigurationAccess_ControllerFactory* m_pConfigAccess; @@ -72,7 +72,7 @@ UIControllerFactory::UIControllerFactory( const Reference< XComponentContext >& xContext, const rtl::OUString &rConfigurationNode ) : UIControllerFactory_BASE(m_aMutex) - , m_bConfigRead( sal_False ) + , m_bConfigRead( false ) , m_xContext( xContext ) , m_pConfigAccess() { @@ -108,7 +108,7 @@ throw (Exception, RuntimeException, std::exception) if ( !m_bConfigRead ) { - m_bConfigRead = sal_True; + m_bConfigRead = true; m_pConfigAccess->readConfigurationData(); } @@ -173,7 +173,7 @@ throw (Exception, RuntimeException, std::exception) if ( !m_bConfigRead ) { - m_bConfigRead = sal_True; + m_bConfigRead = true; m_pConfigAccess->readConfigurationData(); } @@ -203,7 +203,7 @@ throw (css::uno::RuntimeException, std::exception) if ( !m_bConfigRead ) { - m_bConfigRead = sal_True; + m_bConfigRead = true; m_pConfigAccess->readConfigurationData(); } @@ -221,7 +221,7 @@ throw (RuntimeException, std::exception) if ( !m_bConfigRead ) { - m_bConfigRead = sal_True; + m_bConfigRead = true; m_pConfigAccess->readConfigurationData(); } @@ -239,7 +239,7 @@ throw (RuntimeException, std::exception) if ( !m_bConfigRead ) { - m_bConfigRead = sal_True; + m_bConfigRead = true; m_pConfigAccess->readConfigurationData(); } diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx index 0cc8e9689cd2..b18f82a43cf4 100644 --- a/framework/source/uifactory/uielementfactorymanager.cxx +++ b/framework/source/uifactory/uielementfactorymanager.cxx @@ -70,7 +70,7 @@ ConfigurationAccess_FactoryManager::ConfigurationAccess_FactoryManager( const Re m_aPropModule( "Module" ), m_aPropFactory( "FactoryImplementation" ), m_sRoot(_sRoot), - m_bConfigAccessInitialized( sal_False ) + m_bConfigAccessInitialized( false ) { m_xConfigProvider = theDefaultProvider::get( rxContext ); } @@ -283,7 +283,7 @@ void ConfigurationAccess_FactoryManager::readConfigurationData() { } - m_bConfigAccessInitialized = sal_True; + m_bConfigAccessInitialized = true; } if ( m_xConfigAccess.is() ) @@ -316,7 +316,7 @@ void ConfigurationAccess_FactoryManager::readConfigurationData() } } -sal_Bool ConfigurationAccess_FactoryManager::impl_getElementProps( const Any& aElement, OUString& rType, OUString& rName, OUString& rModule, OUString& rServiceSpecifier ) const +bool ConfigurationAccess_FactoryManager::impl_getElementProps( const Any& aElement, OUString& rType, OUString& rName, OUString& rModule, OUString& rServiceSpecifier ) const { Reference< XPropertySet > xPropertySet; aElement >>= xPropertySet; @@ -332,15 +332,15 @@ sal_Bool ConfigurationAccess_FactoryManager::impl_getElementProps( const Any& aE } catch ( const com::sun::star::beans::UnknownPropertyException& ) { - return sal_False; + return false; } catch ( const com::sun::star::lang::WrappedTargetException& ) { - return sal_False; + return false; } } - return sal_True; + return true; } } // framework @@ -389,14 +389,14 @@ public: virtual void SAL_CALL deregisterFactory( const OUString& aType, const OUString& aName, const OUString& aModuleIdentifier ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - sal_Bool m_bConfigRead; + bool m_bConfigRead; css::uno::Reference< css::uno::XComponentContext > m_xContext; ConfigurationAccess_FactoryManager* m_pConfigAccess; }; UIElementFactoryManager::UIElementFactoryManager( const Reference< XComponentContext >& rxContext ) : UIElementFactoryManager_BASE(m_aMutex), - m_bConfigRead( sal_False ), + m_bConfigRead( false ), m_xContext(rxContext) { m_pConfigAccess = new ConfigurationAccess_FactoryManager(rxContext, @@ -432,7 +432,7 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l if ( !m_bConfigRead ) { - m_bConfigRead = sal_True; + m_bConfigRead = true; m_pConfigAccess->readConfigurationData(); } @@ -475,7 +475,7 @@ throw ( RuntimeException, std::exception ) if ( !m_bConfigRead ) { - m_bConfigRead = sal_True; + m_bConfigRead = true; m_pConfigAccess->readConfigurationData(); } @@ -491,7 +491,7 @@ throw ( RuntimeException, std::exception ) if ( !m_bConfigRead ) { - m_bConfigRead = sal_True; + m_bConfigRead = true; m_pConfigAccess->readConfigurationData(); } @@ -524,7 +524,7 @@ throw ( ElementExistException, RuntimeException, std::exception ) if ( !m_bConfigRead ) { - m_bConfigRead = sal_True; + m_bConfigRead = true; m_pConfigAccess->readConfigurationData(); } @@ -540,7 +540,7 @@ throw ( NoSuchElementException, RuntimeException, std::exception ) if ( !m_bConfigRead ) { - m_bConfigRead = sal_True; + m_bConfigRead = true; m_pConfigAccess->readConfigurationData(); } diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx index fcf511bcdc8c..5e12b9370dd7 100644 --- a/framework/source/uifactory/windowcontentfactorymanager.cxx +++ b/framework/source/uifactory/windowcontentfactorymanager.cxx @@ -79,14 +79,14 @@ private: virtual void SAL_CALL disposing() SAL_OVERRIDE; css::uno::Reference< css::uno::XComponentContext > m_xContext; - sal_Bool m_bConfigRead; + bool m_bConfigRead; ConfigurationAccess_FactoryManager* m_pConfigAccess; }; WindowContentFactoryManager::WindowContentFactoryManager( const uno::Reference< uno::XComponentContext >& rxContext ) : WindowContentFactoryManager_BASE(m_aMutex), m_xContext( rxContext ), - m_bConfigRead( sal_False ) + m_bConfigRead( false ) { m_pConfigAccess = new ConfigurationAccess_FactoryManager( m_xContext, "/org.openoffice.Office.UI.WindowContentFactories/Registered/ContentFactories" ); @@ -168,7 +168,7 @@ throw (uno::Exception, uno::RuntimeException, std::exception) osl::MutexGuard g(rBHelper.rMutex); if ( !m_bConfigRead ) { - m_bConfigRead = sal_True; + m_bConfigRead = true; m_pConfigAccess->readConfigurationData(); } aImplementationName = m_pConfigAccess->getFactorySpecifierFromTypeNameModule( aType, aName, aModuleId ); |