rpms/openoffice.org/F-11 openoffice.org.spec, 1.1956, 1.1957 workspace.kso32fixes.patch, 1.1, 1.2

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12494/F-11

Modified Files:
	openoffice.org.spec workspace.kso32fixes.patch 
Log Message:
Resolves: rhbz#566099 fix modal dialog exit in qstarter


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1956
retrieving revision 1.1957
diff -u -p -r1.1956 -r1.1957
--- openoffice.org.spec	12 Feb 2010 11:01:09 -0000	1.1956
+++ openoffice.org.spec	17 Feb 2010 12:30:38 -0000	1.1957
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 12
+%define rh_rpm_release 13
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -4207,6 +4207,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Wed Feb 17 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.13-UNBUILT
+- Resolves: rhbz#566099 fix modal dialog exit in qstarter
+
 * Fri Feb 12 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.12
 - CVE-2009-2950 GIF file parsing heap overflow (caolanm)
 - CVE-2009-2949 integer overflow in XPM processing (caolanm)

workspace.kso32fixes.patch:
 openoffice.org/sal/osl/unx/file_impl.hxx |   18 ++++++++
 sal/osl/unx/file.cxx                     |   64 ++++++++++++++++++++++++++++++
 sal/osl/unx/file_stat.cxx                |   66 +++++++++++++++++++++++++++++--
 sfx2/source/appl/shutdownicon.cxx        |    4 -
 4 files changed, 146 insertions(+), 6 deletions(-)

Index: workspace.kso32fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/workspace.kso32fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.kso32fixes.patch	28 Aug 2009 09:43:31 -0000	1.1
+++ workspace.kso32fixes.patch	17 Feb 2010 12:30:39 -0000	1.2
@@ -262,3 +262,17 @@ Index: sal/osl/unx/file_impl.hxx
 +#ifdef __cplusplus
 +} /* extern "C" */
 +#endif
+diff -ru sfx2.orig/source/appl/shutdownicon.cxx sfx2/source/appl/shutdownicon.cxx
+--- openoffice.org.orig/sfx2/source/appl/shutdownicon.cxx	2010-02-17 11:59:48.000000000 +0000
++++ openoffice.org/sfx2/source/appl/shutdownicon.cxx	2010-02-17 12:05:09.000000000 +0000
+@@ -511,9 +511,7 @@
+         }
+     }
+ 
+-#ifdef WNT
+-        LeaveModalMode();
+-#endif
++    LeaveModalMode();
+     return 0;
+ }
+