mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sal_Bool -> bool, convert InitAccessBridge and friends

Browse Source 
Change-Id: I08b5a76c68c67c3837427ad74106e170c64cdaaa
This commit is contained in:
Noel Grandin
2012-09-25 14:01:55 +02:00
committed by Noel Power
parent 04eee686fc
commit 0b7e226ee5
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/source/app/app.cxx
View File

@@ -1465,7 +1465,7 @@ int Desktop::Main()
RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ GetEnableATToolSupport" ); RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ GetEnableATToolSupport" );
if( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() ) if( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() )
{ {
sal_Bool bQuitApp; bool bQuitApp;
if( !InitAccessBridge( true, bQuitApp ) ) if( !InitAccessBridge( true, bQuitApp ) )
if( bQuitApp ) if( bQuitApp )

2
padmin/source/pamain.cxx
View File

@@ -117,7 +117,7 @@ int MyApp::Main()
if( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() ) if( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() )
{ {
sal_Bool bQuitApp; bool bQuitApp;
if( !InitAccessBridge( true, bQuitApp ) ) if( !InitAccessBridge( true, bQuitApp ) )
if( bQuitApp ) if( bQuitApp )
return EXIT_FAILURE; return EXIT_FAILURE;

2
vcl/inc/svdata.hxx
View File

@@ -381,7 +381,7 @@ extern VCL_PLUGIN_PUBLIC ImplSVData* pImplSVData;
inline VCL_PLUGIN_PUBLIC ImplSVData* ImplGetSVData() { return pImplSVData; } inline VCL_PLUGIN_PUBLIC ImplSVData* ImplGetSVData() { return pImplSVData; }
VCL_PLUGIN_PUBLIC void ImplHideSplash(); VCL_PLUGIN_PUBLIC void ImplHideSplash();
bool ImplInitAccessBridge( sal_Bool bAllowCancel, sal_Bool &rCancelled ); bool ImplInitAccessBridge( bool bAllowCancel, bool &rCancelled );
FieldUnitStringList* ImplGetFieldUnits(); FieldUnitStringList* ImplGetFieldUnits();
FieldUnitStringList* ImplGetCleanedFieldUnits(); FieldUnitStringList* ImplGetCleanedFieldUnits();

2
vcl/inc/vcl/svapp.hxx
View File

@@ -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 sal_Bool InitVCL( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & );
VCL_DLLPUBLIC void DeInitVCL(); 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. // 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 ); VCL_DLLPUBLIC void CreateMainLoopThread( oslWorkerFunction pWorker, void * pThreadData );

4
vcl/source/app/svapp.cxx
View File

@@ -1763,9 +1763,9 @@ void Application::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const r
pSVData->mpDefInst->AddToRecentDocumentList(rFileUrl, rMimeType); 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 // Disable Java bridge on UNIX
#if defined UNX #if defined UNX

12
vcl/source/app/svdata.cxx
View File

@@ -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; 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 // Do not change the setting in case the user chooses to cancel
if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret ) if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret )
rCancelled = sal_True; rCancelled = true;
} }
return false; 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 // Do not change the setting in case the user chooses to cancel
if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret ) if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret )
rCancelled = sal_True; rCancelled = true;
} }
return false; 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 // Do not change the setting in case the user chooses to cancel
if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret ) if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret )
rCancelled = sal_True; rCancelled = true;
} }
return false; 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 // Do not change the setting in case the user chooses to cancel
if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret ) if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret )
rCancelled = sal_True; rCancelled = true;
} }
return false; return false;