Author: dtardon
Update of /cvs/extras/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2237
Modified Files:
openoffice.org.spec
Added Files:
workspace.extmgr01.patch
Log Message:
Resolves: rhbz#549890 add workspace.extmgr01.patch
workspace.extmgr01.patch:
dp_gui_extensioncmdqueue.cxx | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
--- NEW FILE workspace.extmgr01.patch ---
guard against m_pDialog being NULL, as in CWS extmgr01
diff -r 1b9975e6bffc -r 56ff34d396f1
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx Wed Dec 30 09:47:31 2009
+0100
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx Thu Dec 31 20:08:07 2009
+0100
@@ -310,13 +310,19 @@
{
m_nCurrentProgress = 0;
- m_pDialog->showProgress( true );
+ if (m_pDialog)
+ {
+ m_pDialog->showProgress( true );
+ }
}
//------------------------------------------------------------------------------
void ProgressCmdEnv::stopProgress()
{
- m_pDialog->showProgress( false );
+ if (m_pDialog)
+ {
+ m_pDialog->showProgress( false );
+ }
}
//------------------------------------------------------------------------------
@@ -327,8 +333,11 @@
if (! m_bAborted)
{
m_nCurrentProgress = 0;
- m_pDialog->updateProgress( rText, xAbortChannel );
- m_pDialog->updateProgress( 5 );
+ if (m_pDialog)
+ {
+ m_pDialog->updateProgress( rText, xAbortChannel );
+ m_pDialog->updateProgress( 5 );
+ }
}
}
@@ -338,7 +347,10 @@
if ( ! m_bAborted )
{
long nProgress = ((m_nCurrentProgress*5) % 100) + 5;
- m_pDialog->updateProgress( nProgress );
+ if (m_pDialog)
+ {
+ m_pDialog->updateProgress( nProgress );
+ }
}
}
@@ -526,9 +538,12 @@
}
else
{
- vos::OGuard guard(Application::GetSolarMutex());
- approve = m_pDialog->installExtensionWarn(
instExc.New->getDisplayName() );
+ if (m_pDialog)
+ {
+ vos::OGuard guard(Application::GetSolarMutex());
+ approve = m_pDialog->installExtensionWarn(
instExc.New->getDisplayName() );
+ }
abort = !approve;
}
}
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1948
retrieving revision 1.1949
diff -u -p -r1.1948 -r1.1949
--- openoffice.org.spec 15 Dec 2009 13:07:00 -0000 1.1948
+++ openoffice.org.spec 1 Jan 2010 07:16:38 -0000 1.1949
@@ -1,6 +1,6 @@
%define oootag OOO310
%define ooomilestone 19
-%define rh_rpm_release 11
+%define rh_rpm_release 12
# rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
%define __jar_repack %{nil}
@@ -165,6 +165,7 @@ Patch89: openoffice.org-3.2.0.ooo107151.
Patch90: openoffice.org-3.3.0.ooo102645.fix.es.patch
Patch91: workspace.vcl105.patch
Patch92: workspace.fwk132.patch
+Patch93: workspace.extmgr01.patch
%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import
get_python_lib; print get_python_lib(0)")
%define instdir %{_libdir}
@@ -1688,6 +1689,7 @@ cat %{PATCH11} >> svtools/source/dialogs
%patch90 -p0 -b .ooo102645.fix.es.patch
%patch91 -p0 -b .workspace.vcl105.patch
%patch92 -p1 -b .workspace.fwk132.patch
+%patch93 -p1 -b .workspace.extmgr01.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4191,6 +4193,9 @@ fi
unopkg list --shared > /dev/null 2>&1 || :
%changelog
+* Fri Jan 01 2010 Caolán McNamara <caolanm(a)redhat.com> - 1:3.1.1-19.12-UNBUILT
+- Resolves: rhbz#549890 add workspace.extmgr01.patch (dtardon)
+
* Tue Dec 15 2009 Caolán McNamara <caolanm(a)redhat.com> - 1:3.1.1-19.11
- Resolves: rhbz#529648 add workspace.fwk132.patch
Show replies by thread