summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-05-08 11:43:26 +0200
committerNoel Grandin <noel@peralex.com>2014-05-08 11:48:14 +0200
commit798531135855ad17d4939bee1c920d26032758c6 (patch)
tree55c08c1465fa90c2481ff04f0f11a1ec19a141f5 /desktop
parent79cf53cb3b68d135b1df2453d2302358e2acb053 (diff)
desktop: sal_Bool->bool
Change-Id: I3462a9d4c23c9bc858c1a9d91caa58d87b204ee0
Diffstat (limited to 'desktop')
-rw-r--r--desktop/inc/app.hxx12
-rw-r--r--desktop/source/app/app.cxx101
-rw-r--r--desktop/source/app/appinit.cxx6
-rw-r--r--desktop/source/app/check_ext_deps.cxx2
-rw-r--r--desktop/source/app/dispatchwatcher.cxx16
-rw-r--r--desktop/source/app/dispatchwatcher.hxx2
-rw-r--r--desktop/source/app/officeipcthread.cxx24
-rw-r--r--desktop/source/app/officeipcthread.hxx4
-rw-r--r--desktop/source/migration/migration.cxx16
-rw-r--r--desktop/source/migration/migration_impl.hxx10
-rw-r--r--desktop/source/migration/services/jvmfwk.cxx10
-rw-r--r--desktop/source/splash/splash.cxx42
12 files changed, 121 insertions, 124 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 8b8affe06a04..984d31e1e83c 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -114,10 +114,10 @@ class Desktop : public Application
return m_aBootstrapStatus;
}
- static sal_Bool isCrashReporterEnabled();
+ static bool isCrashReporterEnabled();
// first-start (ever) related methods
- static sal_Bool CheckExtensionDependencies();
+ static bool CheckExtensionDependencies();
void SynchronizeExtensionRepositories();
void SetSplashScreenText( const OUString& rText );
@@ -136,10 +136,10 @@ class Desktop : public Application
void CreateTemporaryDirectory();
void RemoveTemporaryDirectory();
- sal_Bool InitializeInstallation( const OUString& rAppFilename );
+ bool InitializeInstallation( const OUString& rAppFilename );
bool InitializeConfiguration();
void FlushConfiguration();
- sal_Bool InitializeQuickstartMode( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
+ bool InitializeQuickstartMode( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
void HandleBootstrapPathErrors( ::utl::Bootstrap::Status, const OUString& aMsg );
void StartSetup( const OUString& aParameters );
@@ -169,9 +169,9 @@ class Desktop : public Application
static void ShowBackingComponent(Desktop * progress);
- static sal_Bool SaveTasks();
+ static bool SaveTasks();
- static sal_Bool isUIOnSessionShutdownAllowed();
+ static bool isUIOnSessionShutdownAllowed();
// on-demand acceptors
static void createAcceptor(const OUString& aDescription);
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 247ac1df6ef8..018f52db05a9 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -721,13 +721,13 @@ bool Desktop::QueryExit()
Reference< XDesktop2 > xDesktop = css::frame::Desktop::create( ::comphelper::getProcessComponentContext() );
Reference< XPropertySet > xPropertySet(xDesktop, UNO_QUERY_THROW);
- xPropertySet->setPropertyValue( OUString(SUSPEND_QUICKSTARTVETO ), Any((sal_Bool)sal_True) );
+ xPropertySet->setPropertyValue( OUString(SUSPEND_QUICKSTARTVETO ), Any(true) );
- sal_Bool bExit = xDesktop->terminate();
+ bool bExit = xDesktop->terminate();
if ( !bExit )
{
- xPropertySet->setPropertyValue( OUString(SUSPEND_QUICKSTARTVETO ), Any((sal_Bool)sal_False) );
+ xPropertySet->setPropertyValue( OUString(SUSPEND_QUICKSTARTVETO ), Any(false) );
}
else
{
@@ -780,7 +780,7 @@ OUString Desktop::CreateErrorMsgString(
{
OUString aMsg;
OUString aFilePath;
- sal_Bool bFileInfo = sal_True;
+ bool bFileInfo = true;
switch ( nFailureCode )
{
@@ -789,7 +789,7 @@ OUString Desktop::CreateErrorMsgString(
{
aMsg = GetMsgString( STR_BOOTSTRAP_ERR_PATH_INVALID,
OUString( "The installation path is not available." ) );
- bFileInfo = sal_False;
+ bFileInfo = false;
}
break;
@@ -840,7 +840,7 @@ OUString Desktop::CreateErrorMsgString(
{
aMsg = GetMsgString( STR_BOOTSTRAP_ERR_INTERNAL,
OUString( "An internal failure occurred." ) );
- bFileInfo = sal_False;
+ bFileInfo = false;
}
break;
@@ -848,7 +848,7 @@ OUString Desktop::CreateErrorMsgString(
{
// This needs to be improved, see #i67575#:
aMsg = "Invalid version file entry";
- bFileInfo = sal_False;
+ bFileInfo = false;
}
break;
@@ -1073,7 +1073,7 @@ void Desktop::HandleBootstrapErrors(
}
-sal_Bool Desktop::isUIOnSessionShutdownAllowed()
+bool Desktop::isUIOnSessionShutdownAllowed()
{
return officecfg::Office::Recovery::SessionShutdown::DocumentStoreUIEnabled
::get();
@@ -1096,9 +1096,9 @@ sal_Bool Desktop::isUIOnSessionShutdownAllowed()
Because the user may be logged out last time from it's
unix session...
*/
-void impl_checkRecoveryState(sal_Bool& bCrashed ,
- sal_Bool& bRecoveryDataExists,
- sal_Bool& bSessionDataExists )
+void impl_checkRecoveryState(bool& bCrashed ,
+ bool& bRecoveryDataExists,
+ bool& bSessionDataExists )
{
bCrashed = officecfg::Office::Recovery::RecoveryInfo::Crashed::get();
bool elements = officecfg::Office::Recovery::RecoveryList::get()->
@@ -1115,8 +1115,8 @@ void impl_checkRecoveryState(sal_Bool& bCrashed ,
@param bEmergencySave
differs between EMERGENCY_SAVE and RECOVERY
*/
-sal_Bool impl_callRecoveryUI(sal_Bool bEmergencySave ,
- sal_Bool bExistsRecoveryData)
+bool impl_callRecoveryUI(bool bEmergencySave ,
+ bool bExistsRecoveryData)
{
static OUString SERVICENAME_RECOVERYUI("com.sun.star.comp.svx.RecoveryUI");
static OUString COMMAND_EMERGENCYSAVE("vnd.sun.star.autorecovery:/doEmergencySave");
@@ -1142,7 +1142,7 @@ sal_Bool impl_callRecoveryUI(sal_Bool bEmergencySave ,
xURLParser->parseStrict(aURL);
css::uno::Any aRet = xRecoveryUI->dispatchWithReturnValue(aURL, css::uno::Sequence< css::beans::PropertyValue >());
- sal_Bool bRet = sal_False;
+ bool bRet = false;
aRet >>= bRet;
return !bEmergencySave || bRet;
}
@@ -1155,11 +1155,11 @@ sal_Bool impl_callRecoveryUI(sal_Bool bEmergencySave ,
*
*/
-sal_Bool Desktop::SaveTasks()
+bool Desktop::SaveTasks()
{
return impl_callRecoveryUI(
- sal_True , // sal_True => force emergency save
- sal_False);
+ true , // sal_True => force emergency save
+ false);
}
namespace {
@@ -1248,7 +1248,7 @@ void restartOnMac(bool passArguments) {
sal_uInt16 Desktop::Exception(sal_uInt16 nError)
{
// protect against recursive calls
- static sal_Bool bInException = sal_False;
+ static bool bInException = false;
sal_uInt16 nOldMode = Application::GetSystemWindowMode();
Application::SetSystemWindowMode( nOldMode & ~SYSTEMWINDOW_MODE_NOAUTOMODE );
@@ -1260,12 +1260,12 @@ sal_uInt16 Desktop::Exception(sal_uInt16 nError)
Application::Abort( aDoubleExceptionString );
}
- bInException = sal_True;
+ bInException = true;
const CommandLineArgs& rArgs = GetCommandLineArgs();
// save all modified documents ... if it's allowed doing so.
- sal_Bool bRestart = sal_False;
- sal_Bool bAllowRecoveryAndSessionManagement = (
+ bool bRestart = false;
+ bool bAllowRecoveryAndSessionManagement = (
( !rArgs.IsNoRestore() ) && // some use cases of office must work without recovery
( !rArgs.IsHeadless() ) &&
(( nError & EXC_MAJORTYPE ) != EXC_DISPLAY ) && // recovery can't work without UI ... but UI layer seems to be the reason for this crash
@@ -1323,14 +1323,14 @@ void Desktop::AppEvent( const ApplicationEvent& rAppEvent )
struct ExecuteGlobals
{
Reference < css::document::XEventListener > xGlobalBroadcaster;
- sal_Bool bRestartRequested;
- sal_Bool bUseSystemFileDialog;
+ bool bRestartRequested;
+ bool bUseSystemFileDialog;
std::auto_ptr<SvtLanguageOptions> pLanguageOptions;
std::auto_ptr<SvtPathOptions> pPathOptions;
ExecuteGlobals()
- : bRestartRequested( sal_False )
- , bUseSystemFileDialog( sal_True )
+ : bRestartRequested( false )
+ , bUseSystemFileDialog( true )
{}
};
@@ -1520,9 +1520,9 @@ int Desktop::Main()
SetSplashScreenProgress(50);
// Backing Component
- sal_Bool bCrashed = sal_False;
- sal_Bool bExistsRecoveryData = sal_False;
- sal_Bool bExistsSessionData = sal_False;
+ bool bCrashed = false;
+ bool bExistsRecoveryData = false;
+ bool bExistsSessionData = false;
SAL_INFO( "desktop.app", "{ impl_checkRecoveryState" );
impl_checkRecoveryState(bCrashed, bExistsRecoveryData, bExistsSessionData);
@@ -1615,7 +1615,7 @@ int Desktop::Main()
if ( !pExecGlobals->bRestartRequested )
{
Application::SetFilterHdl( LINK( this, Desktop, ImplInitFilterHdl ) );
- sal_Bool bTerminateRequested = sal_False;
+ bool bTerminateRequested = false;
// Preload function depends on an initialized sfx application!
SetSplashScreenProgress(75);
@@ -1775,7 +1775,7 @@ int Desktop::doShutdown()
pExecGlobals->pPathOptions.reset( 0 );
SAL_INFO( "desktop.app", "<- dispose path/language options" );
- sal_Bool bRR = pExecGlobals->bRestartRequested;
+ bool bRR = pExecGlobals->bRestartRequested;
delete pExecGlobals, pExecGlobals = NULL;
SAL_INFO( "desktop.app", "FINISHED WITH Destop::Main" );
@@ -1870,7 +1870,7 @@ void Desktop::FlushConfiguration()
css::uno::UNO_QUERY_THROW)->flush();
}
-sal_Bool Desktop::InitializeQuickstartMode( const Reference< XComponentContext >& rxContext )
+bool Desktop::InitializeQuickstartMode( const Reference< XComponentContext >& rxContext )
{
try
{
@@ -1879,7 +1879,7 @@ sal_Bool Desktop::InitializeQuickstartMode( const Reference< XComponentContext >
// this will only be activated if --quickstart was specified on cmdline
SAL_INFO( "desktop.app", "desktop (cd100003) createInstance com.sun.star.office.Quickstart" );
- sal_Bool bQuickstart = shouldLaunchQuickstart();
+ bool bQuickstart = shouldLaunchQuickstart();
// Try to instantiate quickstart service. This service is not mandatory, so
// do nothing if service is not available
@@ -1898,11 +1898,11 @@ sal_Bool Desktop::InitializeQuickstartMode( const Reference< XComponentContext >
{
css::office::Quickstart::createStart(rxContext, bQuickstart);
}
- return sal_True;
+ return true;
}
catch( const ::com::sun::star::uno::Exception& )
{
- return sal_False;
+ return false;
}
}
@@ -2227,28 +2227,28 @@ void Desktop::OpenClients()
if (!rArgs.IsQuickstart())
{
- sal_Bool bShowHelp = sal_False;
+ bool bShowHelp = false;
OUStringBuffer aHelpURLBuffer;
if (rArgs.IsHelpWriter()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://swriter/start");
} else if (rArgs.IsHelpCalc()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://scalc/start");
} else if (rArgs.IsHelpDraw()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://sdraw/start");
} else if (rArgs.IsHelpImpress()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://simpress/start");
} else if (rArgs.IsHelpBase()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://sdatabase/start");
} else if (rArgs.IsHelpBasic()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://sbasic/start");
} else if (rArgs.IsHelpMath()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://smath/start");
}
if (bShowHelp) {
@@ -2308,10 +2308,7 @@ void Desktop::OpenClients()
// but no document inside memory corrspond to this data.
// Furter it's not acceptable to recover such documents without any UI. It can
// need some time, where the user wont see any results and wait for finishing the office startup ...
- sal_Bool bAllowRecoveryAndSessionManagement = (
- ( !rArgs.IsNoRestore() ) &&
- ( !rArgs.IsHeadless() )
- );
+ bool bAllowRecoveryAndSessionManagement = ( !rArgs.IsNoRestore() ) && ( !rArgs.IsHeadless() );
if ( ! bAllowRecoveryAndSessionManagement )
{
@@ -2333,9 +2330,9 @@ void Desktop::OpenClients()
}
else
{
- sal_Bool bCrashed = sal_False;
- sal_Bool bExistsRecoveryData = sal_False;
- sal_Bool bExistsSessionData = sal_False;
+ bool bCrashed = false;
+ bool bExistsRecoveryData = false;
+ bool bExistsSessionData = false;
impl_checkRecoveryState(bCrashed, bExistsRecoveryData, bExistsSessionData);
@@ -2349,7 +2346,7 @@ void Desktop::OpenClients()
try
{
bRecovery = impl_callRecoveryUI(
- sal_False , // false => force recovery instead of emergency save
+ false , // false => force recovery instead of emergency save
bExistsRecoveryData);
}
catch(const css::uno::Exception& e)
@@ -2731,7 +2728,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent )
void Desktop::OpenSplashScreen()
{
const CommandLineArgs &rCmdLine = GetCommandLineArgs();
- sal_Bool bVisible = sal_False;
+ bool bVisible = false;
// Show intro only if this is normal start (e.g. no server, no quickstart, no printing )
if ( !rCmdLine.IsInvisible() &&
!rCmdLine.IsHeadless() &&
@@ -2767,7 +2764,7 @@ void Desktop::OpenSplashScreen()
if ( rCmdLine.HasSplashPipe() )
aSplashService = "com.sun.star.office.PipeSplashScreen";
- bVisible = sal_True;
+ bVisible = true;
Sequence< Any > aSeq( 2 );
aSeq[0] <<= bVisible;
aSeq[1] <<= aAppName;
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 68f7aa026d22..221afef31c99 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -129,7 +129,7 @@ void Desktop::RegisterServices(Reference< XComponentContext > const & context)
CommandLineArgs& rCmdLine = GetCommandLineArgs();
// Headless mode for FAT Office
- sal_Bool bHeadlessMode = rCmdLine.IsHeadless();
+ bool bHeadlessMode = rCmdLine.IsHeadless();
if ( bHeadlessMode )
Application::EnableHeadlessMode(false);
@@ -160,7 +160,7 @@ namespace
struct CurrentTempURL : public rtl::Static< OUString, CurrentTempURL > {};
}
-static sal_Bool bAccept = sal_False;
+static bool bAccept = false;
void Desktop::createAcceptor(const OUString& aAcceptString)
{
@@ -219,7 +219,7 @@ void Desktop::enableAcceptors()
if (!bAccept)
{
// from now on, all new acceptors are enabled
- bAccept = sal_True;
+ bAccept = true;
// enable existing acceptors by calling initialize(true)
// on all existing acceptors
AcceptorMap &rMap = acceptorMap::get();
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index 6bc0f304e2ba..4bdde01b0051 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -384,7 +384,7 @@ static bool impl_needsCompatCheck()
// Do we need to check the dependencies of the extensions?
// When there are unresolved issues, we can't continue with startup
-sal_Bool Desktop::CheckExtensionDependencies()
+bool Desktop::CheckExtensionDependencies()
{
if (!impl_needsCompatCheck())
{
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 5b0e2702cdc5..abdbe3842e34 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -159,14 +159,14 @@ DispatchWatcher::~DispatchWatcher()
}
-sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatchRequestsList, bool bNoTerminate )
+bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatchRequestsList, bool bNoTerminate )
{
Reference< XDesktop2 > xDesktop = css::frame::Desktop::create( ::comphelper::getProcessComponentContext() );
DispatchList::const_iterator p;
std::vector< DispatchHolder > aDispatches;
OUString aAsTemplateArg( "AsTemplate" );
- sal_Bool bSetInputFilter = sal_False;
+ bool bSetInputFilter = false;
OUString aForcedInputFilter;
for ( p = aDispatchRequestsList.begin(); p != aDispatchRequestsList.end(); ++p )
@@ -181,7 +181,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
// Set Input Filter
if ( aDispatchRequest.aRequestType == REQUEST_INFILTER )
{
- bSetInputFilter = sal_True;
+ bSetInputFilter = true;
aForcedInputFilter = aDispatchRequest.aURL;
OfficeIPCThread::RequestsCompleted( 1 );
continue;
@@ -424,7 +424,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
OUString aFilterOut=aParam.copy( nPathIndex+1 );
OUString aFilter;
OUString aFilterExt;
- sal_Bool bGuess = sal_False;
+ bool bGuess = false;
if( nFilterIndex >= 0 )
{
@@ -434,7 +434,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
else
{
// Guess
- bGuess = sal_True;
+ bGuess = true;
aFilterExt = aParam.copy( 0, nPathIndex );
}
INetURLObject aOutFilename( aObj );
@@ -515,7 +515,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
aPrinterArgs[0].Name = "FileName";
aPrinterArgs[0].Value <<= aOutFile;
aPrinterArgs[1].Name = "Wait";
- aPrinterArgs[1].Value <<= ( sal_Bool ) sal_True;
+ aPrinterArgs[1].Value <<= true;
xDoc->print( aPrinterArgs );
} else {
if ( aDispatchRequest.aRequestType == REQUEST_PRINTTO )
@@ -530,7 +530,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
// print ( also without user interaction )
Sequence < PropertyValue > aPrinterArgs( 1 );
aPrinterArgs[0].Name = "Wait";
- aPrinterArgs[0].Value <<= ( sal_Bool ) sal_True;
+ aPrinterArgs[0].Value <<= true;
xDoc->print( aPrinterArgs );
}
}
@@ -607,7 +607,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
}
}
- return sal_False;
+ return false;
}
diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx
index 1ac7b4d3edf5..1fa1c9d97b49 100644
--- a/desktop/source/app/dispatchwatcher.hxx
+++ b/desktop/source/app/dispatchwatcher.hxx
@@ -92,7 +92,7 @@ class DispatchWatcher : public ::cppu::WeakImplHelper1< ::com::sun::star::frame:
static DispatchWatcher* GetDispatchWatcher();
// execute new dispatch request
- sal_Bool executeDispatchRequests( const DispatchList& aDispatches, bool bNoTerminate = false );
+ bool executeDispatchRequests( const DispatchList& aDispatches, bool bNoTerminate = false );
private:
DispatchWatcher();
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 7c1d5d6a6645..4702f8589bdc 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -425,14 +425,14 @@ void OfficeIPCThread::EnableRequests( bool i_bEnable )
}
}
-sal_Bool OfficeIPCThread::AreRequestsPending()
+bool OfficeIPCThread::AreRequestsPending()
{
// Give info about pending requests
::osl::MutexGuard aGuard( GetMutex() );
if ( pGlobalOfficeIPCThread.is() )
return ( pGlobalOfficeIPCThread->mnPendingRequests > 0 );
else
- return sal_False;
+ return false;
}
void OfficeIPCThread::RequestsCompleted( int nCount )
@@ -840,28 +840,28 @@ void OfficeIPCThread::execute()
}
if ( !aCmdLineArgs->IsQuickstart() ) {
- sal_Bool bShowHelp = sal_False;
+ bool bShowHelp = false;
OUStringBuffer aHelpURLBuffer;
if (aCmdLineArgs->IsHelpWriter()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://swriter/start");
} else if (aCmdLineArgs->IsHelpCalc()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://scalc/start");
} else if (aCmdLineArgs->IsHelpDraw()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://sdraw/start");
} else if (aCmdLineArgs->IsHelpImpress()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://simpress/start");
} else if (aCmdLineArgs->IsHelpBase()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://sdatabase/start");
} else if (aCmdLineArgs->IsHelpBasic()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://sbasic/start");
} else if (aCmdLineArgs->IsHelpMath()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://smath/start");
}
if (bShowHelp) {
@@ -1018,7 +1018,7 @@ static void AddConversionsToDispatchList(
}
-sal_Bool OfficeIPCThread::ExecuteCmdLineRequests( ProcessDocumentsRequest& aRequest )
+bool OfficeIPCThread::ExecuteCmdLineRequests( ProcessDocumentsRequest& aRequest )
{
// protect the dispatch list
osl::ClearableMutexGuard aGuard( GetMutex() );
@@ -1036,7 +1036,7 @@ sal_Bool OfficeIPCThread::ExecuteCmdLineRequests( ProcessDocumentsRequest& aRequ
AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aForceOpenList, DispatchWatcher::REQUEST_FORCEOPEN, aEmpty, aRequest.aModule );
AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aForceNewList, DispatchWatcher::REQUEST_FORCENEW, aEmpty, aRequest.aModule );
AddConversionsToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aConversionList, aRequest.aConversionParams, aRequest.aPrinterName, aRequest.aModule, aRequest.aConversionOut );
- sal_Bool bShutdown( sal_False );
+ bool bShutdown( false );
if ( pGlobalOfficeIPCThread.is() )
{
diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx
index 139f1bcb1a33..101536650053 100644
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -114,9 +114,9 @@ class OfficeIPCThread : public salhelper::Thread
// controlling pipe communication during shutdown
static void SetDowning();
static void EnableRequests( bool i_bEnable = true );
- static sal_Bool AreRequestsPending();
+ static bool AreRequestsPending();
static void RequestsCompleted( int n = 1 );
- static sal_Bool ExecuteCmdLineRequests( ProcessDocumentsRequest& );
+ static bool ExecuteCmdLineRequests( ProcessDocumentsRequest& );
// return sal_False if second office
static Status EnableOfficeIPCThread();
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 4b53ec3af5fc..f455821204a0 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -211,7 +211,7 @@ void Migration::migrateSettingsIfNecessary()
if (! aImpl.initializeMigration() )
return;
- sal_Bool bResult = sal_False;
+ bool bResult = false;
try
{
bResult = aImpl.doMigration();
@@ -236,12 +236,12 @@ MigrationImpl::~MigrationImpl()
}
// The main entry point for migrating settings
-sal_Bool MigrationImpl::doMigration()
+bool MigrationImpl::doMigration()
{
// compile file list for migration
m_vrFileList = compileFileList();
- sal_Bool result = sal_False;
+ bool result = false;
try
{
NewVersionUIInfo aNewVersionUIInfo;
@@ -313,7 +313,7 @@ sal_Bool MigrationImpl::doMigration()
runServices();
refresh();
- result = sal_True;
+ result = true;
}
catch (css::uno::Exception & e)
{
@@ -352,7 +352,7 @@ void MigrationImpl::setMigrationCompleted()
bool MigrationImpl::checkMigrationCompleted()
{
- sal_Bool bMigrationCompleted = sal_False;
+ bool bMigrationCompleted = false;
try {
uno::Reference< XPropertySet > aPropertySet(
getConfigAccess("org.openoffice.Setup/Office"), uno::UNO_QUERY_THROW);
@@ -362,7 +362,7 @@ bool MigrationImpl::checkMigrationCompleted()
{
// migration prevented - fake it's success
setMigrationCompleted();
- bMigrationCompleted = sal_True;
+ bMigrationCompleted = true;
}
}
catch (const Exception&)
@@ -859,7 +859,7 @@ void MigrationImpl::copyConfig() {
}
}
-uno::Reference< XNameAccess > MigrationImpl::getConfigAccess(const sal_Char* pPath, sal_Bool bUpdate)
+uno::Reference< XNameAccess > MigrationImpl::getConfigAccess(const sal_Char* pPath, bool bUpdate)
{
uno::Reference< XNameAccess > xNameAccess;
try{
@@ -1030,7 +1030,7 @@ void MigrationImpl::runServices()
if (xNameAccess->getElementNames().getLength() > 0)
{
aModuleInfo.sModuleShortName = sModuleShortName;
- aModuleInfo.bHasMenubar = sal_True;
+ aModuleInfo.bHasMenubar = true;
}
}
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index 576e7d7870e9..5f8e345fb0a0 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -114,7 +114,7 @@ struct MigrationItem
return *this;
}
- sal_Bool operator==(const MigrationItem& aMigrationItem)
+ bool operator==(const MigrationItem& aMigrationItem)
{
return ( aMigrationItem.m_sParentNodeName == m_sParentNodeName &&
aMigrationItem.m_sPrevSibling == m_sPrevSibling &&
@@ -150,10 +150,10 @@ struct MigrationItemInfo
struct MigrationModuleInfo
{
OUString sModuleShortName;
- sal_Bool bHasMenubar;
+ bool bHasMenubar;
::std::vector< OUString > m_vToolbars;
- MigrationModuleInfo():bHasMenubar(sal_False){};
+ MigrationModuleInfo() : bHasMenubar(false) {};
};
@@ -205,7 +205,7 @@ private:
// helpers
strings_vr getAllFiles(const OUString& baseURL) const;
strings_vr applyPatterns(const strings_v& vSet, const strings_v& vPatterns) const;
- css::uno::Reference< css::container::XNameAccess > getConfigAccess(const sal_Char* path, sal_Bool rw=sal_False);
+ css::uno::Reference< css::container::XNameAccess > getConfigAccess(const sal_Char* path, bool rw=false);
::std::vector< MigrationModuleInfo > dectectUIChangesForAllModules() const;
void compareOldAndNewConfig(const OUString& sParentNodeName,
@@ -230,7 +230,7 @@ public:
MigrationImpl();
~MigrationImpl();
bool initializeMigration();
- sal_Bool doMigration();
+ bool doMigration();
OUString getOldVersionName();
};
}
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index c4420e5a0021..c59fbeaf965b 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -257,8 +257,8 @@ void SAL_CALL JavaMigration::initialize( const css::uno::Sequence< css::uno::Any
*pIter >>= aValue;
if ( aValue.Name == "OldConfiguration" )
{
- sal_Bool bSuccess = aValue.Value >>= aOldConfigValues;
- OSL_ENSURE(bSuccess == sal_True, "[Service implementation " IMPL_NAME
+ bool bSuccess = aValue.Value >>= aOldConfigValues;
+ OSL_ENSURE(bSuccess, "[Service implementation " IMPL_NAME
"] XInitialization::initialize: Argument OldConfiguration has wrong type.");
if (bSuccess)
{
@@ -307,10 +307,10 @@ void JavaMigration::migrateJavarc()
OUString sValue;
rtl::Bootstrap javaini(m_sUserDir + "/user/config/" + SAL_CONFIGFILE("java"));
- sal_Bool bSuccess = javaini.getFrom("Home", sValue);
+ bool bSuccess = javaini.getFrom("Home", sValue);
OSL_ENSURE(bSuccess, "[Service implementation " IMPL_NAME
"] XJob::execute: Could not get Home entry from java.ini/javarc.");
- if (bSuccess == sal_True && !sValue.isEmpty())
+ if (bSuccess && !sValue.isEmpty())
{
//get the directory
CJavaInfo aInfo;
@@ -416,7 +416,7 @@ void SAL_CALL JavaMigration::setPropertyValue(
{
case ENABLE_JAVA:
{
- sal_Bool val = sal_Bool();
+ bool val;
if (!(aValue >>= val))
throw MalformedDataException(
OUString("[Service implementation ") + IMPL_NAME +
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index 64f2f286f92f..be9c07877e11 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -75,17 +75,17 @@ private:
sal_Int32 _iMax;
sal_Int32 _iProgress;
BitmapMode _eBitmapMode;
- sal_Bool _bPaintBitmap;
- sal_Bool _bPaintProgress;
- sal_Bool _bVisible;
- sal_Bool _bShowLogo;
- sal_Bool _bFullScreenSplash;
- sal_Bool _bProgressEnd;
- long _height, _width, _tlx, _tly, _barwidth;
- long _barheight, _barspace, _textBaseline;
- double _fXPos, _fYPos;
- double _fWidth, _fHeight;
- const long _xoffset, _yoffset;
+ bool _bPaintBitmap;
+ bool _bPaintProgress;
+ bool _bVisible;
+ bool _bShowLogo;
+ bool _bFullScreenSplash;
+ bool _bProgressEnd;
+ long _height, _width, _tlx, _tly, _barwidth;
+ long _barheight, _barspace, _textBaseline;
+ double _fXPos, _fYPos;
+ double _fWidth, _fHeight;
+ const long _xoffset, _yoffset;
public:
SplashScreen();
@@ -128,12 +128,12 @@ SplashScreen::SplashScreen()
, _iMax(100)
, _iProgress(0)
, _eBitmapMode(BM_DEFAULTMODE)
- , _bPaintBitmap(sal_True)
- , _bPaintProgress(sal_False)
+ , _bPaintBitmap(true)
+ , _bPaintProgress(false)
, _bVisible(true)
- , _bShowLogo(sal_True)
- , _bFullScreenSplash(sal_False)
- , _bProgressEnd(sal_False)
+ , _bShowLogo(true)
+ , _bFullScreenSplash(false)
+ , _bProgressEnd(false)
, _height(0)
, _width(0)
, _tlx(NOT_LOADED)
@@ -166,7 +166,7 @@ void SAL_CALL SplashScreen::start(const OUString&, sal_Int32 nRange)
{
_iMax = nRange;
if (_bVisible) {
- _bProgressEnd = sal_False;
+ _bProgressEnd = false;
SolarMutexGuard aSolarGuard;
if ( _eBitmapMode == BM_FULLSCREEN )
ShowFullScreenMode( true );
@@ -186,7 +186,7 @@ void SAL_CALL SplashScreen::end()
EndFullScreenMode();
Hide();
}
- _bProgressEnd = sal_True;
+ _bProgressEnd = true;
}
void SAL_CALL SplashScreen::reset()
@@ -325,7 +325,7 @@ SplashScreen::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::sta
void SplashScreen::updateStatus()
{
if (!_bVisible || _bProgressEnd) return;
- if (!_bPaintProgress) _bPaintProgress = sal_True;
+ if (!_bPaintProgress) _bPaintProgress = true;
Paint(Rectangle());
Flush();
}
@@ -584,7 +584,7 @@ void SplashScreen::Paint( const Rectangle&)
if(!_bVisible) return;
//native drawing
- sal_Bool bNativeOK = sal_False;
+ bool bNativeOK = false;
// in case of native controls we need to draw directly to the window
if( _bNativeProgress && IsNativeControlSupported( CTRL_INTROPROGRESS, PART_ENTIRE_CONTROL ) )
@@ -605,7 +605,7 @@ void SplashScreen::Paint( const Rectangle&)
}
if( (bNativeOK = DrawNativeControl( CTRL_INTROPROGRESS, PART_ENTIRE_CONTROL, aDrawRect,
- CTRL_STATE_ENABLED, aValue, _sProgressText )) != sal_False )
+ CTRL_STATE_ENABLED, aValue, _sProgressText )) )
{
return;
}