Re: [Libreoffice] [PATCH] Old X11 code cleanup in libs-gui

On Fri, Jul 08, 2011 at 09:03:25PM +0200, Francois Tigeot wrote:
> I'm a bit puzzled by code using what is almost a complete list of all
> platforms running X11 to define some features:
>
> We also have some code dedicated to finding the origin of different X11
> implementations and working around their bugs (grep for GetServerVendor).
>
> If nobody gives me a reason not to in the next days, I plan to remove both
> the useless #if defined list and the whole XFree section.

Patch attached.

-- 
Francois Tigeot

From f416bb49a17909a5a540ea3050a24317dae1b6d6 Mon Sep 17 00:00:00 2001
From: Francois Tigeot <ftigeot@wolfpond.org>
Date: Fri, 8 Jul 2011 23:01:55 +0200
Subject: [PATCH] Cleanup some old X11 code, remove useless tests

---
 vcl/unx/generic/app/saldisp.cxx |   28 ----------------------------
 1 files changed, 0 insertions(+), 28 deletions(-)

diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 36cd1c7..94a75c3 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -885,10 +885,7 @@ void SalDisplay::Init()
         sscanf( pProperties, "%li", &nProperties_ );
     else
     {
-#if defined DBG_UTIL || defined SUN || defined LINUX || defined FREEBSD || \
-    defined NETBSD || defined OPENBSD || defined DRAGONFLY
         nProperties_ |= PROPERTY_FEATURE_Maximize;
-#endif
         // Server Bugs & Properties
         if( GetServerVendor() == vendor_excursion )
         {
@@ -909,31 +906,6 @@ void SalDisplay::Init()
             if( otherwm == eWindowManager_ ) eWindowManager_ = mwm;
         }
         else
-        if( GetServerVendor() == vendor_xfree )
-        {
-            nProperties_ |= PROPERTY_BUG_XCopyArea_GXxor;
-#if defined LINUX || defined FREEBSD || defined NETBSD || defined OPENBSD || \
-    defined DRAGONFLY
-            // otherwm and olwm are a kind of default, which are not detected
-            // carefully. if we are running linux (i.e. not netbsd) on an xfree
-            // display, fvwm is most probable the wm to choose, confusing with mwm
-            // doesn't harm. #57791# start maximized if possible
-                    if(    (otherwm == eWindowManager_)
-                || (olwm    == eWindowManager_ ))
-            {
-                eWindowManager_ = fvwm; // ???
-                nProperties_ |= PROPERTY_FEATURE_Maximize;
-            }
-#else
-            if( otherwm == eWindowManager_ ) eWindowManager_ = winmgr;
-#endif
-#if defined SOLARIS && defined SPARC
-            nProperties_ |= PROPERTY_BUG_Bitmap_Bit_Order;
-            // solaris xlib seems to have problems with putting images
-            // in correct bit order to xfree 8 bit displays
-#endif
-        }
-        else
         if( GetServerVendor() == vendor_sun )
         {
             // nicht alle! (bekannt: nur Sparc II CG3, CG6?)
-- 
1.7.4.1