summaryrefslogtreecommitdiff
path: root/editors/openoffice.org-3-RC
diff options
context:
space:
mode:
authorMartin Blapp <mbr@FreeBSD.org>2003-03-30 21:32:27 +0000
committerMartin Blapp <mbr@FreeBSD.org>2003-03-30 21:32:27 +0000
commit89a9e9dcd3ae60ab909c8256b486e29f33561f1b (patch)
tree737103e1b3ad4a24102e9c928ff6dd9a61d33018 /editors/openoffice.org-3-RC
parentfixed typo submitted by Thierry Thomas <thierry@pompo.net> (diff)
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=77761
Diffstat (limited to 'editors/openoffice.org-3-RC')
-rw-r--r--editors/openoffice.org-3-RC/patch-desktop+source+app+app.cxx22
1 files changed, 22 insertions, 0 deletions
diff --git a/editors/openoffice.org-3-RC/patch-desktop+source+app+app.cxx b/editors/openoffice.org-3-RC/patch-desktop+source+app+app.cxx
new file mode 100644
index 000000000000..4e82d5277384
--- /dev/null
+++ b/editors/openoffice.org-3-RC/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;