summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2012-09-25 14:01:55 +0200
committerNoel Power <noel.power@suse.com>2012-09-26 11:20:34 +0100
commit0b7e226ee59f5f18a24a366f5f93e85d13e454df (patch)
treed4f27b3bd6f75047e6daa46f0f85f736d8361997
parent04eee686fc6b8cd95f7210fe0426316e7fc7aac0 (diff)
sal_Bool -> bool, convert InitAccessBridge and friends
Change-Id: I08b5a76c68c67c3837427ad74106e170c64cdaaa
-rw-r--r--desktop/source/app/app.cxx2
-rw-r--r--padmin/source/pamain.cxx2
-rw-r--r--vcl/inc/svdata.hxx2
-rw-r--r--vcl/inc/vcl/svapp.hxx2
-rw-r--r--vcl/source/app/svapp.cxx4
-rw-r--r--vcl/source/app/svdata.cxx12
6 files changed, 12 insertions, 12 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 0e6ec43d0787..48c2e0cb91bc 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1465,7 +1465,7 @@ int Desktop::Main()
RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ GetEnableATToolSupport" );
if( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() )
{
- sal_Bool bQuitApp;
+ bool bQuitApp;
if( !InitAccessBridge( true, bQuitApp ) )
if( bQuitApp )
diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx
index 4eb997a0697e..6f6e2e3e722e 100644
--- a/padmin/source/pamain.cxx
+++ b/padmin/source/pamain.cxx
@@ -117,7 +117,7 @@ int MyApp::Main()
if( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() )
{
- sal_Bool bQuitApp;
+ bool bQuitApp;
if( !InitAccessBridge( true, bQuitApp ) )
if( bQuitApp )
return EXIT_FAILURE;
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 0ad39051575f..76c465021234 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -381,7 +381,7 @@ extern VCL_PLUGIN_PUBLIC ImplSVData* pImplSVData;
inline VCL_PLUGIN_PUBLIC ImplSVData* ImplGetSVData() { return pImplSVData; }
VCL_PLUGIN_PUBLIC void ImplHideSplash();
-bool ImplInitAccessBridge( sal_Bool bAllowCancel, sal_Bool &rCancelled );
+bool ImplInitAccessBridge( bool bAllowCancel, bool &rCancelled );
FieldUnitStringList* ImplGetFieldUnits();
FieldUnitStringList* ImplGetCleanedFieldUnits();
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index 24b22a5f4f11..2083250b9757 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -554,7 +554,7 @@ VCL_DLLPUBLIC Application* GetpApp();
VCL_DLLPUBLIC sal_Bool InitVCL( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & );
VCL_DLLPUBLIC void DeInitVCL();
-VCL_DLLPUBLIC sal_Bool InitAccessBridge( sal_Bool bAllowCancel, sal_Bool &rCancelled );
+VCL_DLLPUBLIC bool InitAccessBridge( bool bAllowCancel, bool &rCancelled );
// only allowed to call, if no thread is running. You must call JoinMainLoopThread to free all memory.
VCL_DLLPUBLIC void CreateMainLoopThread( oslWorkerFunction pWorker, void * pThreadData );
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 97c987a80641..df5dc73685e6 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1763,9 +1763,9 @@ void Application::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const r
pSVData->mpDefInst->AddToRecentDocumentList(rFileUrl, rMimeType);
}
-sal_Bool InitAccessBridge( sal_Bool bShowCancel, sal_Bool &rCancelled )
+bool InitAccessBridge( bool bShowCancel, bool &rCancelled )
{
- sal_Bool bRet = true;
+ bool bRet = true;
// Disable Java bridge on UNIX
#if defined UNX
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 909626fcd2db..a3851c7999e4 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -327,9 +327,9 @@ com::sun::star::uno::Any AccessBridgeCurrentContext::getValueByName( const rtl::
}
-bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
+bool ImplInitAccessBridge(bool bAllowCancel, bool &rCancelled)
{
- rCancelled = sal_False;
+ rCancelled = false;
bool bErrorMessage = true;
@@ -411,7 +411,7 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
// Do not change the setting in case the user chooses to cancel
if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret )
- rCancelled = sal_True;
+ rCancelled = true;
}
return false;
@@ -434,7 +434,7 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
// Do not change the setting in case the user chooses to cancel
if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret )
- rCancelled = sal_True;
+ rCancelled = true;
}
return false;
@@ -457,7 +457,7 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
// Do not change the setting in case the user chooses to cancel
if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret )
- rCancelled = sal_True;
+ rCancelled = true;
}
return false;
@@ -480,7 +480,7 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
// Do not change the setting in case the user chooses to cancel
if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret )
- rCancelled = sal_True;
+ rCancelled = true;
}
return false;