Kaydet (Commit) abd8c2a0 authored tarafından Noel Grandin's avatar Noel Grandin

xmlhelp: sal_Bool->bool

Change-Id: I0aa1b7023b5100fb855a8a839e44036988d8bc2e
üst a86ad4d1
...@@ -259,7 +259,7 @@ namespace treeview { ...@@ -259,7 +259,7 @@ namespace treeview {
getKey( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess, getKey( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess,
const char* key ) const; const char* key ) const;
sal_Bool bool
getBooleanKey( getBooleanKey(
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess,
const char* key) const; const char* key) const;
......
...@@ -119,7 +119,7 @@ OUString Databases::expandURL( const OUString& aURL, Reference< uno::XComponentC ...@@ -119,7 +119,7 @@ OUString Databases::expandURL( const OUString& aURL, Reference< uno::XComponentC
return aRetURL; return aRetURL;
} }
Databases::Databases( sal_Bool showBasic, Databases::Databases( bool showBasic,
const OUString& instPath, const OUString& instPath,
const com::sun::star::uno::Sequence< OUString >& imagesZipPaths, const com::sun::star::uno::Sequence< OUString >& imagesZipPaths,
const OUString& productName, const OUString& productName,
...@@ -1061,7 +1061,7 @@ void Databases::cascadingStylesheet( const OUString& Language, ...@@ -1061,7 +1061,7 @@ void Databases::cascadingStylesheet( const OUString& Language,
bool error = true; bool error = true;
OUString fileURL; OUString fileURL;
sal_Bool bHighContrastMode = sal_False; bool bHighContrastMode = false;
OUString aCSS( m_aCSS ); OUString aCSS( m_aCSS );
if ( aCSS.equalsAscii( "default" ) ) if ( aCSS.equalsAscii( "default" ) )
{ {
...@@ -1145,7 +1145,7 @@ void Databases::cascadingStylesheet( const OUString& Language, ...@@ -1145,7 +1145,7 @@ void Databases::cascadingStylesheet( const OUString& Language,
// fall back to default css // fall back to default css
aCSS = "default"; aCSS = "default";
retry = 2; retry = 2;
bHighContrastMode = sal_False; bHighContrastMode = false;
} }
} }
......
...@@ -165,7 +165,7 @@ namespace chelp { ...@@ -165,7 +165,7 @@ namespace chelp {
* Input is the installdirectory in system dependent notation * Input is the installdirectory in system dependent notation
*/ */
Databases( sal_Bool showBasic, Databases( bool showBasic,
const OUString& instPath, const OUString& instPath,
const com::sun::star::uno::Sequence< OUString >& imagesZipPaths, const com::sun::star::uno::Sequence< OUString >& imagesZipPaths,
const OUString& productName, const OUString& productName,
......
...@@ -343,7 +343,7 @@ void ContentProvider::init() ...@@ -343,7 +343,7 @@ void ContentProvider::init()
rtl::Bootstrap::expandMacros(aPath); rtl::Bootstrap::expandMacros(aPath);
aImagesZipPaths[ 1 ] = aPath; aImagesZipPaths[ 1 ] = aPath;
sal_Bool showBasic = getBooleanKey(xHierAccess,"Help/ShowBasic"); bool showBasic = getBooleanKey(xHierAccess,"Help/ShowBasic");
m_pDatabases = new Databases( showBasic, m_pDatabases = new Databases( showBasic,
instPath, instPath,
aImagesZipPaths, aImagesZipPaths,
...@@ -426,12 +426,12 @@ ContentProvider::getKey( ...@@ -426,12 +426,12 @@ ContentProvider::getKey(
return instPath; return instPath;
} }
sal_Bool bool
ContentProvider::getBooleanKey( ContentProvider::getBooleanKey(
const uno::Reference< container::XHierarchicalNameAccess >& xHierAccess, const uno::Reference< container::XHierarchicalNameAccess >& xHierAccess,
const char* key ) const const char* key ) const
{ {
sal_Bool ret = sal_False; bool ret = false;
if( xHierAccess.is() ) if( xHierAccess.is() )
{ {
uno::Any aAny; uno::Any aAny;
......
...@@ -171,7 +171,7 @@ namespace chelp { ...@@ -171,7 +171,7 @@ namespace chelp {
getKey( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess, getKey( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess,
const char* key ) const; const char* key ) const;
sal_Bool bool
getBooleanKey( getBooleanKey(
const ::com::sun::star::uno::Reference< const ::com::sun::star::uno::Reference<
::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess, ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess,
......
...@@ -160,7 +160,7 @@ ResultSetBase::next( ...@@ -160,7 +160,7 @@ ResultSetBase::next(
throw( sdbc::SQLException, throw( sdbc::SQLException,
uno::RuntimeException, std::exception ) uno::RuntimeException, std::exception )
{ {
sal_Bool test; bool test;
m_nRow++; m_nRow++;
if( sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() ) if( sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
test = true; test = true;
......
...@@ -622,7 +622,7 @@ ConfigData TVChildTarget::init( const Reference< XComponentContext >& xContext ) ...@@ -622,7 +622,7 @@ ConfigData TVChildTarget::init( const Reference< XComponentContext >& xContext )
Reference< XHierarchicalNameAccess > xHierAccess( getHierAccess( sProvider, Reference< XHierarchicalNameAccess > xHierAccess( getHierAccess( sProvider,
"org.openoffice.Office.Common" ) ); "org.openoffice.Office.Common" ) );
OUString system( getKey( xHierAccess,"Help/System" ) ); 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" ) ); OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) );
if( instPath.isEmpty() ) if( instPath.isEmpty() )
// try to determine path from default // try to determine path from default
...@@ -840,12 +840,12 @@ TVChildTarget::getKey( const Reference< XHierarchicalNameAccess >& xHierAccess, ...@@ -840,12 +840,12 @@ TVChildTarget::getKey( const Reference< XHierarchicalNameAccess >& xHierAccess,
return instPath; return instPath;
} }
sal_Bool bool
TVChildTarget::getBooleanKey(const Reference< TVChildTarget::getBooleanKey(const Reference<
XHierarchicalNameAccess >& xHierAccess, XHierarchicalNameAccess >& xHierAccess,
const char* key) const const char* key) const
{ {
sal_Bool ret = sal_False; bool ret = false;
if( xHierAccess.is() ) if( xHierAccess.is() )
{ {
Any aAny; Any aAny;
......
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