summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-22 14:58:57 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-22 15:00:54 +0100
commitbbd9668d5f70d8ff00a7b10915e7a16ceadb8443 (patch)
tree4e65b4d58e6a4298219b1909f524b710677606d9 /desktop
parent4eda1a0293a869bf804056f1e9e04c984c69454d (diff)
bool improvements (related to mixing bool/sal_Bool in &=, |=, ^=)
Change-Id: I9869d9709f28b68ef7b518527175589d80644668
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/officeipcthread.cxx6
-rw-r--r--desktop/source/deployment/manager/dp_extensionmanager.cxx2
2 files changed, 4 insertions, 4 deletions
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<Reference<css::deployment::XPackage> > 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<Reference<css::deployment::XPackage> >::const_iterator CIT;