strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#i10000# check: default parameter Lockfile_execWarning removed

Browse source
This commit is contained in:
Rüdiger Timm 2004-06-15 07:36:18 +00:00
parent 289ca2e55d
commit 71f1859c8c
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
desktop/source/app/app.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: app.cxx,v $
*
* $Revision: 1.138 $
* $Revision: 1.139 $
*
* last change: $Author: kz $ $Date: 2004-06-10 13:34:26 $
* last change: $Author: rt $ $Date: 2004-06-15 08:36:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -1289,7 +1289,7 @@ void Desktop::Main()
// there is no other instance using our data files from a remote host
RTL_LOGFILE_CONTEXT_TRACE( aLog, "desktop (lo119109) Desktop::Main -> Lockfile" );
m_pLockfile = new Lockfile;
if ( !pCmdLineArgs->IsInvisible() && !pCmdLineArgs->IsNoLockcheck() && !m_pLockfile->check()) {
if ( !pCmdLineArgs->IsInvisible() && !pCmdLineArgs->IsNoLockcheck() && !m_pLockfile->check( Lockfile_execWarning )) {
// Lockfile exists, and user clicked 'no'
return;
}

7
desktop/source/app/lockfile.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: lockfile.hxx,v $
*
* $Revision: 1.6 $
* $Revision: 1.7 $
*
* last change: $Author: kz $ $Date: 2004-06-11 12:01:31 $
* last change: $Author: rt $ $Date: 2004-06-15 08:36:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -77,7 +77,6 @@
using namespace ::rtl;
namespace desktop {
class Lockfile
{
public:
@ -90,7 +89,7 @@ namespace desktop {
// checks the lockfile, asks user when lockfile is
// found (iff gui) and returns false when we may not continue
sal_Bool check( fpExecWarning execWarning = Lockfile_execWarning );
sal_Bool check( fpExecWarning execWarning );
// removes the lockfile. should only be called in exceptional situations
void clean(void);