rpms/openoffice.org/devel openoffice.org-3.0.0.oooXXXXX.unopkg.handleexception.patch, NONE, 1.1 openoffice.org.spec, 1.1669, 1.1670

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12046

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.oooXXXXX.unopkg.handleexception.patch 
Log Message:
Resolves: rhbz#466881 openoffice.org-3.0.0.oooXXXXX.unopkg.handleexception.patch

openoffice.org-3.0.0.oooXXXXX.unopkg.handleexception.patch:

--- NEW FILE openoffice.org-3.0.0.oooXXXXX.unopkg.handleexception.patch ---
diff -ru desktop/source/deployment/manager/dp_manager.cxx desktop/source/deployment/manager/dp_manager.cxx
--- openoffice.org.orig/desktop/source/deployment/manager/dp_manager.cxx	2008-10-14 16:04:24.000000000 +0100
+++ openoffice.org/desktop/source/deployment/manager/dp_manager.cxx	2008-10-14 16:06:25.000000000 +0100
@@ -1074,6 +1074,12 @@
             OSL_ENSURE( 0, ::rtl::OUStringToOString(
                             exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
         }
+        catch (deployment::DeploymentException& exc) {
+            // ignore
+            (void) exc; // avoid warnings
+            OSL_ENSURE( 0, ::rtl::OUStringToOString(
+                            exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
+        }
     }
     return comphelper::containerToSequence(packages);
 }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1669
retrieving revision 1.1670
diff -u -r1.1669 -r1.1670
--- openoffice.org.spec	14 Oct 2008 11:57:04 -0000	1.1669
+++ openoffice.org.spec	14 Oct 2008 15:22:43 -0000	1.1670
@@ -117,6 +117,7 @@
 Patch46: workspace.vcl94.patch
 Patch47: workspace.vcl95.patch
 Patch48: openoffice.org-3.0.0.oooXXXXX.vcl.nogtkspinwarn.patch
+Patch49: openoffice.org-3.0.0.oooXXXXX.unopkg.handleexception.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1319,6 +1320,7 @@
 %patch46 -p1 -b .workspace.vcl94.patch
 %patch47 -p1 -b .workspace.vcl95.patch
 %patch48 -p1 -b .oooXXXXX.vcl.nogtkspinwarn.patch
+%patch49 -p1 -b .oooXXXXX.unopkg.handleexception.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3686,6 +3688,7 @@
 %changelog
 * Tue Oct 14 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.4
 - Resolves: rhbz#466605 openoffice.org-3.0.0.oooXXXXX.vcl.nogtkspinwarn.patch
+- Resolves: rhbz#466881 openoffice.org-3.0.0.oooXXXXX.unopkg.handleexception.patch
 
 * Fri Oct 10 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.3
 - Resolves: rhbz#465664 need lucene for runtime help search