rpms/openoffice.org/devel openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch, NONE, 1.1 openoffice.org-simple-crash_report.sh, 1.12, 1.13 openoffice.org.spec, 1.1879, 1.1880

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org-simple-crash_report.sh openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch 
Log Message:
Resolves: rhbz#495840 openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch

openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch ---
Index: unx/source/app/saldisp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/saldisp.cxx,v
retrieving revision 1.100
diff -u -r1.100 saldisp.cxx
--- openoffice.org.orig/vcl/unx/source/app/saldisp.cxx	2 Jul 2008 10:14:35 -0000	1.100
+++ openoffice.org/vcl/unx/source/app/saldisp.cxx	16 Apr 2009 16:22:53 -0000
@@ -832,6 +832,7 @@
     int nDisplayScreens = ScreenCount( pDisp_ );
     m_aScreens = std::vector<ScreenData>(nDisplayScreens);
 
+    mbExactResolution = false;
     const char *value;
     /*  #i15507#
      *  Xft resolution should take precedence since
@@ -841,15 +842,18 @@
     {
         rtl::OString str (value);
         long dpi = (long) str.toDouble();
-        aResolution_ = Pair( dpi, dpi );
-        mbExactResolution = true;
+        // Guard against insane resolution
+        if (dpi > 0)
+        {
+            aResolution_ = Pair( dpi, dpi );
+            mbExactResolution = true;
+        }
     }
-    else
+    if (mbExactResolution == false)
     {
         aResolution_     =
             Pair( DPI( WidthOfScreen( DefaultScreenOfDisplay( pDisp_ ) ), DisplayWidthMM ( pDisp_, m_nDefaultScreen ) ),
                   DPI( HeightOfScreen( DefaultScreenOfDisplay( pDisp_ ) ), DisplayHeightMM( pDisp_, m_nDefaultScreen ) ) );
-        mbExactResolution	= false;
     }
 
     nMaxRequestSize_    = XExtendedMaxRequestSize( pDisp_ ) * 4;


Index: openoffice.org-simple-crash_report.sh
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-simple-crash_report.sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- openoffice.org-simple-crash_report.sh	16 Apr 2009 08:42:14 -0000	1.12
+++ openoffice.org-simple-crash_report.sh	16 Apr 2009 19:46:45 -0000	1.13
@@ -16,12 +16,13 @@
 echo "(VIII) accessibility is:" `gconftool-2 -g "/desktop/gnome/interface/accessibility"` >> $filename
 echo "(IX)   gtk theme is:" `gconftool-2 -g "/desktop/gnome/interface/gtk_theme"` >> $filename
 echo "(X)    icon theme is:" `gconftool-2 -g "/desktop/gnome/interface/icon_theme"` >> $filename
+echo "(XI)   metacity theme is:" `gconftool-2 -g "/apps/metacity/general/theme"` >> $filename
 if [ -e /etc/fedora-release ]; then
-echo "(XI)   fedora release is:" `cat /etc/fedora-release` >> $filename
+echo "(XII)  fedora release is:" `cat /etc/fedora-release` >> $filename
 elif [ -e /etc/redhat-release ]; then
-echo "(XI)   redhat release is:" `cat /etc/redhat-release` >> $filename
+echo "(XII)  redhat release is:" `cat /etc/redhat-release` >> $filename
 fi
-echo "(XII)  LANG is: $LANG" >> $filename
+echo "(XIII) LANG is: $LANG" >> $filename
 echo "...start free space details ..." >> $filename
 df -k /home /tmp >> $filename
 echo "...end free space details ..." >> $filename


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1879
retrieving revision 1.1880
diff -u -r1.1879 -r1.1880
--- openoffice.org.spec	16 Apr 2009 12:25:58 -0000	1.1879
+++ openoffice.org.spec	16 Apr 2009 19:46:45 -0000	1.1880
@@ -135,6 +135,7 @@
 Patch60: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
 Patch61: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
 Patch62: openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
+Patch63: openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1628,6 +1629,7 @@
 %patch60 -p1 -b .ooo100991.pyuno-fix.patch
 %patch61 -p1 -b .ooo101074.sd.bad.nothrow.patch
 %patch62 -p0 -b .ooo101105.sw.reorder.boundscheck.patch
+%patch63 -p0 -b .ooo101145.vcl.safe.dpi.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4123,6 +4125,7 @@
 %changelog
 * Thu Apr 16 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-9.4
 - workaround rhbz#494817 
+- Resolves: rhbz#495840 openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
 
 * Wed Apr 15 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-9.3
 - Resolves: rhbz#495609 openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch