From 85492562c9f895f396880907473bbe0d89a82cc8 Mon Sep 17 00:00:00 2001 From: mbr Date: Sun, 30 Mar 2003 21:32:27 +0000 Subject: Check for m_pLockfile != NULL to fix crash during startup if no lockfile does exist at all (if we have no installed user directory) --- .../patch-desktop+source+app+app.cxx | 22 ++++++++++++++++++++++ .../patch-desktop+source+app+app.cxx | 22 ++++++++++++++++++++++ .../patch-desktop+source+app+app.cxx | 22 ++++++++++++++++++++++ .../patch-desktop+source+app+app.cxx | 22 ++++++++++++++++++++++ .../openoffice-3/patch-desktop+source+app+app.cxx | 22 ++++++++++++++++++++++ .../patch-desktop+source+app+app.cxx | 22 ++++++++++++++++++++++ .../patch-desktop+source+app+app.cxx | 22 ++++++++++++++++++++++ .../patch-desktop+source+app+app.cxx | 22 ++++++++++++++++++++++ .../patch-desktop+source+app+app.cxx | 22 ++++++++++++++++++++++ .../patch-desktop+source+app+app.cxx | 22 ++++++++++++++++++++++ .../patch-desktop+source+app+app.cxx | 22 ++++++++++++++++++++++ .../patch-desktop+source+app+app.cxx | 22 ++++++++++++++++++++++ .../patch-desktop+source+app+app.cxx | 22 ++++++++++++++++++++++ .../patch-desktop+source+app+app.cxx | 22 ++++++++++++++++++++++ .../patch-desktop+source+app+app.cxx | 22 ++++++++++++++++++++++ .../patch-desktop+source+app+app.cxx | 22 ++++++++++++++++++++++ .../patch-desktop+source+app+app.cxx | 22 ++++++++++++++++++++++ 17 files changed, 374 insertions(+) create mode 100644 editors/openoffice-1.1-devel/patch-desktop+source+app+app.cxx create mode 100644 editors/openoffice-1.1/patch-desktop+source+app+app.cxx create mode 100644 editors/openoffice-2.0-devel/patch-desktop+source+app+app.cxx create mode 100644 editors/openoffice-3-devel/patch-desktop+source+app+app.cxx create mode 100644 editors/openoffice-3/patch-desktop+source+app+app.cxx create mode 100644 editors/openoffice-devel/patch-desktop+source+app+app.cxx create mode 100644 editors/openoffice.org-1.1-devel/patch-desktop+source+app+app.cxx create mode 100644 editors/openoffice.org-1.1/patch-desktop+source+app+app.cxx create mode 100644 editors/openoffice.org-2-RC/patch-desktop+source+app+app.cxx create mode 100644 editors/openoffice.org-2-devel/patch-desktop+source+app+app.cxx create mode 100644 editors/openoffice.org-2.0-devel/patch-desktop+source+app+app.cxx create mode 100644 editors/openoffice.org-2.0/patch-desktop+source+app+app.cxx create mode 100644 editors/openoffice.org-2/patch-desktop+source+app+app.cxx create mode 100644 editors/openoffice.org-3-RC/patch-desktop+source+app+app.cxx create mode 100644 editors/openoffice.org-3-devel/patch-desktop+source+app+app.cxx create mode 100644 editors/openoffice.org-3/patch-desktop+source+app+app.cxx create mode 100644 editors/openoffice.org-vcltesttool/patch-desktop+source+app+app.cxx diff --git a/editors/openoffice-1.1-devel/patch-desktop+source+app+app.cxx b/editors/openoffice-1.1-devel/patch-desktop+source+app+app.cxx new file mode 100644 index 000000000000..4e82d5277384 --- /dev/null +++ b/editors/openoffice-1.1-devel/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-1.1/patch-desktop+source+app+app.cxx b/editors/openoffice-1.1/patch-desktop+source+app+app.cxx new file mode 100644 index 000000000000..4e82d5277384 --- /dev/null +++ b/editors/openoffice-1.1/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 new file mode 100644 index 000000000000..4e82d5277384 --- /dev/null +++ b/editors/openoffice-2.0-devel/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-3-devel/patch-desktop+source+app+app.cxx b/editors/openoffice-3-devel/patch-desktop+source+app+app.cxx new file mode 100644 index 000000000000..4e82d5277384 --- /dev/null +++ b/editors/openoffice-3-devel/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-3/patch-desktop+source+app+app.cxx b/editors/openoffice-3/patch-desktop+source+app+app.cxx new file mode 100644 index 000000000000..4e82d5277384 --- /dev/null +++ b/editors/openoffice-3/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-devel/patch-desktop+source+app+app.cxx b/editors/openoffice-devel/patch-desktop+source+app+app.cxx new file mode 100644 index 000000000000..4e82d5277384 --- /dev/null +++ b/editors/openoffice-devel/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.org-1.1-devel/patch-desktop+source+app+app.cxx b/editors/openoffice.org-1.1-devel/patch-desktop+source+app+app.cxx new file mode 100644 index 000000000000..4e82d5277384 --- /dev/null +++ b/editors/openoffice.org-1.1-devel/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.org-1.1/patch-desktop+source+app+app.cxx b/editors/openoffice.org-1.1/patch-desktop+source+app+app.cxx new file mode 100644 index 000000000000..4e82d5277384 --- /dev/null +++ b/editors/openoffice.org-1.1/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.org-2-RC/patch-desktop+source+app+app.cxx b/editors/openoffice.org-2-RC/patch-desktop+source+app+app.cxx new file mode 100644 index 000000000000..4e82d5277384 --- /dev/null +++ b/editors/openoffice.org-2-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; diff --git a/editors/openoffice.org-2-devel/patch-desktop+source+app+app.cxx b/editors/openoffice.org-2-devel/patch-desktop+source+app+app.cxx new file mode 100644 index 000000000000..4e82d5277384 --- /dev/null +++ b/editors/openoffice.org-2-devel/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.org-2.0-devel/patch-desktop+source+app+app.cxx b/editors/openoffice.org-2.0-devel/patch-desktop+source+app+app.cxx new file mode 100644 index 000000000000..4e82d5277384 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/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.org-2.0/patch-desktop+source+app+app.cxx b/editors/openoffice.org-2.0/patch-desktop+source+app+app.cxx new file mode 100644 index 000000000000..4e82d5277384 --- /dev/null +++ b/editors/openoffice.org-2.0/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.org-2/patch-desktop+source+app+app.cxx b/editors/openoffice.org-2/patch-desktop+source+app+app.cxx new file mode 100644 index 000000000000..4e82d5277384 --- /dev/null +++ b/editors/openoffice.org-2/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.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; diff --git a/editors/openoffice.org-3-devel/patch-desktop+source+app+app.cxx b/editors/openoffice.org-3-devel/patch-desktop+source+app+app.cxx new file mode 100644 index 000000000000..4e82d5277384 --- /dev/null +++ b/editors/openoffice.org-3-devel/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.org-3/patch-desktop+source+app+app.cxx b/editors/openoffice.org-3/patch-desktop+source+app+app.cxx new file mode 100644 index 000000000000..4e82d5277384 --- /dev/null +++ b/editors/openoffice.org-3/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.org-vcltesttool/patch-desktop+source+app+app.cxx b/editors/openoffice.org-vcltesttool/patch-desktop+source+app+app.cxx new file mode 100644 index 000000000000..4e82d5277384 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/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; -- cgit