[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                         |    2 -
 patches/dev300/vcl-guarding-display-dpi.diff |   39 ---------------------------
 2 files changed, 41 deletions(-)

New commits:
commit 6f7251a5a54613742a78a4bc5109e6e29b603f9b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Aug 17 10:23:23 2009 +0300

    vcl-guarding-display-dpi.diff is upstream
    
    * patches/dev300/vcl-guarding-display-dpi.diff: Delete. i#101145 is
      fixed and closed.
    * patches/dev300/apply: Drop it.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 896641b..de44297 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2939,8 +2939,6 @@ svx-ooo320-backports.diff, thorsten
 slideshow-effect-rewind.diff, i#48179, thorsten
 # correctly set table row height during ppt import
 svx-ppt-tablerow-height-fix.diff, n#483951, i#100275, thorsten
-# guard against grossly invalid dpi settings (fix courtesy cmc)
-vcl-guarding-display-dpi.diff, i#101145, thorsten
 
 [ ExtensionFixes ]
 # Fix from Andre, allows to step back one animation effect
diff --git a/patches/dev300/vcl-guarding-display-dpi.diff b/patches/dev300/vcl-guarding-display-dpi.diff
deleted file mode 100644
index da7ba49..0000000
--- a/patches/dev300/vcl-guarding-display-dpi.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- vcl/unx/source/app/saldisp.cxx	(.../tags/DEV300_m46/vcl)	(Revision 271422)
-+++ vcl/unx/source/app/saldisp.cxx	(.../cws/vcl101/vcl)	(Revision 271422)
-@@ -831,24 +831,28 @@
-     int nDisplayScreens = ScreenCount( pDisp_ );
-     m_aScreens = std::vector<ScreenData>(nDisplayScreens);
- 
--    const char *value;
-+    mbExactResolution = false;
-     /*  #i15507#
-      *  Xft resolution should take precedence since
-      *  it is what modern desktops use.
-      */
--    if ((value = XGetDefault (pDisp_, "Xft", "dpi")))
-+    const char* pValStr = XGetDefault( pDisp_, "Xft", "dpi" );
-+    if( pValStr != NULL )
-     {
--        rtl::OString str (value);
--        long dpi = (long) str.toDouble();
--        aResolution_ = Pair( dpi, dpi );
--        mbExactResolution = true;
-+        const rtl::OString aValStr( pValStr );
-+        const long nDPI = (long) aValStr.toDouble();
-+        // guard against insane resolution
-+        if( (nDPI >= 50) && (nDPI <= 500) )
-+        {
-+            aResolution_ = Pair( nDPI, nDPI );
-+            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;