mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS native172 (1.17.72); FILE MERGED

Browse Source 
2008/07/17 08:50:40 dv 1.17.72.1: #i91692# Check alive status before accessing member variables
This commit is contained in:
Oliver Bolte
2008-07-22 11:12:52 +00:00
parent 3d1856f3fe
commit 055ef6e7a4
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
desktop/source/deployment/gui/dp_gui_updatedialog.cxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: dp_gui_updatedialog.cxx,v $ * $RCSfile: dp_gui_updatedialog.cxx,v $
* $Revision: 1.17 $ * $Revision: 1.18 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -551,14 +551,26 @@ bool UpdateDialog::Thread::update(
const ::boost::optional< ::rtl::OUString> updateWebsiteURL(infoset.getLocalizedUpdateWebsiteURL()); const ::boost::optional< ::rtl::OUString> updateWebsiteURL(infoset.getLocalizedUpdateWebsiteURL());
rtl::OUStringBuffer b(package->getDisplayName()); rtl::OUStringBuffer b(package->getDisplayName());
b.append(static_cast< sal_Unicode >(' ')); b.append(static_cast< sal_Unicode >(' '));
{
vos::OGuard g( Application::GetSolarMutex() );
if ( m_stop )
return !m_stop;
else
b.append(m_dialog.m_version); b.append(m_dialog.m_version);
}
b.append(static_cast< sal_Unicode >(' ')); b.append(static_cast< sal_Unicode >(' '));
b.append(infoset.getVersion()); b.append(infoset.getVersion());
if (updateWebsiteURL) if (updateWebsiteURL)
{ {
b.append(static_cast< sal_Unicode >(' ')); b.append(static_cast< sal_Unicode >(' '));
{
vos::OGuard g( Application::GetSolarMutex() );
if ( m_stop )
return !m_stop;
else
b.append(m_dialog.m_browserbased); b.append(m_dialog.m_browserbased);
} }
}
du.name = b.makeStringAndClear(); du.name = b.makeStringAndClear();
if (du.unsatisfiedDependencies.getLength() == 0 && du.permission) if (du.unsatisfiedDependencies.getLength() == 0 && du.permission)