rpms/openoffice.org/F-10 openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch, NONE, 1.1 openoffice.org.spec, 1.1724, 1.1725

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	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.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1724
retrieving revision 1.1725
diff -u -r1.1724 -r1.1725
--- openoffice.org.spec	8 Apr 2009 11:41:13 -0000	1.1724
+++ openoffice.org.spec	16 Apr 2009 19:46:43 -0000	1.1725
@@ -145,6 +145,7 @@
 Patch72: openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch
 Patch73: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
 Patch74: openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch
+Patch75: openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1413,7 +1414,8 @@
 %patch71 -p0 -b .ooo99526.sw.mailmergeup.outofrange.patch
 %patch72 -p0 -b .ooo99529.sw.notrailingnewline.patch
 %patch73 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
-%patch74 -p0 -b .ooo100942.svtools.oversafeemf.patch
+%patch74 -p1 -b .ooo100942.svtools.oversafeemf.patch
+%patch75 -p1 -b .ooo101145.vcl.safe.dpi.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3782,6 +3784,7 @@
 %changelog
 * Wed Apr 08 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.4-UNRELEASED
 - Resolves: rhbz#494643 EMF polypolygons issue
+- Resolves: rhbz#495840 openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
 
 * Mon Mar 09 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.3
 - Resolves: rhbz#483223 openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch