From c6ebfdc8612b2ba73f4f72cf4eb0dcc9cffc3ba6 Mon Sep 17 00:00:00 2001 From: mbr Date: Sun, 30 Mar 2003 21:35:20 +0000 Subject: 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) --- .../files/patch-desktop+source+app+app.cxx | 22 ++++++++++++++++++++++ .../patch-desktop+source+app+app.cxx | 22 ---------------------- 2 files changed, 22 insertions(+), 22 deletions(-) create mode 100644 editors/openoffice-2.0-devel/files/patch-desktop+source+app+app.cxx delete mode 100644 editors/openoffice-2.0-devel/patch-desktop+source+app+app.cxx (limited to 'editors/openoffice-2.0-devel') diff --git a/editors/openoffice-2.0-devel/files/patch-desktop+source+app+app.cxx b/editors/openoffice-2.0-devel/files/patch-desktop+source+app+app.cxx new file mode 100644 index 000000000000..4e82d5277384 --- /dev/null +++ b/editors/openoffice-2.0-devel/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; diff --git a/editors/openoffice-2.0-devel/patch-desktop+source+app+app.cxx b/editors/openoffice-2.0-devel/patch-desktop+source+app+app.cxx deleted file mode 100644 index 4e82d5277384..000000000000 --- a/editors/openoffice-2.0-devel/patch-desktop+source+app+app.cxx +++ /dev/null @@ -1,22 +0,0 @@ ---- ../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; -- cgit