diff options
Diffstat (limited to 'desktop/source/app/officeipcthread.cxx')
| -rw-r--r-- | desktop/source/app/officeipcthread.cxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 065a665e2427..c685596d2626 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -218,9 +218,9 @@ bool addArgument( } -OfficeIPCThread* OfficeIPCThread::pGlobalOfficeIPCThread = 0; +OfficeIPCThread* OfficeIPCThread::pGlobalOfficeIPCThread = 0; namespace { struct Security : public rtl::Static<osl::Security, Security> {}; } -::osl::Mutex* OfficeIPCThread::pOfficeIPCThreadMutex = 0; +::osl::Mutex* OfficeIPCThread::pOfficeIPCThreadMutex = 0; // Turns a string in aMsg such as file://home/foo/.libreoffice/3 // Into a hex string of well known length ff132a86... @@ -235,9 +235,9 @@ String CreateMD5FromString( const OUString& aMsg ) if ( handle > 0 ) { const sal_uInt8* pData = (const sal_uInt8*)aMsg.getStr(); - sal_uInt32 nSize = ( aMsg.getLength() * sizeof( sal_Unicode )); - sal_uInt32 nMD5KeyLen = rtl_digest_queryLength( handle ); - sal_uInt8* pMD5KeyBuffer = new sal_uInt8[ nMD5KeyLen ]; + sal_uInt32 nSize = ( aMsg.getLength() * sizeof( sal_Unicode )); + sal_uInt32 nMD5KeyLen = rtl_digest_queryLength( handle ); + sal_uInt8* pMD5KeyBuffer = new sal_uInt8[ nMD5KeyLen ]; rtl_digest_init( handle, pData, nSize ); rtl_digest_update( handle, pData, nSize ); @@ -359,7 +359,7 @@ throw( RuntimeException ) // ---------------------------------------------------------------------------- -::osl::Mutex& OfficeIPCThread::GetMutex() +::osl::Mutex& OfficeIPCThread::GetMutex() { // Get or create our mutex for thread-saftey if ( !pOfficeIPCThreadMutex ) @@ -377,7 +377,7 @@ void OfficeIPCThread::SetDowning() // We have the order to block all incoming requests. Framework // wants to shutdown and we have to make sure that no loading/printing // requests are executed anymore. - ::osl::MutexGuard aGuard( GetMutex() ); + ::osl::MutexGuard aGuard( GetMutex() ); if ( pGlobalOfficeIPCThread ) pGlobalOfficeIPCThread->mbDowning = true; @@ -388,7 +388,7 @@ static bool s_bInEnableRequests = false; void OfficeIPCThread::EnableRequests( bool i_bEnable ) { // switch between just queueing the requests and executing them - ::osl::MutexGuard aGuard( GetMutex() ); + ::osl::MutexGuard aGuard( GetMutex() ); if ( pGlobalOfficeIPCThread ) { @@ -408,7 +408,7 @@ void OfficeIPCThread::EnableRequests( bool i_bEnable ) sal_Bool OfficeIPCThread::AreRequestsPending() { // Give info about pending requests - ::osl::MutexGuard aGuard( GetMutex() ); + ::osl::MutexGuard aGuard( GetMutex() ); if ( pGlobalOfficeIPCThread ) return ( pGlobalOfficeIPCThread->mnPendingRequests > 0 ); else @@ -418,7 +418,7 @@ sal_Bool OfficeIPCThread::AreRequestsPending() void OfficeIPCThread::RequestsCompleted( int nCount ) { // Remove nCount pending requests from our internal counter - ::osl::MutexGuard aGuard( GetMutex() ); + ::osl::MutexGuard aGuard( GetMutex() ); if ( pGlobalOfficeIPCThread ) { if ( pGlobalOfficeIPCThread->mnPendingRequests > 0 ) @@ -428,7 +428,7 @@ void OfficeIPCThread::RequestsCompleted( int nCount ) OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() { - ::osl::MutexGuard aGuard( GetMutex() ); + ::osl::MutexGuard aGuard( GetMutex() ); if( pGlobalOfficeIPCThread ) return IPC_STATUS_OK; @@ -485,7 +485,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() if ( aPreloadData.equalsAscii( "1" )) { - sal_Char szBuffer[32]; + sal_Char szBuffer[32]; sprintf( szBuffer, "%d", SUPD ); aUserInstallPathHashCode = OUString( szBuffer, strlen(szBuffer), osl_getThreadTextEncoding() ); } @@ -630,7 +630,7 @@ OfficeIPCThread::OfficeIPCThread() : OfficeIPCThread::~OfficeIPCThread() { - ::osl::ClearableMutexGuard aGuard( GetMutex() ); + ::osl::ClearableMutexGuard aGuard( GetMutex() ); if ( mpDispatchWatcher ) mpDispatchWatcher->release(); @@ -716,7 +716,7 @@ void SAL_CALL OfficeIPCThread::run() #endif continue; } - CommandLineArgs *pCurrentCmdLineArgs = Desktop::GetCommandLineArgs(); + CommandLineArgs *pCurrentCmdLineArgs = Desktop::GetCommandLineArgs(); if ( aCmdLineArgs->IsQuickstart() ) { @@ -767,7 +767,7 @@ void SAL_CALL OfficeIPCThread::run() // loaded with the "hidden" flag! So they are always checked. bDocRequestSent |= aCmdLineArgs->GetPrintList( pRequest->aPrintList ); bDocRequestSent |= ( aCmdLineArgs->GetPrintToList( pRequest->aPrintToList ) && - aCmdLineArgs->GetPrinterName( pRequest->aPrinterName ) ); + aCmdLineArgs->GetPrinterName( pRequest->aPrinterName ) ); if ( !pCurrentCmdLineArgs->IsInvisible() ) { @@ -1008,7 +1008,7 @@ sal_Bool OfficeIPCThread::ExecuteCmdLineRequests( ProcessDocumentsRequest& aRequ // protect the dispatch list osl::ClearableMutexGuard aGuard( GetMutex() ); - static DispatchWatcher::DispatchList aDispatchList; + static DispatchWatcher::DispatchList aDispatchList; rtl::OUString aEmpty; // Create dispatch list for dispatch watcher |