From bbd9668d5f70d8ff00a7b10915e7a16ceadb8443 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 22 Jan 2014 14:58:57 +0100 Subject: bool improvements (related to mixing bool/sal_Bool in &=, |=, ^=) Change-Id: I9869d9709f28b68ef7b518527175589d80644668 --- desktop/source/app/officeipcthread.cxx | 6 +++--- desktop/source/deployment/manager/dp_extensionmanager.cxx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'desktop') diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index a805ddf13795..f3e46ec7a0a4 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -727,7 +727,7 @@ void OfficeIPCThread::execute() continue; } - sal_Bool bDocRequestSent = sal_False; + bool bDocRequestSent = false; OUString aUnknown( aCmdLineArgs->GetUnknown() ); if ( !aUnknown.isEmpty() || aCmdLineArgs->IsHelp() ) @@ -810,7 +810,7 @@ void OfficeIPCThread::execute() // we only do this if no document was specified on the command line, // since this would be inconsistent with the behaviour of // the first process, see OpenClients() (call to OpenDefault()) in app.cxx - if ( aCmdLineArgs->HasModuleParam() && (!bDocRequestSent) ) + if ( aCmdLineArgs->HasModuleParam() && !bDocRequestSent ) { SvtModuleOptions aOpt; SvtModuleOptions::EFactory eFactory = SvtModuleOptions::E_WRITER; @@ -835,7 +835,7 @@ void OfficeIPCThread::execute() pRequest->aModule = aOpt.GetFactoryName( eFactory ); else pRequest->aOpenList.push_back( aOpt.GetFactoryEmptyDocumentURL( eFactory ) ); - bDocRequestSent = sal_True; + bDocRequestSent = true; } } diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 3fc60b42688e..d569723b995f 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -327,7 +327,7 @@ ExtensionManager::getExtensionsWithSameIdentifier( ::std::list > listExtensions = getExtensionsWithSameId( identifier, fileName, xCmdEnv); - sal_Bool bHasExtension = false; + bool bHasExtension = false; //throw an IllegalArgumentException if there is no extension at all. typedef ::std::list >::const_iterator CIT; -- cgit