summaryrefslogtreecommitdiff
path: root/editors/openoffice-1.1/files
diff options
context:
space:
mode:
authorMartin Blapp <mbr@FreeBSD.org>2003-03-30 21:35:20 +0000
committerMartin Blapp <mbr@FreeBSD.org>2003-03-30 21:35:20 +0000
commit52239d6688f2eb71c3678c9ff451e860c7b0d432 (patch)
tree400c63348973a50887f3ac3a8fce5fda8b181d41 /editors/openoffice-1.1/files
parentCheck for m_pLockfile != NULL to fix crash during startup if no lockfile (diff)
Uups. Committed to the wrong dir.
Check for m_pLockfile != NULL to fix crash during startup if no lockfile does exist at all (if we have no installed user directory)
Notes
Notes: svn path=/head/; revision=77762
Diffstat (limited to 'editors/openoffice-1.1/files')
-rw-r--r--editors/openoffice-1.1/files/patch-desktop+source+app+app.cxx22
1 files changed, 22 insertions, 0 deletions
diff --git a/editors/openoffice-1.1/files/patch-desktop+source+app+app.cxx b/editors/openoffice-1.1/files/patch-desktop+source+app+app.cxx
new file mode 100644
index 000000000000..4e82d5277384
--- /dev/null
+++ b/editors/openoffice-1.1/files/patch-desktop+source+app+app.cxx
@@ -0,0 +1,22 @@
+--- ../desktop/source/app/app.cxx.orig Sun Mar 30 22:26:15 2003
++++ ../desktop/source/app/app.cxx Sun Mar 30 22:27:02 2003
+@@ -587,7 +587,8 @@
+ ::comphelper::setProcessServiceFactory( NULL );
+
+ // clear lockfile
+- m_pLockfile->clean();
++ if (m_pLockfile != NULL)
++ m_pLockfile->clean();
+
+ if( !Application::IsRemoteServer() )
+ {
+@@ -621,7 +622,8 @@
+ a <<= (sal_Bool)sal_False;
+ xPropertySet->setPropertyValue( OUSTRING(RTL_CONSTASCII_USTRINGPARAM( SUSPEND_QUICKSTARTVETO )), a );
+ } else {
+- m_pLockfile->clean();
++ if (m_pLockfile != NULL)
++ m_pLockfile->clean();
+ }
+
+ return bExit;