diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-01-24 15:53:29 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-01-25 10:27:53 +0000 |
| commit | 97b31c731fe79bb5c9fcd84d31c61a3b0ae76302 (patch) | |
| tree | 20d1adb9f1c881c5171f39464590b616bf88fd8f /desktop/source/app | |
| parent | fafac03b954ec10e37fa5136fa718687e2e04552 (diff) | |
WaE: gcc 4.6.0 various warnings
Diffstat (limited to 'desktop/source/app')
| -rw-r--r-- | desktop/source/app/app.cxx | 13 | ||||
| -rw-r--r-- | desktop/source/app/officeipcthread.cxx | 8 |
2 files changed, 0 insertions, 21 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index bf0722b7de33..923ff20fd4c6 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -822,9 +822,6 @@ void Desktop::HandleBootstrapPathErrors( ::utl::Bootstrap::Status aBootstrapStat { if ( aBootstrapStatus != ::utl::Bootstrap::DATA_OK ) { - sal_Bool bWorkstationInstallation = sal_False; - ::rtl::OUString aBaseInstallURL; - ::rtl::OUString aUserInstallURL; ::rtl::OUString aProductKey; ::rtl::OUString aTemp; @@ -837,16 +834,6 @@ void Desktop::HandleBootstrapPathErrors( ::utl::Bootstrap::Status aBootstrapStat if ( aTemp.getLength() > 0 ) aProductKey = aTemp; - ::utl::Bootstrap::PathStatus aBaseInstallStatus = ::utl::Bootstrap::locateBaseInstallation( aBaseInstallURL ); - ::utl::Bootstrap::PathStatus aUserInstallStatus = ::utl::Bootstrap::locateUserInstallation( aUserInstallURL ); - - if (( aBaseInstallStatus == ::utl::Bootstrap::PATH_EXISTS && - aUserInstallStatus == ::utl::Bootstrap::PATH_EXISTS )) - { - if ( aBaseInstallURL != aUserInstallURL ) - bWorkstationInstallation = sal_True; - } - OUString aMessage; OUStringBuffer aBuffer( 100 ); aBuffer.append( aDiagnosticMessage ); diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index a351deebd7de..b441d6d32f80 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -540,7 +540,6 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() // Seems another office is running. Pipe arguments to it and self terminate osl::StreamPipe aStreamPipe(pThread->maPipe.getHandle()); - sal_Bool bWaitBeforeClose = sal_False; ByteString aArguments(RTL_CONSTASCII_STRINGPARAM(ARGUMENT_PREFIX)); rtl::OUString cwdUrl; if (!(tools::getProcessWorkingDir(cwdUrl) && @@ -552,10 +551,6 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() for( sal_uInt32 i=0; i < nCount; i++ ) { rtl_getAppCommandArg( i, &aDummy.pData ); - if( aDummy.indexOf('-',0) != 0 ) - { - bWaitBeforeClose = sal_True; - } if (!addArgument(&aArguments, ',', aDummy)) { return IPC_STATUS_BOOTSTRAP_ERROR; } @@ -728,14 +723,12 @@ void SAL_CALL OfficeIPCThread::run() } // handle request for acceptor - sal_Bool bAcceptorRequest = sal_False; OUString aAcceptString; if ( aCmdLineArgs->GetAcceptString(aAcceptString) && Desktop::CheckOEM()) { ApplicationEvent* pAppEvent = new ApplicationEvent( aEmpty, aEmpty, "ACCEPT", aAcceptString ); ImplPostForeignAppEvent( pAppEvent ); - bAcceptorRequest = sal_True; } // handle acceptor removal OUString aUnAcceptString; @@ -744,7 +737,6 @@ void SAL_CALL OfficeIPCThread::run() new ApplicationEvent( aEmpty, aEmpty, "UNACCEPT", aUnAcceptString ); ImplPostForeignAppEvent( pAppEvent ); - bAcceptorRequest = sal_True; } #ifndef UNX |