From 71f1859c8c6a4139c67c2309709fd2a09096427a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Timm?= <rt@openoffice.org>
Date: Tue, 15 Jun 2004 07:36:18 +0000
Subject: [PATCH] #i10000# check: default parameter Lockfile_execWarning
 removed

---
 desktop/source/app/app.cxx      | 6 +++---
 desktop/source/app/lockfile.hxx | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 3c2c5fa2b2b2..e2ffe22ec6b4 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -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;
     }
diff --git a/desktop/source/app/lockfile.hxx b/desktop/source/app/lockfile.hxx
index ecd3b304652a..b45ad01442a9 100644
--- a/desktop/source/app/lockfile.hxx
+++ b/desktop/source/app/lockfile.hxx
@@ -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);