diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 16:15:29 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 16:15:29 +0000 |
| commit | db5544d0dadc1ee16b6ce071df584b2de55ffdee (patch) | |
| tree | 5d54abbdbef48849aa9eb81bf66d89aaf140de7b /desktop/source/app/lockfile.cxx | |
| parent | cd8bd617e7d331fdb46b54a3be7c2415cf032ede (diff) | |
INTEGRATION: CWS obo30 (1.12.44); FILE MERGED
2008/06/02 15:28:07 obo 1.12.44.1: #i90100# ambiguous Bootstrap during ENABLE_PCH build
Diffstat (limited to 'desktop/source/app/lockfile.cxx')
| -rw-r--r-- | desktop/source/app/lockfile.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/desktop/source/app/lockfile.cxx b/desktop/source/app/lockfile.cxx index 250d8608a2..e27613d2f4 100644 --- a/desktop/source/app/lockfile.cxx +++ b/desktop/source/app/lockfile.cxx @@ -1,13 +1,13 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: lockfile.cxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.13 $ * * This file is part of OpenOffice.org. * @@ -80,7 +80,7 @@ namespace desktop { { // build the file-url to use for the lock OUString aUserPath; - Bootstrap::locateUserInstallation( aUserPath ); + utl::Bootstrap::locateUserInstallation( aUserPath ); m_aLockname = aUserPath + Suffix(); // generate ID @@ -104,7 +104,7 @@ namespace desktop { if (i > 0) m_aDate = m_aDate.copy(0, i); } - + // try to create file File aFile(m_aLockname); @@ -120,12 +120,12 @@ namespace desktop { sal_Bool Lockfile::check( fpExecWarning execWarning ) { - + if (m_bIsLocked) { // lock existed, ask user what to do if (isStale() || (execWarning != 0 && (*execWarning)( this ))) { - // remove file and create new + // remove file and create new File::remove( m_aLockname ); File aFile(m_aLockname); aFile.open( OpenFlag_Create ); @@ -155,7 +155,7 @@ namespace desktop { ByteString aIPCserver = aConfig.ReadKey( IPCkey() ); if (! aIPCserver.EqualsIgnoreCaseAscii( "true" )) return false; - + ByteString aHost = aConfig.ReadKey( Hostkey() ); ByteString aUser = aConfig.ReadKey( Userkey() ); // lockfile from same host? |