diff options
| author | Mathias Bauer <mba@openoffice.org> | 2002-03-19 16:09:43 +0000 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2002-03-19 16:09:43 +0000 |
| commit | 42edbed6db09eb640603678b1c2e0840b2eb50e7 (patch) | |
| tree | 1e61625b832db3641d3e88f05c627796c06b5214 | |
| parent | eed1acaf88f8c144fe945c7dff487b62e001ff31 (diff) | |
#97276#: don't remove soffice.tmp if it's not empty
| -rw-r--r-- | desktop/source/app/appinit.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index 28e20dfa60d1..fbb11617f294 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appinit.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: cd $ $Date: 2001-08-21 16:00:55 $ + * last change: $Author: mba $ $Date: 2002-03-19 17:09:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -273,10 +273,10 @@ void registerServices( Reference< XMultiServiceFactory >& xSMgr ) } ::rtl::OUString aPortalConnect; - sal_Bool bServer = pCmdLine->IsServer(); + bool bServer = (bool) pCmdLine->IsServer(); pCmdLine->GetPortalConnectString( aPortalConnect ); - if ( !configureUcb( bServer, aPortalConnect )) + if ( !configureUcb( bServer, aPortalConnect ) ) { DBG_ERROR( "Can't configure UCB" ); exit(-1); @@ -338,7 +338,8 @@ void removeTemporaryDirectory() if ( ::utl::UCBContentHelper::Kill( aCurrentTempURL ) ) { SvtInternalOptions().SetCurrentTempURL( String() ); - ::utl::UCBContentHelper::Kill( aCurrentTempBase ); + ::osl::Directory::remove( aCurrentTempBase ); + //::utl::UCBContentHelper::Kill( aCurrentTempBase ); } } } |