From 1d5d8584a3bd312f58231dbc3e26684778637bb2 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Thu, 30 Aug 2012 09:51:58 +0200
Subject: shuffle #ifdefs around a bit

Change-Id: I93b7c3796acf2da0ba28d3ae61aab4e15681683f
---
 .../source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx   | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
index f25fea0e44f7..a1502e0e3f6c 100644
--- a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
@@ -469,8 +469,8 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
                                    GLWin.screen,
                                    *pAttributeTable );
 
-#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
         if( vi ) {
+#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
             if( !firstVisual )
                 firstVisual = vi;
             SAL_INFO("slideshow.opengl", "trying VisualID " << vi->visualid);
@@ -516,9 +516,7 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
                     vi = firstVisual;
                     mbHasTFPVisual = false;
                     SAL_INFO("slideshow.opengl", "did not find visual suitable for texture_from_pixmap, using " << vi->visualid);
-            }
-#else
-        if( vi ) {
+                }
 #endif
             SystemWindowData winData;
             winData.nSize = sizeof(winData);
@@ -531,10 +529,10 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
             } else {
                 delete pWindow, pWindow=NULL;
             }
-        }
 #if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
-    }
+        }
 #endif
+        }
 
         ++pAttributeTable;
     }
-- 
cgit