[Libreoffice-commits] core.git: vcl/Library_vclplug_gen.mk vcl/unx

[Riccardo Magliocchetti]

 vcl/Library_vclplug_gen.mk      |    7 -------
 vcl/unx/generic/app/saldisp.cxx |   33 +--------------------------------
 2 files changed, 1 insertion(+), 39 deletions(-)

New commits:
commit 4a2280e4a2bbc936625dc9816e5491da6ba770ac
Author: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date:   Mon Aug 4 15:52:16 2014 +0200

    Kill XSUN Xinerama support
    
    XSun is a relic from Solaris 10 / SPARC.
    
    Change-Id: I5c379a496ee5953d71fe51b86cf9992c92943126
    Reviewed-on: https://gerrit.libreoffice.org/10756
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 2390020..c3f00aa 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -116,8 +116,6 @@ endif
 
 ## handle Xinerama
 ifneq ($(USE_XINERAMA),)
-ifneq ($(OS)$(USE_XINERAMA_VERSION),SOLARISXsun)
-# not Solaris/Xsun
 $(eval $(call gb_Library_add_defs,vclplug_gen,\
     -DUSE_XINERAMA_XORG \
 ))
@@ -130,11 +128,6 @@ $(eval $(call gb_Library_add_libs,vclplug_gen,\
     -Wl$(COMMA)-Bstatic -lXinerama -Wl$(COMMA)-Bdynamic \
 ))
 endif
-else # Solaris/Xsun
-$(eval $(call gb_Library_add_defs,vclplug_gen,\
-    -DUSE_XINERAMA_XSUN \
-))
-endif
 endif # USE_XINERAMA
 
 ifeq ($(OS),LINUX)
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 73c7b1f..91c5706 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -44,14 +44,6 @@
 
 #ifdef USE_XINERAMA_XORG
 #include <X11/extensions/Xinerama.h>
-#elif defined USE_XINERAMA_XSUN
-#if defined(SOLARIS) && defined(INTEL) // missing extension header in standard installation
-#define MAXFRAMEBUFFERS       16
-Bool XineramaGetState(Display*, int);
-Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*);
-#else
-#include <X11/extensions/xinerama.h>
-#endif
 #endif
 
 #include <postx.h>
@@ -2228,30 +2220,7 @@ void SalDisplay::InitXinerama()
         m_bXinerama = false;
         return; // multiple screens mean no xinerama
     }
-#if defined(USE_XINERAMA_XSUN)
-    int nFramebuffers = 1;
-    if( XineramaGetState( pDisp_, m_nDefaultScreen ) )
-    {
-        XRectangle pFramebuffers[MAXFRAMEBUFFERS];
-        unsigned char hints[MAXFRAMEBUFFERS];
-        int result = XineramaGetInfo( pDisp_,
-                                      m_nDefaultScreen,
-                                      pFramebuffers,
-                                      hints,
-                                      &nFramebuffers );
-        if( result > 0 && nFramebuffers > 1 )
-        {
-            m_bXinerama = true;
-            m_aXineramaScreens = std::vector<Rectangle>();
-            m_aXineramaScreenIndexMap = std::vector<int>(nFramebuffers);
-            for( int i = 0; i < nFramebuffers; i++ )
-                addXineramaScreenUnique( i, pFramebuffers[i].x,
-                                         pFramebuffers[i].y,
-                                         pFramebuffers[i].width,
-                                         pFramebuffers[i].height );
-        }
-    }
-#elif defined(USE_XINERAMA_XORG)
+#if defined(USE_XINERAMA_XORG)
     if( XineramaIsActive( pDisp_ ) )
     {
         int nFramebuffers = 1;