diff options
23 files changed, 218 insertions, 220 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 902ad6a17155..5a37bbcf0291 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -1698,7 +1698,7 @@ bool StarBASIC::CError( SbError code, const OUString& rMsg, bool bRet; if( GetSbData()->aErrHdl.IsSet() ) { - bRet = (sal_Bool) GetSbData()->aErrHdl.Call( this ); + bRet = (bool) GetSbData()->aErrHdl.Call( this ); } else { @@ -1746,7 +1746,7 @@ bool StarBASIC::RTError( SbError code, const OUString& rMsg, sal_Int32 l, sal_In SetErrorData( code, l, c1, c2 ); if( GetSbData()->aErrHdl.IsSet() ) { - return (sal_Bool) GetSbData()->aErrHdl.Call( this ); + return (bool) GetSbData()->aErrHdl.Call( this ); } else { diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index eded887bbb3f..30a252a4ae91 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -274,8 +274,8 @@ void testErrorBar( Reference< XPropertySet > xErrorBar ) void checkCommonTrendline( Reference<chart2::XRegressionCurve> xCurve, double aExpectedExtrapolateForward, double aExpectedExtrapolateBackward, - sal_Bool aExpectedForceIntercept, double aExpectedInterceptValue, - sal_Bool aExpectedShowEquation, sal_Bool aExpectedR2) + bool aExpectedForceIntercept, double aExpectedInterceptValue, + bool aExpectedShowEquation, bool aExpectedR2) { Reference<XPropertySet> xProperties( xCurve , uno::UNO_QUERY ); CPPUNIT_ASSERT(xProperties.is()); @@ -288,7 +288,7 @@ void checkCommonTrendline( CPPUNIT_ASSERT(xProperties->getPropertyValue("ExtrapolateBackward") >>= aExtrapolateBackward); CPPUNIT_ASSERT_EQUAL(aExpectedExtrapolateBackward, aExtrapolateBackward); - sal_Bool aForceIntercept = false; + bool aForceIntercept = false; CPPUNIT_ASSERT(xProperties->getPropertyValue("ForceIntercept") >>= aForceIntercept); CPPUNIT_ASSERT_EQUAL(aExpectedForceIntercept, aForceIntercept); @@ -302,11 +302,11 @@ void checkCommonTrendline( Reference< XPropertySet > xEquationProperties( xCurve->getEquationProperties() ); CPPUNIT_ASSERT(xEquationProperties.is()); - sal_Bool aShowEquation = false; + bool aShowEquation = false; CPPUNIT_ASSERT(xEquationProperties->getPropertyValue("ShowEquation") >>= aShowEquation); CPPUNIT_ASSERT_EQUAL(aExpectedShowEquation, aShowEquation); - sal_Bool aShowCorrelationCoefficient = false; + bool aShowCorrelationCoefficient = false; CPPUNIT_ASSERT(xEquationProperties->getPropertyValue("ShowCorrelationCoefficient") >>= aShowCorrelationCoefficient); CPPUNIT_ASSERT_EQUAL(aExpectedR2, aShowCorrelationCoefficient); } @@ -327,8 +327,8 @@ void checkNameAndType(Reference<XPropertySet> xProperties, const OUString& aExpe void checkLinearTrendline( Reference<chart2::XRegressionCurve> xCurve, const OUString& aExpectedName, double aExpectedExtrapolateForward, double aExpectedExtrapolateBackward, - sal_Bool aExpectedForceIntercept, double aExpectedInterceptValue, - sal_Bool aExpectedShowEquation, sal_Bool aExpectedR2) + bool aExpectedForceIntercept, double aExpectedInterceptValue, + bool aExpectedShowEquation, bool aExpectedR2) { Reference<XPropertySet> xProperties( xCurve , uno::UNO_QUERY ); CPPUNIT_ASSERT(xProperties.is()); @@ -346,8 +346,8 @@ void checkPolynomialTrendline( Reference<chart2::XRegressionCurve> xCurve, const OUString& aExpectedName, sal_Int32 aExpectedDegree, double aExpectedExtrapolateForward, double aExpectedExtrapolateBackward, - sal_Bool aExpectedForceIntercept, double aExpectedInterceptValue, - sal_Bool aExpectedShowEquation, sal_Bool aExpectedR2) + bool aExpectedForceIntercept, double aExpectedInterceptValue, + bool aExpectedShowEquation, bool aExpectedR2) { Reference<XPropertySet> xProperties( xCurve , uno::UNO_QUERY ); CPPUNIT_ASSERT(xProperties.is()); diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx index b3d7b878a536..7ceade5328a5 100644 --- a/configmgr/source/writemodfile.cxx +++ b/configmgr/source/writemodfile.cxx @@ -114,7 +114,7 @@ void writeData_(oslFileHandle handle, char const * begin, sal_Int32 length) { } } -void writeValueContent_(oslFileHandle handle, sal_Bool value) { +void writeValueContent_(oslFileHandle handle, bool value) { if (value) { writeData_(handle, RTL_CONSTASCII_STRINGPARAM("true")); } else { @@ -196,7 +196,7 @@ template< typename T > void writeItemListValue( void writeValue(oslFileHandle handle, Type type, css::uno::Any const & value) { switch (type) { case TYPE_BOOLEAN: - writeSingleValue< sal_Bool >(handle, value); + writeSingleValue< bool >(handle, value); break; case TYPE_SHORT: writeSingleValue< sal_Int16 >(handle, value); @@ -217,7 +217,7 @@ void writeValue(oslFileHandle handle, Type type, css::uno::Any const & value) { writeSingleValue< css::uno::Sequence< sal_Int8 > >(handle, value); break; case TYPE_BOOLEAN_LIST: - writeListValue< sal_Bool >(handle, value); + writeListValue< bool >(handle, value); break; case TYPE_SHORT_LIST: writeListValue< sal_Int16 >(handle, value); diff --git a/cpputools/source/sp2bv/sp2bv.cxx b/cpputools/source/sp2bv/sp2bv.cxx index a4147dfaafb8..b3853fc07985 100644 --- a/cpputools/source/sp2bv/sp2bv.cxx +++ b/cpputools/source/sp2bv/sp2bv.cxx @@ -24,7 +24,7 @@ #include "rtl/ustring.hxx" #include "rtl/ustrbuf.h" -static sal_Bool hasOption(char const * szOption, int argc, char** argv); +static bool hasOption(char const * szOption, int argc, char** argv); #define HELP_TEXT \ @@ -109,14 +109,14 @@ int main(int argc, char **argv) -static sal_Bool hasOption(char const * szOption, int argc, char** argv) +static bool hasOption(char const * szOption, int argc, char** argv) { - sal_Bool retVal= sal_False; + bool retVal = false; for(sal_Int16 i= 1; i < argc; i++) { if( ! strcmp(argv[i], szOption)) { - retVal= sal_True; + retVal = true; break; } } diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx index 05b1fd49e768..687c6e7bb003 100644 --- a/cpputools/source/unoexe/unoexe.cxx +++ b/cpputools/source/unoexe/unoexe.cxx @@ -59,7 +59,7 @@ using namespace com::sun::star::container; namespace unoexe { -static sal_Bool s_quiet = false; +static bool s_quiet = false; static inline void out( const sal_Char * pText ) { @@ -84,18 +84,18 @@ static const char arUsingText[] = " [--quiet]\n" " [-- Argument1 Argument2 ...]\n"; -static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt, - sal_uInt32 * pnIndex, const OUString & aArg) +static bool readOption( OUString * pValue, const sal_Char * pOpt, + sal_uInt32 * pnIndex, const OUString & aArg) throw (RuntimeException) { const OUString dash("-"); if(!aArg.startsWith(dash)) - return sal_False; + return false; OUString aOpt = OUString::createFromAscii( pOpt ); if (aArg.getLength() < aOpt.getLength()) - return sal_False; + return false; if (aOpt.equalsIgnoreAsciiCase( aArg.copy(1) )) { @@ -119,7 +119,7 @@ static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt, out( tmp.getStr() ); #endif ++(*pnIndex); - return sal_True; + return true; } } else if (aArg.indexOf(aOpt) == 1) @@ -134,13 +134,13 @@ static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt, #endif ++(*pnIndex); - return sal_True; + return true; } - return sal_False; + return false; } -static sal_Bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt, - sal_uInt32 * pnIndex, const OUString & aArg) +static bool readOption( bool * pbOpt, const sal_Char * pOpt, + sal_uInt32 * pnIndex, const OUString & aArg) { const OUString dashdash("--"); OUString aOpt = OUString::createFromAscii(pOpt); @@ -148,14 +148,14 @@ static sal_Bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt, if(aArg.startsWith(dashdash) && aOpt.equals(aArg.copy(2))) { ++(*pnIndex); - *pbOpt = sal_True; + *pbOpt = true; #if OSL_DEBUG_LEVEL > 1 out( "\n> identified option --" ); out( pOpt ); #endif - return sal_True; + return true; } - return sal_False; + return false; } template< class T > @@ -270,7 +270,7 @@ class OInstanceProvider Mutex _aSingleInstanceMutex; Reference< XInterface > _xSingleInstance; - sal_Bool _bSingleInstance; + bool _bSingleInstance; OUString _aImplName; OUString _aLocation; @@ -285,7 +285,7 @@ public: OInstanceProvider( const Reference< XComponentContext > & xContext, const OUString & rImplName, const OUString & rLocation, const OUString & rServiceName, const Sequence< Any > & rInitParams, - sal_Bool bSingleInstance, const OUString & rInstanceName ) + bool bSingleInstance, const OUString & rInstanceName ) : _xContext( xContext ) , _bSingleInstance( bSingleInstance ) , _aImplName( rImplName ) @@ -408,8 +408,8 @@ SAL_IMPLEMENT_MAIN() { OUString aImplName, aLocation, aServiceName, aUnoUrl; Sequence< OUString > aParams; - sal_Bool bSingleAccept = sal_False; - sal_Bool bSingleInstance = sal_False; + bool bSingleAccept = false; + bool bSingleInstance = false; // read command line arguments diff --git a/filter/source/storagefilterdetect/filterdetect.hxx b/filter/source/storagefilterdetect/filterdetect.hxx index 385d3c011478..06a9aa2cea7b 100644 --- a/filter/source/storagefilterdetect/filterdetect.hxx +++ b/filter/source/storagefilterdetect/filterdetect.hxx @@ -60,7 +60,7 @@ public: OUString StorageFilterDetect_getImplementationName(); -sal_Bool StorageFilterDetect_supportsService(const OUString& ServiceName); +bool StorageFilterDetect_supportsService(const OUString& ServiceName); com::sun::star::uno::Sequence<OUString> StorageFilterDetect_getSupportedServiceNames(); diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index 40933b0109b9..29317268f61d 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -348,7 +348,7 @@ namespace frm aState.Enabled = !impl_isInsertOnlyForm_throw(); } else - aState.State <<= (sal_Bool)sal_False; + aState.State <<= false; } break; @@ -781,7 +781,7 @@ namespace frm // simply toggle the value bool bApplied = false; m_xCursorProperties->getPropertyValue( PROPERTY_APPLYFILTER ) >>= bApplied; - m_xCursorProperties->setPropertyValue( PROPERTY_APPLYFILTER, makeAny( (sal_Bool)!bApplied ) ); + m_xCursorProperties->setPropertyValue( PROPERTY_APPLYFILTER, makeAny( !bApplied ) ); // and reload WaitObject aWO( NULL ); @@ -1656,7 +1656,7 @@ namespace frm try { m_xCursorProperties->setPropertyValue( PROPERTY_FILTER, makeAny( m_xParser->getFilter() ) ); - m_xCursorProperties->setPropertyValue( PROPERTY_APPLYFILTER, makeAny( (sal_Bool)sal_True ) ); + m_xCursorProperties->setPropertyValue( PROPERTY_APPLYFILTER, makeAny( true ) ); m_xLoadableForm->reload(); } @@ -1671,7 +1671,7 @@ namespace frm try { m_xParser->setOrder( sOriginalFilter ); - m_xCursorProperties->setPropertyValue( PROPERTY_APPLYFILTER, makeAny( (sal_Bool)bApplied ) ); + m_xCursorProperties->setPropertyValue( PROPERTY_APPLYFILTER, makeAny( bApplied ) ); m_xCursorProperties->setPropertyValue( PROPERTY_FILTER, makeAny( m_xParser->getFilter() ) ); m_xLoadableForm->reload(); } diff --git a/postprocess/qa/services.cxx b/postprocess/qa/services.cxx index 680ad637686f..c9d30f4f1031 100644 --- a/postprocess/qa/services.cxx +++ b/postprocess/qa/services.cxx @@ -57,7 +57,7 @@ void ServicesTest::test() try { OString message = OUStringToOString(s[i], RTL_TEXTENCODING_UTF8); - sal_Bool bDefConstructor = xseq[c]->isDefaultConstructor(); + bool bDefConstructor = xseq[c]->isDefaultConstructor(); Reference< css::lang::XMultiComponentFactory > serviceManager = m_xContext->getServiceManager(); Reference< XInterface > instance; diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx index 6e7c38bb7311..15df5b5fba93 100644 --- a/sal/osl/unx/profile.cxx +++ b/sal/osl/unx/profile.cxx @@ -98,17 +98,17 @@ typedef struct _osl_TProfileImpl sal_Char** m_Lines; osl_TProfileSection* m_Sections; pthread_mutex_t m_AccessLock; - sal_Bool m_bIsValid; + bool m_bIsValid; } osl_TProfileImpl; static osl_TFile* openFileImpl(const sal_Char* pszFilename, oslProfileOption ProfileFlags); static osl_TStamp closeFileImpl(osl_TFile* pFile, oslProfileOption Flags); -static sal_Bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode); -static sal_Bool OslProfile_rewindFile(osl_TFile* pFile, sal_Bool bTruncate); +static bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode); +static bool OslProfile_rewindFile(osl_TFile* pFile, bool bTruncate); static osl_TStamp OslProfile_getFileStamp(osl_TFile* pFile); static sal_Char* OslProfile_getLine(osl_TFile* pFile); -static sal_Bool OslProfile_putLine(osl_TFile* pFile, const sal_Char *pszLine); +static bool OslProfile_putLine(osl_TFile* pFile, const sal_Char *pszLine); static sal_Char* stripBlanks(sal_Char* String, sal_uInt32* pLen); static sal_Char* addLine(osl_TProfileImpl* pProfile, const sal_Char* Line); static sal_Char* insertLine(osl_TProfileImpl* pProfile, const sal_Char* Line, sal_uInt32 LineNo); @@ -116,19 +116,19 @@ static void removeLine(osl_TProfileImpl* pProfile, sal_uInt32 LineNo); static void setEntry(osl_TProfileImpl* pProfile, osl_TProfileSection* pSection, sal_uInt32 NoEntry, sal_uInt32 Line, sal_Char* Entry, sal_uInt32 Len); -static sal_Bool addEntry(osl_TProfileImpl* pProfile, osl_TProfileSection *pSection, - int Line, sal_Char* Entry, sal_uInt32 Len); +static bool addEntry(osl_TProfileImpl* pProfile, osl_TProfileSection *pSection, + int Line, sal_Char* Entry, sal_uInt32 Len); static void removeEntry(osl_TProfileSection *pSection, sal_uInt32 NoEntry); -static sal_Bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char* Section, sal_uInt32 Len); +static bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char* Section, sal_uInt32 Len); static void removeSection(osl_TProfileImpl* pProfile, osl_TProfileSection *pSection); static osl_TProfileSection* findEntry(osl_TProfileImpl* pProfile, const sal_Char* Section, const sal_Char* Entry, sal_uInt32 *pNoEntry); -static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile); -static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup); -static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable); -static sal_Bool releaseProfile(osl_TProfileImpl* pProfile); +static bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile); +static bool storeProfile(osl_TProfileImpl* pProfile, bool bCleanup); +static osl_TProfileImpl* acquireProfile(oslProfile Profile, bool bWriteable); +static bool releaseProfile(osl_TProfileImpl* pProfile); -static sal_Bool writeProfileImpl (osl_TFile* pFile); +static bool writeProfileImpl (osl_TFile* pFile); static osl_TFile* osl_openTmpProfileImpl(osl_TProfileImpl*); static bool osl_ProfileSwapProfileNames(osl_TProfileImpl*); static void osl_ProfileGenerateExtension(const sal_Char* pszFileName, const sal_Char* pszExtension, sal_Char* pszTmpName, int BufferMaxLen); @@ -207,7 +207,7 @@ static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, o } pthread_mutex_init(&(pProfile->m_AccessLock),PTHREAD_MUTEXATTR_DEFAULT); - pProfile->m_bIsValid=sal_True; + pProfile->m_bIsValid = true; pProfile->m_Stamp = OslProfile_getFileStamp(pFile); bRet=loadProfile(pFile, pProfile); @@ -242,7 +242,7 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile) pthread_mutex_lock(&(pProfile->m_AccessLock)); - if ( pProfile->m_bIsValid == sal_False ) + if ( pProfile->m_bIsValid == false ) { OSL_ASSERT(pProfile->m_bIsValid); pthread_mutex_unlock(&(pProfile->m_AccessLock)); @@ -252,22 +252,22 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile) return sal_False; } - pProfile->m_bIsValid=sal_False; + pProfile->m_bIsValid = false; if ( ! ( pProfile->m_Flags & osl_Profile_READLOCK ) && ( pProfile->m_Flags & FLG_MODIFIED ) ) { - pTmpProfile = acquireProfile(Profile,sal_True); + pTmpProfile = acquireProfile(Profile, true); if ( pTmpProfile != 0 ) { - sal_Bool bRet = storeProfile(pTmpProfile, sal_True); + bool bRet = storeProfile(pTmpProfile, true); OSL_ASSERT(bRet); (void)bRet; } } else { - pTmpProfile = acquireProfile(Profile,sal_False); + pTmpProfile = acquireProfile(Profile, false); } if ( pTmpProfile == 0 ) @@ -336,7 +336,7 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile) { osl_TProfileImpl* pProfile = (osl_TProfileImpl*) Profile; osl_TFile* pFile; - sal_Bool bRet = sal_False; + bool bRet = false; #ifdef TRACE_OSL_PROFILE OSL_TRACE("In osl_flushProfile()"); @@ -352,7 +352,7 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile) pthread_mutex_lock(&(pProfile->m_AccessLock)); - if ( pProfile->m_bIsValid == sal_False ) + if ( pProfile->m_bIsValid == false ) { OSL_ASSERT(pProfile->m_bIsValid); pthread_mutex_unlock(&(pProfile->m_AccessLock)); @@ -377,7 +377,7 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile) #ifdef DEBUG_OSL_PROFILE OSL_TRACE("swapping to storeprofile"); #endif - bRet = storeProfile(pProfile,sal_False); + bRet = storeProfile(pProfile, false); OSL_ASSERT(bRet); } @@ -388,7 +388,7 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile) return bRet; } -static sal_Bool writeProfileImpl(osl_TFile* pFile) +static bool writeProfileImpl(osl_TFile* pFile) { #if OSL_DEBUG_LEVEL > 1 unsigned int nLen=0; @@ -403,7 +403,7 @@ static sal_Bool writeProfileImpl(osl_TFile* pFile) #ifdef TRACE_OSL_PROFILE OSL_TRACE("Out osl_writeProfileImpl() [invalid args]"); #endif - return sal_False; + return false; } #if OSL_DEBUG_LEVEL > 1 @@ -414,7 +414,7 @@ static sal_Bool writeProfileImpl(osl_TFile* pFile) if ( !safeWrite(pFile->m_Handle, pFile->m_pWriteBuf, pFile->m_nWriteBufLen - pFile->m_nWriteBufFree) ) { OSL_TRACE("write failed '%s'",strerror(errno)); - return (sal_False); + return false; } free(pFile->m_pWriteBuf); @@ -424,7 +424,7 @@ static sal_Bool writeProfileImpl(osl_TFile* pFile) #ifdef TRACE_OSL_PROFILE OSL_TRACE("Out osl_writeProfileImpl() [ok]"); #endif - return sal_True; + return true; } sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile, @@ -439,7 +439,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile, osl_TProfileSection* pSec; osl_TProfileImpl* pProfile=0; osl_TProfileImpl* pTmpProfile=0; - sal_Bool bRet = sal_False; + bool bRet = false; #ifdef TRACE_OSL_PROFILE OSL_TRACE("In osl_readProfileString"); @@ -457,7 +457,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile, pthread_mutex_lock(&(pTmpProfile->m_AccessLock)); - if ( pTmpProfile->m_bIsValid == sal_False ) + if ( pTmpProfile->m_bIsValid == false ) { pthread_mutex_unlock(&(pTmpProfile->m_AccessLock)); #ifdef TRACE_OSL_PROFILE @@ -466,7 +466,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile, return sal_False; } - pProfile = acquireProfile(Profile, sal_False); + pProfile = acquireProfile(Profile, false); if ( pProfile == NULL ) { @@ -598,7 +598,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile, const sal_Char* pszString) { sal_uInt32 i; - sal_Bool bRet = sal_False; + bool bRet = false; sal_uInt32 NoEntry; sal_Char* pStr; sal_Char* Line = 0; @@ -622,7 +622,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile, pthread_mutex_lock(&(pTmpProfile->m_AccessLock)); - if ( pTmpProfile->m_bIsValid == sal_False ) + if ( pTmpProfile->m_bIsValid == false ) { OSL_ASSERT(pTmpProfile->m_bIsValid); pthread_mutex_unlock(&(pTmpProfile->m_AccessLock)); @@ -632,7 +632,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile, return sal_False; } - pProfile=acquireProfile(Profile, sal_True); + pProfile=acquireProfile(Profile, true); if (pProfile == NULL) { @@ -741,7 +741,7 @@ sal_Bool SAL_CALL osl_writeProfileBool(oslProfile Profile, const sal_Char* pszEntry, sal_Bool Value) { - sal_Bool bRet=sal_False; + bool bRet = false; #ifdef TRACE_OSL_PROFILE OSL_TRACE("In osl_writeProfileBool"); @@ -767,7 +767,7 @@ sal_Bool SAL_CALL osl_writeProfileIdent(oslProfile Profile, sal_uInt32 Value) { int i, n = 0; - sal_Bool bRet=sal_False; + bool bRet = false; #ifdef TRACE_OSL_PROFILE OSL_TRACE("In osl_writeProfileIdent"); @@ -777,7 +777,7 @@ sal_Bool SAL_CALL osl_writeProfileIdent(oslProfile Profile, ++n; if ((i = Value - FirstId) >= n) - bRet = sal_False; + bRet = false; else bRet = osl_writeProfileString(Profile, pszSection, pszEntry, Strings[i]); @@ -795,7 +795,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile, osl_TProfileSection* pSec; osl_TProfileImpl* pProfile = 0; osl_TProfileImpl* pTmpProfile = 0; - sal_Bool bRet = sal_False; + bool bRet = false; #ifdef TRACE_OSL_PROFILE OSL_TRACE("In osl_removeProfileEntry"); @@ -813,7 +813,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile, pthread_mutex_lock(&(pTmpProfile->m_AccessLock)); - if ( pTmpProfile->m_bIsValid == sal_False ) + if ( pTmpProfile->m_bIsValid == false ) { OSL_ASSERT(pTmpProfile->m_bIsValid); pthread_mutex_unlock(&(pTmpProfile->m_AccessLock)); @@ -823,7 +823,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile, return sal_False; } - pProfile = acquireProfile(Profile, sal_True); + pProfile = acquireProfile(Profile, true); if (pProfile == NULL) { @@ -879,7 +879,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, osl_TProfileSection* pSec; osl_TProfileImpl* pProfile = 0; osl_TProfileImpl* pTmpProfile = 0; - sal_Bool bRet = sal_False; + bool bRet = false; #ifdef TRACE_OSL_PROFILE OSL_TRACE("In osl_getProfileSectionEntries"); @@ -898,7 +898,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, pthread_mutex_lock(&(pTmpProfile->m_AccessLock)); - if ( pTmpProfile->m_bIsValid == sal_False ) + if ( pTmpProfile->m_bIsValid == false ) { OSL_ASSERT(pTmpProfile->m_bIsValid); @@ -911,7 +911,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, return sal_False; } - pProfile = acquireProfile(Profile, sal_False); + pProfile = acquireProfile(Profile, false); if (pProfile == NULL) { @@ -982,7 +982,7 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, osl_TProfileSection* pSec; osl_TProfileImpl* pProfile = 0; osl_TProfileImpl* pTmpProfile = 0; - sal_Bool bRet = sal_False; + bool bRet = false; #ifdef TRACE_OSL_PROFILE OSL_TRACE("In osl_getProfileSections"); @@ -1000,7 +1000,7 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, pthread_mutex_lock(&(pTmpProfile->m_AccessLock)); - if ( pTmpProfile->m_bIsValid == sal_False ) + if ( pTmpProfile->m_bIsValid == false ) { OSL_ASSERT(pTmpProfile->m_bIsValid); pthread_mutex_unlock(&(pTmpProfile->m_AccessLock)); @@ -1010,7 +1010,7 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, return sal_False; } - pProfile = acquireProfile(Profile, sal_False); + pProfile = acquireProfile(Profile, false); if (pProfile == NULL) { @@ -1079,12 +1079,12 @@ static osl_TStamp OslProfile_getFileStamp(osl_TFile* pFile) return (status.st_mtime); } -static sal_Bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode) +static bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode) { struct flock lock; /* boring hack, but initializers for static vars must be constant */ - static sal_Bool bIsInitialized = sal_False; - static sal_Bool bLockingDisabled; + static bool bIsInitialized = false; + static bool bLockingDisabled; #ifdef TRACE_OSL_PROFILE OSL_TRACE("In OslProfile_lockFile"); @@ -1097,15 +1097,15 @@ static sal_Bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode) if ( pEnvValue == 0 ) { - bLockingDisabled = sal_False; + bLockingDisabled = false; } else { - bLockingDisabled = sal_True; + bLockingDisabled = true; } - bIsInitialized = sal_True; + bIsInitialized = true; } if (pFile->m_Handle < 0) @@ -1113,7 +1113,7 @@ static sal_Bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode) #ifdef TRACE_OSL_PROFILE OSL_TRACE("Out OslProfile_lockFile [invalid file handle]"); #endif - return (sal_False); + return false; } if ( bLockingDisabled ) @@ -1121,7 +1121,7 @@ static sal_Bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode) #ifdef TRACE_OSL_PROFILE OSL_TRACE("Out OslProfile_lockFile [locking disabled]"); #endif - return (sal_True); + return true; } lock.l_start = 0; @@ -1154,27 +1154,27 @@ static sal_Bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode) #ifdef TRACE_OSL_PROFILE OSL_TRACE("Out OslProfile_lockFile [fcntl F_SETLKW]"); #endif - return sal_False; + return false; } #ifdef TRACE_OSL_PROFILE OSL_TRACE("Out OslProfile_lockFile [ok]"); #endif - return sal_True; + return true; } static osl_TFile* openFileImpl(const sal_Char* pszFilename, oslProfileOption ProfileFlags ) { int Flags; osl_TFile* pFile = (osl_TFile*) calloc(1, sizeof(osl_TFile)); - sal_Bool bWriteable = sal_False; + bool bWriteable = false; if ( ProfileFlags & ( osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE ) ) { #ifdef DEBUG_OSL_PROFILE OSL_TRACE("setting bWriteable to TRUE"); #endif - bWriteable=sal_True; + bWriteable = true; } if (! bWriteable) @@ -1274,7 +1274,7 @@ static osl_TStamp closeFileImpl(osl_TFile* pFile, oslProfileOption Flags) return(stamp); } -static sal_Bool OslProfile_rewindFile(osl_TFile* pFile, sal_Bool bTruncate) +static bool OslProfile_rewindFile(osl_TFile* pFile, bool bTruncate) { bool bRet = true; #ifdef TRACE_OSL_PROFILE @@ -1394,7 +1394,7 @@ static sal_Char* OslProfile_getLine(osl_TFile* pFile) return pLine; } -static sal_Bool OslProfile_putLine(osl_TFile* pFile, const sal_Char *pszLine) +static bool OslProfile_putLine(osl_TFile* pFile, const sal_Char *pszLine) { unsigned int Len = strlen(pszLine); @@ -1404,7 +1404,7 @@ static sal_Bool OslProfile_putLine(osl_TFile* pFile, const sal_Char *pszLine) if ( pFile == 0 || pFile->m_Handle < 0 ) { - return (sal_False); + return false; } if ( pFile->m_pWriteBuf == 0 ) @@ -1422,7 +1422,7 @@ static sal_Bool OslProfile_putLine(osl_TFile* pFile, const sal_Char *pszLine) pTmp=(sal_Char*) realloc(pFile->m_pWriteBuf,( ( pFile->m_nWriteBufLen + Len ) * 2) ); if ( pTmp == 0 ) { - return sal_False; + return false; } pFile->m_pWriteBuf = pTmp; pFile->m_nWriteBufFree = pFile->m_nWriteBufFree + pFile->m_nWriteBufLen + ( 2 * Len ); @@ -1440,7 +1440,7 @@ static sal_Bool OslProfile_putLine(osl_TFile* pFile, const sal_Char *pszLine) pFile->m_nWriteBufFree-=Len+1; - return sal_True; + return true; } static sal_Char* stripBlanks(sal_Char* String, sal_uInt32* pLen) @@ -1617,10 +1617,10 @@ static void setEntry(osl_TProfileImpl* pProfile, osl_TProfileSection* pSection, return; } -static sal_Bool addEntry(osl_TProfileImpl* pProfile, - osl_TProfileSection *pSection, - int Line, sal_Char* Entry, - sal_uInt32 Len) +static bool addEntry(osl_TProfileImpl* pProfile, + osl_TProfileSection *pSection, + int Line, sal_Char* Entry, + sal_uInt32 Len) { if (pSection != NULL) { @@ -1643,7 +1643,7 @@ static sal_Bool addEntry(osl_TProfileImpl* pProfile, { pSection->m_NoEntries = 0; pSection->m_MaxEntries = 0; - return (sal_False); + return false; } } @@ -1653,10 +1653,10 @@ static sal_Bool addEntry(osl_TProfileImpl* pProfile, setEntry(pProfile, pSection, pSection->m_NoEntries - 1, Line, Entry, Len); - return (sal_True); + return true; } - return (sal_False); + return false; } static void removeEntry(osl_TProfileSection *pSection, sal_uInt32 NoEntry) @@ -1679,7 +1679,7 @@ static void removeEntry(osl_TProfileSection *pSection, sal_uInt32 NoEntry) return; } -static sal_Bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char* Section, sal_uInt32 Len) +static bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char* Section, sal_uInt32 Len) { if (pProfile->m_NoSections >= pProfile->m_MaxSections) { @@ -1707,7 +1707,7 @@ static sal_Bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char* { pProfile->m_NoSections = 0; pProfile->m_MaxSections = 0; - return (sal_False); + return false; } } @@ -1725,7 +1725,7 @@ static sal_Bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char* pProfile->m_Sections[pProfile->m_NoSections - 1].m_Offset = Section - pProfile->m_Lines[Line]; pProfile->m_Sections[pProfile->m_NoSections - 1].m_Len = Len; - return (sal_True); + return true; } static void removeSection(osl_TProfileImpl* pProfile, osl_TProfileSection *pSection) @@ -1810,7 +1810,7 @@ static osl_TProfileSection* findEntry(osl_TProfileImpl* pProfile, return (pSec); } -static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile) +static bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile) { sal_uInt32 i; sal_Char* pStr; @@ -1821,18 +1821,18 @@ static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile) if ( !pFile ) { - return sal_False; + return false; } if ( !pProfile ) { - return sal_False; + return false; } pProfile->m_NoLines = 0; pProfile->m_NoSections = 0; - OSL_VERIFY(OslProfile_rewindFile(pFile, sal_False)); + OSL_VERIFY(OslProfile_rewindFile(pFile, false)); while ( ( pLine=OslProfile_getLine(pFile) ) != 0 ) { @@ -1840,7 +1840,7 @@ static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile) rtl_freeMemory( pLine ); OSL_ASSERT(bWasAdded); if ( ! bWasAdded ) - return (sal_False); + return false; } for (i = 0; i < pProfile->m_NoLines; i++) @@ -1882,10 +1882,10 @@ static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile) } } - return (sal_True); + return true; } -static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup) +static bool storeProfile(osl_TProfileImpl* pProfile, bool bCleanup) { #ifdef TRACE_OSL_PROFILE OSL_TRACE("In storeProfile"); @@ -1901,10 +1901,10 @@ static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup) if ( pTmpFile == 0 ) { - return sal_False; + return false; } - OSL_VERIFY(OslProfile_rewindFile(pTmpFile, sal_True)); + OSL_VERIFY(OslProfile_rewindFile(pTmpFile, true)); for ( i = 0 ; i < pProfile->m_NoLines ; i++ ) { @@ -1927,7 +1927,7 @@ static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup) #endif closeFileImpl(pTmpFile,pProfile->m_Flags); - return sal_False; + return false; } pProfile->m_Flags &= ~FLG_MODIFIED; @@ -1964,7 +1964,7 @@ static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup) #ifdef TRACE_OSL_PROFILE OSL_TRACE("Out storeProfile [ok]"); #endif - return (sal_True); + return true; } static osl_TFile* osl_openTmpProfileImpl(osl_TProfileImpl* pProfile) @@ -2059,7 +2059,7 @@ static void osl_ProfileGenerateExtension(const sal_Char* pszFileName, const sal_ return; } -static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable) +static osl_TProfileImpl* acquireProfile(oslProfile Profile, bool bWriteable) { osl_TProfileImpl* pProfile = (osl_TProfileImpl*)Profile; oslProfileOption PFlags=0; @@ -2106,7 +2106,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable) if (memcmp(&Stamp, &(pProfile->m_Stamp), sizeof(osl_TStamp))) { - sal_Bool bRet=sal_False; + bool bRet = false; pProfile->m_Stamp = Stamp; @@ -2132,7 +2132,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable) return (pProfile); } -static sal_Bool releaseProfile(osl_TProfileImpl* pProfile) +static bool releaseProfile(osl_TProfileImpl* pProfile) { #ifdef TRACE_OSL_PROFILE OSL_TRACE("In releaseProfile"); @@ -2143,7 +2143,7 @@ static sal_Bool releaseProfile(osl_TProfileImpl* pProfile) #ifdef TRACE_OSL_PROFILE OSL_TRACE("Out releaseProfile [profile==0]"); #endif - return sal_False; + return false; } if (pProfile->m_Flags & FLG_AUTOOPEN) @@ -2162,7 +2162,7 @@ static sal_Bool releaseProfile(osl_TProfileImpl* pProfile) { if (pProfile->m_Flags & FLG_MODIFIED) { - sal_Bool bRet=storeProfile(pProfile, sal_False); + bool bRet = storeProfile(pProfile, false); OSL_ASSERT(bRet); (void)bRet; } @@ -2175,7 +2175,7 @@ static sal_Bool releaseProfile(osl_TProfileImpl* pProfile) #ifdef TRACE_OSL_PROFILE OSL_TRACE("Out releaseProfile [ok]"); #endif - return (sal_True); + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/unx/security.cxx b/sal/osl/unx/security.cxx index 2787bdb97571..6afdc1c335a3 100644 --- a/sal/osl/unx/security.cxx +++ b/sal/osl/unx/security.cxx @@ -46,11 +46,11 @@ static oslSecurityError SAL_CALL osl_psz_loginUser(const sal_Char* pszUserName, const sal_Char* pszPasswd, oslSecurity* pSecurity); extern "C" sal_Bool SAL_CALL osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent, sal_uInt32 nMax); -static sal_Bool SAL_CALL osl_psz_getUserName(oslSecurity Security, sal_Char* pszName, sal_uInt32 nMax); -static sal_Bool SAL_CALL osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax); -static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax); +static bool SAL_CALL osl_psz_getUserName(oslSecurity Security, sal_Char* pszName, sal_uInt32 nMax); +static bool SAL_CALL osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax); +static bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax); -static sal_Bool sysconf_SC_GETPW_R_SIZE_MAX(std::size_t * value) { +static bool sysconf_SC_GETPW_R_SIZE_MAX(std::size_t * value) { #if defined _SC_GETPW_R_SIZE_MAX long m; errno = 0; @@ -59,17 +59,17 @@ static sal_Bool sysconf_SC_GETPW_R_SIZE_MAX(std::size_t * value) { /* _SC_GETPW_R_SIZE_MAX has no limit; some platforms like certain FreeBSD versions support sysconf(_SC_GETPW_R_SIZE_MAX) in a broken way and always set EINVAL, so be resilient here: */ - return sal_False; + return false; } else { OSL_ASSERT( m >= 0 && (unsigned long) m < std::numeric_limits<std::size_t>::max()); *value = (std::size_t) m; - return sal_True; + return true; } #else /* some platforms like Mac OS X 1.3 do not define _SC_GETPW_R_SIZE_MAX: */ - return sal_False; + return false; #endif } @@ -210,7 +210,7 @@ oslSecurityError SAL_CALL osl_loginUserOnFileServer( sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security, rtl_uString **ustrIdent) { - sal_Bool bRet=sal_False; + bool bRet = false; sal_Char pszIdent[1024]; pszIdent[0] = '\0'; @@ -244,7 +244,7 @@ sal_Bool SAL_CALL osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent, sal_Bool SAL_CALL osl_getUserName(oslSecurity Security, rtl_uString **ustrName) { - sal_Bool bRet=sal_False; + bool bRet = false; sal_Char pszName[1024]; pszName[0] = '\0'; @@ -257,28 +257,28 @@ sal_Bool SAL_CALL osl_getUserName(oslSecurity Security, rtl_uString **ustrName) return bRet; } -static sal_Bool SAL_CALL osl_psz_getUserName(oslSecurity Security, sal_Char* pszName, sal_uInt32 nMax) +static bool SAL_CALL osl_psz_getUserName(oslSecurity Security, sal_Char* pszName, sal_uInt32 nMax) { oslSecurityImpl *pSecImpl = (oslSecurityImpl *)Security; if (pSecImpl == NULL || pSecImpl->m_pPasswd.pw_name == NULL) - return sal_False; + return false; strncpy(pszName, pSecImpl->m_pPasswd.pw_name, nMax); - return sal_True; + return true; } sal_Bool SAL_CALL osl_getHomeDir(oslSecurity Security, rtl_uString **pustrDirectory) { - sal_Bool bRet=sal_False; + bool bRet = false; sal_Char pszDirectory[PATH_MAX]; pszDirectory[0] = '\0'; bRet = osl_psz_getHomeDir(Security,pszDirectory,sizeof(pszDirectory)); - if ( bRet == sal_True ) + if ( bRet ) { rtl_string2UString( pustrDirectory, pszDirectory, rtl_str_getLength( pszDirectory ), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS ); OSL_ASSERT(*pustrDirectory != NULL); @@ -288,12 +288,12 @@ sal_Bool SAL_CALL osl_getHomeDir(oslSecurity Security, rtl_uString **pustrDirect return bRet; } -static sal_Bool SAL_CALL osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax) +static bool SAL_CALL osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax) { oslSecurityImpl *pSecImpl = (oslSecurityImpl *)Security; if (pSecImpl == NULL) - return sal_False; + return false; #ifdef ANDROID { @@ -354,26 +354,26 @@ static sal_Bool SAL_CALL osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszD else if (pSecImpl->m_pPasswd.pw_dir != NULL) strncpy(pszDirectory, pSecImpl->m_pPasswd.pw_dir, nMax); else - return sal_False; + return false; } else if (pSecImpl->m_pPasswd.pw_dir != NULL) strncpy(pszDirectory, pSecImpl->m_pPasswd.pw_dir, nMax); else - return sal_False; + return false; - return sal_True; + return true; } sal_Bool SAL_CALL osl_getConfigDir(oslSecurity Security, rtl_uString **pustrDirectory) { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Char pszDirectory[PATH_MAX]; pszDirectory[0] = '\0'; bRet = osl_psz_getConfigDir(Security,pszDirectory,sizeof(pszDirectory)); - if ( bRet == sal_True ) + if ( bRet ) { rtl_string2UString( pustrDirectory, pszDirectory, rtl_str_getLength( pszDirectory ), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS ); OSL_ASSERT(*pustrDirectory != NULL); @@ -387,7 +387,7 @@ sal_Bool SAL_CALL osl_getConfigDir(oslSecurity Security, rtl_uString **pustrDire #define DOT_CONFIG "/.config" -static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax) +static bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax) { sal_Char *pStr = getenv("XDG_CONFIG_HOME"); @@ -397,7 +397,7 @@ static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* ps // a default equal to $HOME/.config should be used. if (!osl_psz_getHomeDir(Security, pszDirectory, nMax)) - return sal_False; + return false; n = strlen(pszDirectory); if (n + sizeof(DOT_CONFIG) < nMax) { @@ -448,7 +448,7 @@ static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* ps else strncpy(pszDirectory, pStr, nMax); - return sal_True; + return true; } #undef DOT_CONFIG diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx index 5d39bac1a296..501346addc9c 100644 --- a/sfx2/source/appl/impldde.cxx +++ b/sfx2/source/appl/impldde.cxx @@ -400,7 +400,7 @@ IMPL_LINK( SvDDEObject, ImplGetDDEData, DdeData*, pData ) IMPL_LINK( SvDDEObject, ImplDoneDDEData, void*, pData ) { - bool bValid = (sal_Bool)(sal_uIntPtr)pData; + bool bValid = (bool)(sal_uIntPtr)pData; if( !bValid && ( pRequest || pLink )) { DdeTransaction* pReq = 0; diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 9463da95a88a..21c3213c3110 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -2377,7 +2377,7 @@ void SlideShowImpl::notifySlideEnded (const bool bReverse) boost::bind<void>( ::boost::mem_fn(&presentation::XSlideShowListener::slideEnded), _1, - sal_Bool(bReverse))); + bReverse)); } bool SlideShowImpl::notifyHyperLinkClicked( OUString const& hyperLink ) diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index bea603d886df..e1f8d95ed1d2 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -672,7 +672,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo65655, "fdo65655.docx") // However - LO assumed that because the 'even' footer is blank - it should ignore the 'Different Odd & Even Pages' flag // So it did not import it and did not export it uno::Reference<beans::XPropertySet> xPropertySet(getStyles("PageStyles")->getByName(DEFAULT_STYLE), uno::UNO_QUERY); - sal_Bool bValue = false; + bool bValue = false; xPropertySet->getPropertyValue("HeaderIsShared") >>= bValue; CPPUNIT_ASSERT_EQUAL(false, bool(bValue)); xPropertySet->getPropertyValue("FooterIsShared") >>= bValue; @@ -1411,12 +1411,12 @@ DECLARE_OOXMLEXPORT_TEST(testSmartart, "smartart.docx") xTextDocumentPropertySet->getPropertyValue(OUString("InteropGrabBag")) >>= aGrabBag; CPPUNIT_ASSERT(aGrabBag.hasElements()); // Grab Bag not empty - sal_Bool bTheme = sal_False; + bool bTheme = false; for(int i = 0; i < aGrabBag.getLength(); ++i) { if (aGrabBag[i].Name == "OOXTheme") { - bTheme = sal_True; + bTheme = true; uno::Reference<xml::dom::XDocument> aThemeDom; CPPUNIT_ASSERT(aGrabBag[i].Value >>= aThemeDom); // PropertyValue of proper type CPPUNIT_ASSERT(aThemeDom.get()); // Reference not empty @@ -1435,40 +1435,40 @@ DECLARE_OOXMLEXPORT_TEST(testSmartart, "smartart.docx") xGroupPropertySet->getPropertyValue(OUString("InteropGrabBag")) >>= aGrabBag; CPPUNIT_ASSERT(aGrabBag.hasElements()); // Grab Bag not empty - sal_Bool bData = sal_False, bLayout = sal_False, bQStyle = sal_False, bColor = sal_False, bDrawing = sal_False; + bool bData = false, bLayout = false, bQStyle = false, bColor = false, bDrawing = false; for(int i = 0; i < aGrabBag.getLength(); ++i) { if (aGrabBag[i].Name == "OOXData") { - bData = sal_True; + bData = true; uno::Reference<xml::dom::XDocument> aDataDom; CPPUNIT_ASSERT(aGrabBag[i].Value >>= aDataDom); // PropertyValue of proper type CPPUNIT_ASSERT(aDataDom.get()); // Reference not empty } else if (aGrabBag[i].Name == "OOXLayout") { - bLayout = sal_True; + bLayout = true; uno::Reference<xml::dom::XDocument> aLayoutDom; CPPUNIT_ASSERT(aGrabBag[i].Value >>= aLayoutDom); // PropertyValue of proper type CPPUNIT_ASSERT(aLayoutDom.get()); // Reference not empty } else if (aGrabBag[i].Name == "OOXStyle") { - bQStyle = sal_True; + bQStyle = true; uno::Reference<xml::dom::XDocument> aStyleDom; CPPUNIT_ASSERT(aGrabBag[i].Value >>= aStyleDom); // PropertyValue of proper type CPPUNIT_ASSERT(aStyleDom.get()); // Reference not empty } else if (aGrabBag[i].Name == "OOXColor") { - bColor = sal_True; + bColor = true; uno::Reference<xml::dom::XDocument> aColorDom; CPPUNIT_ASSERT(aGrabBag[i].Value >>= aColorDom); // PropertyValue of proper type CPPUNIT_ASSERT(aColorDom.get()); // Reference not empty } else if (aGrabBag[i].Name == "OOXDrawing") { - bDrawing = sal_True; + bDrawing = true; uno::Sequence< uno::Any > diagramDrawing; uno::Reference<xml::dom::XDocument> aDrawingDom; CPPUNIT_ASSERT(aGrabBag[i].Value >>= diagramDrawing); @@ -1570,12 +1570,12 @@ DECLARE_OOXMLEXPORT_TEST(testCustomXmlGrabBag, "customxml.docx") uno::Sequence<beans::PropertyValue> aGrabBag(0); xTextDocumentPropertySet->getPropertyValue(OUString("InteropGrabBag")) >>= aGrabBag; CPPUNIT_ASSERT(aGrabBag.hasElements()); // Grab Bag not empty - sal_Bool CustomXml = sal_False; + bool CustomXml = false; for(int i = 0; i < aGrabBag.getLength(); ++i) { if (aGrabBag[i].Name == "OOXCustomXml" || aGrabBag[i].Name == "OOXCustomXmlProps") { - CustomXml = sal_True; + CustomXml = true; uno::Reference<xml::dom::XDocument> aCustomXmlDom; uno::Sequence<uno::Reference<xml::dom::XDocument> > aCustomXmlDomList; CPPUNIT_ASSERT(aGrabBag[i].Value >>= aCustomXmlDomList); // PropertyValue of proper type diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index a533e1670c5f..9ea637a3d613 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -171,11 +171,11 @@ DECLARE_OOXMLIMPORT_TEST(testN750935, "n750935.docx") * xray ThisComponent.StyleFamilies.PageStyles.Default.FooterIsShared */ uno::Reference<beans::XPropertySet> xPropertySet(getStyles("PageStyles")->getByName(DEFAULT_STYLE), uno::UNO_QUERY); - sal_Bool bValue = false; + bool bValue = false; xPropertySet->getPropertyValue("HeaderIsShared") >>= bValue; - CPPUNIT_ASSERT_EQUAL(sal_Bool(true), bValue); + CPPUNIT_ASSERT_EQUAL(true, bValue); xPropertySet->getPropertyValue("FooterIsShared") >>= bValue; - CPPUNIT_ASSERT_EQUAL(sal_Bool(true), bValue); + CPPUNIT_ASSERT_EQUAL(true, bValue); } DECLARE_OOXMLIMPORT_TEST(testN757890, "n757890.docx") @@ -379,7 +379,7 @@ DECLARE_OOXMLIMPORT_TEST(testN764005, "n764005.docx") text::TextContentAnchorType eValue; xPropertySet->getPropertyValue("AnchorType") >>= eValue; CPPUNIT_ASSERT(eValue != text::TextContentAnchorType_AS_CHARACTER); - sal_Bool bValue = sal_True; + bool bValue = true; xPropertySet->getPropertyValue("Opaque") >>= bValue; CPPUNIT_ASSERT_EQUAL(false, bool(bValue)); } @@ -1149,7 +1149,7 @@ DECLARE_OOXMLIMPORT_TEST(testToolsLineNumbering, "tools-line-numbering.docx") * xray ThisComponent.getLineNumberingProperties().SeparatorInterval == 3 */ - sal_Bool bValue = sal_False; + bool bValue = false; sal_Int32 nValue = -1; uno::Reference< text::XTextDocument > xtextDocument(mxComponent, uno::UNO_QUERY); @@ -1157,10 +1157,10 @@ DECLARE_OOXMLIMPORT_TEST(testToolsLineNumbering, "tools-line-numbering.docx") uno::Reference< beans::XPropertySet > xPropertySet = xLineProperties->getLineNumberingProperties(); xPropertySet->getPropertyValue("IsOn") >>= bValue; - CPPUNIT_ASSERT_EQUAL(sal_True, bValue); + CPPUNIT_ASSERT_EQUAL(true, bValue); xPropertySet->getPropertyValue("CountEmptyLines") >>= bValue; - CPPUNIT_ASSERT_EQUAL(sal_True, bValue); + CPPUNIT_ASSERT_EQUAL(true, bValue); xPropertySet->getPropertyValue("NumberPosition") >>= nValue; CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nValue); diff --git a/sw/source/core/edit/edredln.cxx b/sw/source/core/edit/edredln.cxx index 96beac334783..aff204031f0c 100644 --- a/sw/source/core/edit/edredln.cxx +++ b/sw/source/core/edit/edredln.cxx @@ -95,7 +95,7 @@ bool SwEditShell::AcceptRedlinesInSelection() { SET_CURR_SHELL( this ); StartAllAction(); - sal_Bool bRet = GetDoc()->AcceptRedline( *GetCrsr(), true ); + bool bRet = GetDoc()->AcceptRedline( *GetCrsr(), true ); EndAllAction(); return bRet; } @@ -104,7 +104,7 @@ bool SwEditShell::RejectRedlinesInSelection() { SET_CURR_SHELL( this ); StartAllAction(); - sal_Bool bRet = GetDoc()->RejectRedline( *GetCrsr(), true ); + bool bRet = GetDoc()->RejectRedline( *GetCrsr(), true ); EndAllAction(); return bRet; } diff --git a/test/source/beans/xpropertyset.cxx b/test/source/beans/xpropertyset.cxx index b842cd2ce9c8..c90e6e1ef23e 100644 --- a/test/source/beans/xpropertyset.cxx +++ b/test/source/beans/xpropertyset.cxx @@ -100,7 +100,7 @@ bool XPropertySet::isPropertyValueChangeable(const OUString& rName) if (type == getCppuType<sal_Bool>()) { // boolean type - sal_Bool bOld = any.get<sal_Bool>(); + bool bOld = any.get<sal_Bool>(); xPropSet->setPropertyValue(rName, makeAny(!bOld)); } else if (type == getCppuType<sal_Int8>()) diff --git a/test/source/sheet/datapilotfield.cxx b/test/source/sheet/datapilotfield.cxx index bf25ba89b384..1cd175a21faf 100644 --- a/test/source/sheet/datapilotfield.cxx +++ b/test/source/sheet/datapilotfield.cxx @@ -50,7 +50,7 @@ void DataPilotField::testSortInfo() && aNewSortInfoValue.Mode == aSortInfoValue.Mode && aNewSortInfoValue.IsAscending == aSortInfoValue.IsAscending); //setting HasSortInfo only makes sense for false, for true the uno implementation does nothing - sal_Bool bHasSortInfo; + bool bHasSortInfo; OUString aHasSortInfo("HasSortInfo"); xValue = xPropSet->getPropertyValue(aHasSortInfo); CPPUNIT_ASSERT( xValue >>= bHasSortInfo ); @@ -83,7 +83,7 @@ void DataPilotField::testLayoutInfo() aNewLayoutInfoValue.AddEmptyLines == aLayoutInfoValue.AddEmptyLines); //setting HasLayoutInfo only makes sense for false, tor true the uno implementation does nothing - sal_Bool bHasLayoutInfo; + bool bHasLayoutInfo; OUString aHasLayoutInfo("HasLayoutInfo"); xValue = xPropSet->getPropertyValue(aHasLayoutInfo); CPPUNIT_ASSERT( xValue >>= bHasLayoutInfo ); @@ -116,7 +116,7 @@ void DataPilotField::testAutoShowInfo() aNewAutoShowInfoValue.IsEnabled == aAutoShowInfoValue.IsEnabled); //setting HasLayoutInfo only makes sense for false, tor true the uno implementation does nothing - sal_Bool bHasAutoShowInfo; + bool bHasAutoShowInfo; OUString aHasAutoShowInfo("HasAutoShowInfo"); xValue = xPropSet->getPropertyValue(aHasAutoShowInfo); CPPUNIT_ASSERT( xValue >>= bHasAutoShowInfo ); @@ -149,7 +149,7 @@ void DataPilotField::testReference() && aReferenceValue.ReferenceItemType == aNewReferenceValue.ReferenceItemType); //setting HasReference only makes sense for false, tor true the uno implementation does nothing - sal_Bool bHasReference; + bool bHasReference; OUString aHasReference("HasReference"); xValue = xPropSet->getPropertyValue(aHasReference); CPPUNIT_ASSERT( xValue >>= bHasReference ); @@ -169,7 +169,7 @@ void DataPilotField::testIsGroupField() uno::Reference< beans::XPropertySet > xPropSet(init(),UNO_QUERY_THROW); uno::Any xValue; OUString aIsGroupField("IsGroupField"); - sal_Bool bIsGroupField; + bool bIsGroupField; xValue = xPropSet->getPropertyValue(aIsGroupField); CPPUNIT_ASSERT( xValue >>= bIsGroupField); diff --git a/test/source/sheet/xdatabaserange.cxx b/test/source/sheet/xdatabaserange.cxx index 8b7f1190f13c..4bd0d27d61a0 100644 --- a/test/source/sheet/xdatabaserange.cxx +++ b/test/source/sheet/xdatabaserange.cxx @@ -73,15 +73,15 @@ void XDatabaseRange::testGetSortDescriptor() if (xProp.Name == "IsSortColumns") { - sal_Bool bIsSortColumns = sal_True; + bool bIsSortColumns = true; xProp.Value >>= bIsSortColumns; - CPPUNIT_ASSERT(bIsSortColumns == sal_True); + CPPUNIT_ASSERT(bIsSortColumns); } else if (xProp.Name == "ContainsHeader") { - sal_Bool bContainsHeader = sal_True; + bool bContainsHeader = true; xProp.Value >>= bContainsHeader; - CPPUNIT_ASSERT(bContainsHeader == sal_True); + CPPUNIT_ASSERT(bContainsHeader); } else if (xProp.Name == "MaxFieldCount") { @@ -96,15 +96,15 @@ void XDatabaseRange::testGetSortDescriptor() } else if (xProp.Name == "BindFormatsToContent") { - sal_Bool bBindFormatsToContent = sal_False; + bool bBindFormatsToContent = false; xProp.Value >>= bBindFormatsToContent; - CPPUNIT_ASSERT(bBindFormatsToContent == sal_True); + CPPUNIT_ASSERT(bBindFormatsToContent); } else if (xProp.Name == "CopyOutputData") { - sal_Bool bCopyOutputData = sal_True; + bool bCopyOutputData = true; xProp.Value >>= bCopyOutputData; - CPPUNIT_ASSERT(bCopyOutputData == sal_False); + CPPUNIT_ASSERT(bCopyOutputData == false); } else if (xProp.Name == "OutputPosition") { @@ -112,9 +112,9 @@ void XDatabaseRange::testGetSortDescriptor() } else if (xProp.Name == "IsUserListEnabled") { - sal_Bool bIsUserListEnabled = sal_True; + bool bIsUserListEnabled = true; xProp.Value >>= bIsUserListEnabled; - CPPUNIT_ASSERT(bIsUserListEnabled == sal_False); + CPPUNIT_ASSERT(bIsUserListEnabled == false); } else if (xProp.Name == "UserListIndex") diff --git a/test/source/sheet/xprintareas.cxx b/test/source/sheet/xprintareas.cxx index 298c0d43609e..5e1fb609ed10 100644 --- a/test/source/sheet/xprintareas.cxx +++ b/test/source/sheet/xprintareas.cxx @@ -21,20 +21,18 @@ namespace apitest { void XPrintAreas::testSetAndGetPrintTitleColumns() { uno::Reference< sheet::XPrintAreas > xPrintAreas(init(), UNO_QUERY_THROW); - sal_Bool testState = true; - xPrintAreas->setPrintTitleColumns(testState); + xPrintAreas->setPrintTitleColumns(sal_True); - CPPUNIT_ASSERT_MESSAGE("Wrong attribution at PrintTitleColumns", xPrintAreas->getPrintTitleColumns() == testState); + CPPUNIT_ASSERT_MESSAGE("Wrong attribution at PrintTitleColumns", xPrintAreas->getPrintTitleColumns() == sal_True); } void XPrintAreas::testSetAndGetPrintTitleRows() { uno::Reference< sheet::XPrintAreas > xPrintAreas(init(), UNO_QUERY_THROW); - sal_Bool testState = true; - xPrintAreas->setPrintTitleRows(testState); + xPrintAreas->setPrintTitleRows(sal_True); - CPPUNIT_ASSERT_MESSAGE("Wrong attribution at PrintTitleRows", xPrintAreas->getPrintTitleRows() == testState); + CPPUNIT_ASSERT_MESSAGE("Wrong attribution at PrintTitleRows", xPrintAreas->getPrintTitleRows() == sal_True); } // the rest is right now in progress... diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index a29ca660d9c0..c0be052df2e0 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -124,7 +124,7 @@ public: }; -static sal_Bool equals( const TestElement & rData1, const TestElement & rData2 ) +static bool equals( const TestElement & rData1, const TestElement & rData2 ) { check( rData1.Bool == rData2.Bool, "### bool does not match!" ); check( rData1.Char == rData2.Char, "### char does not match!" ); @@ -159,7 +159,7 @@ static sal_Bool equals( const TestElement & rData1, const TestElement & rData2 ) rData1.Any == rData2.Any); } -static sal_Bool equals( const TestData & rData1, const TestData & rData2 ) +static bool equals( const TestData & rData1, const TestData & rData2 ) { sal_Int32 nLen; @@ -175,16 +175,16 @@ static sal_Bool equals( const TestData & rData1, const TestData & rData2 ) if (! equals( pElements1[nLen], pElements2[nLen] )) { check( false, "### sequence element did not match!" ); - return sal_False; + return false; } } - return sal_True; + return true; } - return sal_False; + return false; } static void assign( TestElement & rData, - sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte, + bool bBool, sal_Unicode cChar, sal_Int8 nByte, sal_Int16 nShort, sal_uInt16 nUShort, sal_Int32 nLong, sal_uInt32 nULong, sal_Int64 nHyper, sal_uInt64 nUHyper, @@ -248,7 +248,7 @@ bool testAny( } -static sal_Bool performAnyTest( const Reference< XBridgeTest > &xLBT, const TestData &data) +static bool performAnyTest( const Reference< XBridgeTest > &xLBT, const TestData &data) { bool bReturn = true; bReturn = testAny( data.Byte ,xLBT ) && bReturn; @@ -283,7 +283,7 @@ static sal_Bool performAnyTest( const Reference< XBridgeTest > &xLBT, const Test } -static sal_Bool performSequenceOfCallTest( const Reference < XBridgeTest > &xLBT ) +static bool performSequenceOfCallTest( const Reference < XBridgeTest > &xLBT ) { sal_Int32 i,nRounds; sal_Int32 nGlobalIndex = 0; @@ -328,11 +328,11 @@ public: -static sal_Bool performRecursiveCallTest( const Reference < XBridgeTest > & xLBT ) +static bool performRecursiveCallTest( const Reference < XBridgeTest > & xLBT ) { xLBT->startRecursiveCall( new ORecursiveCall , 50 ); // on failure, the test would lock up or crash - return sal_True; + return true; } class MyClass : public osl::DebugBase<MyClass>, public OWeakObject @@ -364,7 +364,7 @@ void MyClass::release() throw () } -static sal_Bool performTest( +static bool performTest( const Reference<XComponentContext> & xContext, const Reference<XBridgeTest > & xLBT, bool noCurrentContext ) @@ -924,9 +924,9 @@ static sal_Bool performTest( return bRet; } -static sal_Bool raiseOnewayException( const Reference < XBridgeTest > & xLBT ) +static bool raiseOnewayException( const Reference < XBridgeTest > & xLBT ) { - sal_Bool bReturn = sal_True; + bool bReturn = true; OUString sCompare = STRING_TEST_CONSTANT; Reference<XInterface> const x(xLBT->getInterface()); try @@ -949,7 +949,7 @@ static sal_Bool raiseOnewayException( const Reference < XBridgeTest > & xLBT ) } -static sal_Bool raiseException( const Reference< XBridgeTest > & xLBT ) +static bool raiseException( const Reference< XBridgeTest > & xLBT ) { sal_Int32 nCount = 0; try @@ -1027,7 +1027,7 @@ static sal_Bool raiseException( const Reference< XBridgeTest > & xLBT ) } return (nCount == 3); } - return sal_False; + return false; } /* Returns an acquired sequence diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx index 6c338035aacf..1bc595c96f47 100644 --- a/testtools/source/bridgetest/constructors.cxx +++ b/testtools/source/bridgetest/constructors.cxx @@ -68,7 +68,7 @@ private: void Impl::initialize(css::uno::Sequence< css::uno::Any > const & arguments) throw (css::uno::Exception, std::exception) { - sal_Bool arg0 = sal_Bool(); + bool arg0; ::sal_Int8 arg1 = sal_Int8(); ::sal_Int16 arg2 = sal_Int16(); ::sal_uInt16 arg3 = sal_uInt16(); @@ -80,7 +80,7 @@ void Impl::initialize(css::uno::Sequence< css::uno::Any > const & arguments) double arg9 = double(); OUString arg11; css::uno::Type arg12; - sal_Bool arg13 = sal_Bool(); + bool arg13; css::uno::Sequence< sal_Bool > arg14; css::uno::Sequence< ::sal_Int8 > arg15; css::uno::Sequence< ::sal_Int16 > arg16; @@ -94,23 +94,23 @@ void Impl::initialize(css::uno::Sequence< css::uno::Any > const & arguments) css::uno::Sequence< OUString > arg25; css::uno::Sequence< css::uno::Type > arg26; css::uno::Sequence< css::uno::Any > arg27; - sal_Bool arg27b = sal_Bool(); + bool arg27b; css::uno::Sequence< css::uno::Sequence< sal_Bool > > arg28; css::uno::Sequence< css::uno::Sequence< css::uno::Any > > arg29; - sal_Bool arg29b = sal_Bool(); + bool arg29b; css::uno::Sequence< ::test::testtools::bridgetest::TestEnum > arg30; css::uno::Sequence< ::test::testtools::bridgetest::TestStruct > arg31; css::uno::Sequence< ::test::testtools::bridgetest::TestPolyStruct< sal_Bool > > arg32; css::uno::Sequence< ::test::testtools::bridgetest::TestPolyStruct< css::uno::Any > > arg33; - sal_Bool arg33b = sal_Bool(); + bool arg33b; css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > arg34; ::test::testtools::bridgetest::TestEnum arg35; ::test::testtools::bridgetest::TestStruct arg36; ::test::testtools::bridgetest::TestPolyStruct< sal_Bool > arg37; ::test::testtools::bridgetest::TestPolyStruct< css::uno::Any > arg38; - sal_Bool arg38b = sal_Bool(); + bool arg38b; css::uno::Reference< css::uno::XInterface > arg39; if (!(arguments.getLength() == 40 && (arguments[0] >>= arg0) && arg0 diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx index af14d325d9d4..d9e5ef77cf2f 100644 --- a/testtools/source/bridgetest/cppobj.cxx +++ b/testtools/source/bridgetest/cppobj.cxx @@ -70,7 +70,7 @@ inline static Sequence< OUString > getSupportedServiceNames() static void assign( TestElement & rData, - sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte, + bool bBool, sal_Unicode cChar, sal_Int8 nByte, sal_Int16 nShort, sal_uInt16 nUShort, sal_Int32 nLong, sal_uInt32 nULong, sal_Int64 nHyper, sal_uInt64 nUHyper, @@ -97,7 +97,7 @@ static void assign( TestElement & rData, } static void assign( TestData & rData, - sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte, + bool bBool, sal_Unicode cChar, sal_Int8 nByte, sal_Int16 nShort, sal_uInt16 nUShort, sal_Int32 nLong, sal_uInt32 nULong, sal_Int64 nHyper, sal_uInt64 nUHyper, diff --git a/unoxml/source/xpath/xpathobject.cxx b/unoxml/source/xpath/xpathobject.cxx index 0272c826b97d..11078401865a 100644 --- a/unoxml/source/xpath/xpathobject.cxx +++ b/unoxml/source/xpath/xpathobject.cxx @@ -95,7 +95,7 @@ namespace XPath { ::osl::MutexGuard const g(m_rMutex); - return (sal_Bool) xmlXPathCastToBoolean(m_pXPathObj.get()); + return xmlXPathCastToBoolean(m_pXPathObj.get()) != 0; } /** |