[libreoffice/f16] merge from master
Caolan McNamara
caolanm at fedoraproject.org
Fri Aug 5 23:18:41 UTC 2011
commit 7abd6f0898b6ee2d087ccf8a7e8541fc56002c96
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Aug 6 00:18:27 2011 +0100
merge from master
...bz-693265-fix-crash-from-unhandled-except.patch | 65 ++++++++++++++++++++
libreoffice.spec | 10 +++-
sources | 40 ++++++------
3 files changed, 94 insertions(+), 21 deletions(-)
---
diff --git a/0001-Resolves-rhbz-693265-fix-crash-from-unhandled-except.patch b/0001-Resolves-rhbz-693265-fix-crash-from-unhandled-except.patch
new file mode 100644
index 0000000..5ac6ea7
--- /dev/null
+++ b/0001-Resolves-rhbz-693265-fix-crash-from-unhandled-except.patch
@@ -0,0 +1,65 @@
+From 0da2906aa147050c3e99846d5908a60b99df69ba Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Tue, 2 Aug 2011 16:56:30 +0100
+Subject: [PATCH] Resolves: rhbz#693265 fix crash from unhandled exception
+
+---
+ vcl/source/gdi/impgraph.cxx | 28 ++++++++++++++++++++++++----
+ 1 files changed, 24 insertions(+), 4 deletions(-)
+
+diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
+index 3b6d9a4..6fdb163 100644
+--- a/vcl/source/gdi/impgraph.cxx
++++ b/vcl/source/gdi/impgraph.cxx
+@@ -1077,7 +1077,14 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap )
+
+ if( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ).getLength() )
+ {
+- SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE | STREAM_SHARE_DENYWRITE );
++ SvStream* pOStm = NULL;
++ try
++ {
++ pOStm = ::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE | STREAM_SHARE_DENYWRITE );
++ }
++ catch( const ::com::sun::star::uno::Exception& )
++ {
++ }
+
+ if( pOStm )
+ {
+@@ -1282,8 +1289,14 @@ sal_Bool ImpGraphic::ImplSwapOut()
+
+ if( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ).getLength() )
+ {
+- SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE | STREAM_SHARE_DENYWRITE );
+-
++ SvStream* pOStm = NULL;
++ try
++ {
++ pOStm = ::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE | STREAM_SHARE_DENYWRITE );
++ }
++ catch( const ::com::sun::star::uno::Exception& )
++ {
++ }
+ if( pOStm )
+ {
+ pOStm->SetVersion( SOFFICE_FILEFORMAT_50 );
+@@ -1382,7 +1395,14 @@ sal_Bool ImpGraphic::ImplSwapIn()
+
+ if( aSwapURL.Len() )
+ {
+- SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aSwapURL, STREAM_READWRITE | STREAM_SHARE_DENYWRITE );
++ SvStream* pIStm = NULL;
++ try
++ {
++ pIStm = ::utl::UcbStreamHelper::CreateStream( aSwapURL, STREAM_READWRITE | STREAM_SHARE_DENYWRITE );
++ }
++ catch( const ::com::sun::star::uno::Exception& )
++ {
++ }
+
+ if( pIStm )
+ {
+--
+1.7.6
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 8f9f6f1..21bcaea 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -26,7 +26,7 @@
Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
-Version: 3.4.2.2
+Version: 3.4.2.3
Release: 2%{?dist}
License: LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain
Group: Applications/Productivity
@@ -118,6 +118,7 @@ Patch23: libreoffice-poppler-0.17.0.patch
Patch24: 0001-Resolves-rhbz-715549-use-fontconfig-s-detected-forma.patch
Patch25: 0001-this-is-definitely-not-present-in-qt-4.8.0-beta1.patch
Patch26: 0001-Resolves-rhbz-725144-wrong-csh-syntax.patch
+Patch27: 0001-Resolves-rhbz-693265-fix-crash-from-unhandled-except.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@@ -746,6 +747,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch24 -p1 -b .rhbz715549-use-fontconfig-s-detected-forma.patch
%patch25 -p1 -b .this-is-definitely-not-present-in-qt-4.8.0-beta1.patch
%patch26 -p1 -b .rhbz725144-wrong-csh-syntax.patch
+%patch27 -p1 -b .rhbz693265-fix-crash-from-unhandled-except.patch
# these are horribly incomplete--empty translations and copied english
# strings with spattering of translated strings
@@ -2030,6 +2032,12 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%{basisinstdir}/program/kde-open-url
%changelog
+* Tue Aug 02 2011 Caolán McNamara <caolanm at redhat.com> - 3.4.2.3-2
+- Resolves: rhbz#693265 fix crash from unhandled exception
+
+* Fri Jul 29 2011 David Tardon <dtardon at redhat.com> - 3.4.2.3-1
+- 3.4.2 rc3
+
* Mon Jul 25 2011 Caolán McNamara <caolanm at redhat.com> - 3.4.2.2-2
- Resolves: rhbz#725144 wrong csh syntax
diff --git a/sources b/sources
index 5ba0950..15a9e1f 100644
--- a/sources
+++ b/sources
@@ -1,16 +1,16 @@
-65371f11bcd48b5d4aed68c429784747 libreoffice-artwork-3.4.2.2.tar.bz2
-566b7a01605517acd3d0e302614ce22d libreoffice-base-3.4.2.2.tar.bz2
-c802f43a5a099106b2833d27fb0e1324 libreoffice-libs-core-3.4.2.2.tar.bz2
-b1306ffbd5aafa2ff3e03ce4932b33d7 libreoffice-libs-extern-3.4.2.2.tar.bz2
-439816b03287e0c4b3c3175f2bf9bcee libreoffice-libs-extern-sys-3.4.2.2.tar.bz2
-61f45fe2c82439543fc5b39ce9868c77 libreoffice-libs-gui-3.4.2.2.tar.bz2
-3b0c3300c90f50983042de7d704078eb libreoffice-postprocess-3.4.2.2.tar.bz2
-01f0f8ae20201eb08889ebd14a14af79 libreoffice-sdk-3.4.2.2.tar.bz2
-95245eb754a75a4912ceaeaf9b69a00c libreoffice-testing-3.4.2.2.tar.bz2
-4af50ce86fd2ad3eca30ef2e93c59988 libreoffice-ure-3.4.2.2.tar.bz2
-eaa63fc295b57c834db1b839d215027c libreoffice-writer-3.4.2.2.tar.bz2
-1f23836308640685053117fe4e6de0b3 libreoffice-translations-3.4.2.2.tar.bz2
-4becc4d081d59a68355cadf8a2dbfd38 libreoffice-bootstrap-3.4.2.2.tar.bz2
+1600ebf998ec7075bd0e96e7a49513dc libreoffice-artwork-3.4.2.3.tar.bz2
+0e12b4a03d14645dac1f073eb2f67423 libreoffice-base-3.4.2.3.tar.bz2
+bd2027fc2160798728e49d0fd331d163 libreoffice-libs-core-3.4.2.3.tar.bz2
+9a948012496fcd27c31f755314ff98e3 libreoffice-libs-extern-3.4.2.3.tar.bz2
+a5a8d9080492968eef001314093cd82d libreoffice-libs-extern-sys-3.4.2.3.tar.bz2
+810aa9e69b96af0f4de2e6d74b7b1847 libreoffice-libs-gui-3.4.2.3.tar.bz2
+45de04dcbb6f6ff7474110ee982da7b8 libreoffice-postprocess-3.4.2.3.tar.bz2
+545d65e92b674d354dd6511ee552d23f libreoffice-sdk-3.4.2.3.tar.bz2
+99e306957e38ce5e68deed9568874be6 libreoffice-testing-3.4.2.3.tar.bz2
+2e7277588ef610b7a06953c59dc77c9b libreoffice-ure-3.4.2.3.tar.bz2
+281973e517d3b5626f5eedd746378fcc libreoffice-writer-3.4.2.3.tar.bz2
+3e5bff19d7aa5478b7330bd608a2daf2 libreoffice-translations-3.4.2.3.tar.bz2
+f106511220a2a0b2a45571cf7605953a libreoffice-bootstrap-3.4.2.3.tar.bz2
185d60944ea767075d27247c3162b3bc 185d60944ea767075d27247c3162b3bc-unowinreg.dll
03c019658ec49050c8103ba0f10b5067 redhat-langpacks.tar.gz
74939c9ea525374776f09bf972ede99f libreoffice-multiliblauncher.sh
@@ -21,12 +21,12 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.
35c94d2df8893241173de1d16b6034c0 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
ada24d37d8d638b3d8a9985e80bc2978 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
18f577b374d60b3c760a3a3350407632 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-a426818aee9927d09e26d951594e2d2b libreoffice-calc-3.4.2.2.tar.bz2
+20854b5961b8b0b38219376a93ecf362 libreoffice-calc-3.4.2.3.tar.bz2
17410483b5b5f267aa18b7e00b65e6e0 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
b4cae0700aa1c2aef7eb7f345365e6f1 b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
-609633d4b6c94b14c53f28a7cdf822e5 libreoffice-components-3.4.2.2.tar.bz2
-31d9f27c33fd60764941a80715aaedde libreoffice-extensions-3.4.2.2.tar.bz2
-86a3cb09af51802ce1856db7cd9977cc libreoffice-extras-3.4.2.2.tar.bz2
-8296feb6f6583b7247ef0345e2ac0e8e libreoffice-filters-3.4.2.2.tar.bz2
-610661f26b8997b858dec836cb6b638d libreoffice-help-3.4.2.2.tar.bz2
-2aa17ecc635f94e647c487ca826431ac libreoffice-impress-3.4.2.2.tar.bz2
+5799be1571289b7c17bd8fd2020c00f6 libreoffice-components-3.4.2.3.tar.bz2
+75ca9da214abe072e37fb4d19fc2c34f libreoffice-extensions-3.4.2.3.tar.bz2
+73aa766053ea8f4c84dd0a76c0888f18 libreoffice-extras-3.4.2.3.tar.bz2
+4416cc18cfa84f61eae905ff441a18d0 libreoffice-filters-3.4.2.3.tar.bz2
+ecfd57a3dfd0ce230e5837b5099a0d5a libreoffice-help-3.4.2.3.tar.bz2
+40e23531e95617c7fe91e7025f007a91 libreoffice-impress-3.4.2.3.tar.bz2
More information about the scm-commits
mailing list