[openoffice.org/f13/master] Resoves: rhbz#577525 [abrt] crash in ImplRegionBase::~ImplRegionBase
David Tardon
dtardon at fedoraproject.org
Mon Dec 20 10:09:07 UTC 2010
commit 9bf52ca3f05b9a8a5de7db37b1f9b65898aecda6
Author: David Tardon <dtardon at redhat.com>
Date: Mon Dec 20 11:08:48 2010 +0100
Resoves: rhbz#577525 [abrt] crash in ImplRegionBase::~ImplRegionBase
openoffice.org.spec | 4 +++
workspace.jl155.patch | 50 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 54 insertions(+), 0 deletions(-)
---
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 48f14d8..f41ecb3 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -184,6 +184,7 @@ Patch113: openoffice.org-3.2.0.rh642996.vcl.skip-reserved-operators.patch
Patch114: 0001-rhbz-648475-crash-in-scanner-dialog-reset-link-in-dt.patch
Patch115: 0001-Resolves-rhbz-657628-divide-by-zero.patch
Patch116: 0001-Resolves-rhbz-657718-Crash-in-SwObjectFormatterTxtFr.patch
+Patch117: workspace.jl155.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@@ -1798,6 +1799,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
%patch114 -p1 -b .rhbz-648475-crash-in-scanner-dialog-reset-link-in-dt.patch
%patch115 -p1 -b .rhbz-657628-divide-by-zero.patch
%patch116 -p1 -b .rhbz-657718-Crash-in-SwObjectFormatterTxtFr.patch
+%patch117 -p1 -b .workspace.jl155.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4290,6 +4292,8 @@ fi
- Resolves: rhbz#660312 SDK setup script creates invalid variables
(dtardon)
- Resolves: rhbz#663780 extend neon mutex locking
+- Resoves: rhbz#577525 [abrt] crash in ImplRegionBase::~ImplRegionBase
+ (dtardon)
* Tue Oct 26 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.34
- Resolves: rhbz#636521 crash in undo in sc
diff --git a/workspace.jl155.patch b/workspace.jl155.patch
new file mode 100644
index 0000000..3c49fab
--- /dev/null
+++ b/workspace.jl155.patch
@@ -0,0 +1,50 @@
+commit b769cc464d34f3f13733831b31fb41884734f6ab
+Author: David Tardon <dtardon at redhat.com>
+Date: Mon Oct 11 10:19:11 2010 +0200
+
+ #i110567# lock SolarMutex before calling Invalidate()
+
+diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+index 5f1b359..00d9cd3 100644
+--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
++++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+@@ -413,6 +413,7 @@ void ExtBoxWithBtns_Impl::MouseButtonDown( const MouseEvent& rMEvt )
+ }
+ else if ( rMEvt.IsLeft() )
+ {
++ const vos::OGuard aGuard( Application::GetSolarMutex() );
+ if ( rMEvt.IsMod1() && HasActive() )
+ selectEntry( EXTENSION_LISTBOX_ENTRY_NOTFOUND ); // Selecting an not existing entry will deselect the current one
+ else
+@@ -766,6 +767,7 @@ void ExtMgrDialog::setGetExtensionsURL( const ::rtl::OUString &rURL )
+ long ExtMgrDialog::addPackageToList( const uno::Reference< deployment::XPackage > &xPackage,
+ bool bLicenseMissing )
+ {
++ const vos::OGuard aGuard( Application::GetSolarMutex() );
+ m_aUpdateBtn.Enable( true );
+ return m_pExtensionBox->addEntry( xPackage, bLicenseMissing );
+ }
+@@ -1037,6 +1039,7 @@ void ExtMgrDialog::updateProgress( const OUString &rText,
+ //------------------------------------------------------------------------------
+ void ExtMgrDialog::updatePackageInfo( const uno::Reference< deployment::XPackage > &xPackage )
+ {
++ const vos::OGuard aGuard( Application::GetSolarMutex() );
+ m_pExtensionBox->updateEntry( xPackage );
+ }
+
+@@ -1322,6 +1325,7 @@ long UpdateRequiredDialog::addPackageToList( const uno::Reference< deployment::X
+ if ( !bLicenseMissing && !checkDependencies( xPackage ) )
+ {
+ m_bHasLockedEntries |= m_pManager->isReadOnly( xPackage );
++ const vos::OGuard aGuard( Application::GetSolarMutex() );
+ m_aUpdateBtn.Enable( true );
+ return m_pExtensionBox->addEntry( xPackage );
+ }
+@@ -1450,6 +1454,7 @@ void UpdateRequiredDialog::updatePackageInfo( const uno::Reference< deployment::
+ // We will remove all updated packages with satisfied dependencies, but
+ // we will show all disabled entries so the user sees the result
+ // of the 'disable all' button
++ const vos::OGuard aGuard( Application::GetSolarMutex() );
+ if ( isEnabled( xPackage ) && checkDependencies( xPackage ) )
+ m_pExtensionBox->removeEntry( xPackage );
+ else
More information about the scm-commits
mailing list