diff options
author | Noel Grandin <noel@peralex.com> | 2014-04-30 10:04:10 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-05-02 08:49:21 +0200 |
commit | abd8c2a0f661a3913bfd14fefabf451dc7d85679 (patch) | |
tree | e725fe350c637e2a37f14402941caedfca9d4ec4 /xmlhelp | |
parent | a86ad4d11c7789dcf7fede31b0ff391f151dbf47 (diff) |
xmlhelp: sal_Bool->bool
Change-Id: I0aa1b7023b5100fb855a8a839e44036988d8bc2e
Diffstat (limited to 'xmlhelp')
-rw-r--r-- | xmlhelp/source/cxxhelp/inc/tvread.hxx | 2 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/databases.cxx | 6 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/databases.hxx | 2 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/provider.cxx | 6 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/provider.hxx | 2 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/resultsetbase.cxx | 2 | ||||
-rw-r--r-- | xmlhelp/source/treeview/tvread.cxx | 6 |
7 files changed, 13 insertions, 13 deletions
diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx b/xmlhelp/source/cxxhelp/inc/tvread.hxx index c635a49f86a8..e11812f03790 100644 --- a/xmlhelp/source/cxxhelp/inc/tvread.hxx +++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx @@ -259,7 +259,7 @@ namespace treeview { getKey( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess, const char* key ) const; - sal_Bool + bool getBooleanKey( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess, const char* key) const; diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index 7b69b8507502..32ec580691f9 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -119,7 +119,7 @@ OUString Databases::expandURL( const OUString& aURL, Reference< uno::XComponentC return aRetURL; } -Databases::Databases( sal_Bool showBasic, +Databases::Databases( bool showBasic, const OUString& instPath, const com::sun::star::uno::Sequence< OUString >& imagesZipPaths, const OUString& productName, @@ -1061,7 +1061,7 @@ void Databases::cascadingStylesheet( const OUString& Language, bool error = true; OUString fileURL; - sal_Bool bHighContrastMode = sal_False; + bool bHighContrastMode = false; OUString aCSS( m_aCSS ); if ( aCSS.equalsAscii( "default" ) ) { @@ -1145,7 +1145,7 @@ void Databases::cascadingStylesheet( const OUString& Language, // fall back to default css aCSS = "default"; retry = 2; - bHighContrastMode = sal_False; + bHighContrastMode = false; } } diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx index 660d5dd7a636..d161c60262df 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.hxx +++ b/xmlhelp/source/cxxhelp/provider/databases.hxx @@ -165,7 +165,7 @@ namespace chelp { * Input is the installdirectory in system dependent notation */ - Databases( sal_Bool showBasic, + Databases( bool showBasic, const OUString& instPath, const com::sun::star::uno::Sequence< OUString >& imagesZipPaths, const OUString& productName, diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx index bec99ce88d74..7191890c345d 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.cxx +++ b/xmlhelp/source/cxxhelp/provider/provider.cxx @@ -343,7 +343,7 @@ void ContentProvider::init() rtl::Bootstrap::expandMacros(aPath); aImagesZipPaths[ 1 ] = aPath; - sal_Bool showBasic = getBooleanKey(xHierAccess,"Help/ShowBasic"); + bool showBasic = getBooleanKey(xHierAccess,"Help/ShowBasic"); m_pDatabases = new Databases( showBasic, instPath, aImagesZipPaths, @@ -426,12 +426,12 @@ ContentProvider::getKey( return instPath; } -sal_Bool +bool ContentProvider::getBooleanKey( const uno::Reference< container::XHierarchicalNameAccess >& xHierAccess, const char* key ) const { - sal_Bool ret = sal_False; + bool ret = false; if( xHierAccess.is() ) { uno::Any aAny; diff --git a/xmlhelp/source/cxxhelp/provider/provider.hxx b/xmlhelp/source/cxxhelp/provider/provider.hxx index b4819bacd823..b7fbc6605fa3 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.hxx +++ b/xmlhelp/source/cxxhelp/provider/provider.hxx @@ -171,7 +171,7 @@ namespace chelp { getKey( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess, const char* key ) const; - sal_Bool + bool getBooleanKey( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess, diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx index ed06a6196d55..671bd0973306 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx @@ -160,7 +160,7 @@ ResultSetBase::next( throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { - sal_Bool test; + bool test; m_nRow++; if( sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() ) test = true; diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index f2ceb5df04ad..e8045b80d365 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -622,7 +622,7 @@ ConfigData TVChildTarget::init( const Reference< XComponentContext >& xContext ) Reference< XHierarchicalNameAccess > xHierAccess( getHierAccess( sProvider, "org.openoffice.Office.Common" ) ); OUString system( getKey( xHierAccess,"Help/System" ) ); - sal_Bool showBasic( getBooleanKey(xHierAccess,"Help/ShowBasic") ); + bool showBasic( getBooleanKey(xHierAccess,"Help/ShowBasic") ); OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) ); if( instPath.isEmpty() ) // try to determine path from default @@ -840,12 +840,12 @@ TVChildTarget::getKey( const Reference< XHierarchicalNameAccess >& xHierAccess, return instPath; } -sal_Bool +bool TVChildTarget::getBooleanKey(const Reference< XHierarchicalNameAccess >& xHierAccess, const char* key) const { - sal_Bool ret = sal_False; + bool ret = false; if( xHierAccess.is() ) { Any aAny; |