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

[Stephan Bergmann]

 vcl/unx/generic/window/salframe.cxx |   13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

New commits:
commit 302963374d7d8597b6e11c3a6a537ae766656298
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Sep 7 17:41:50 2015 +0200

    clang-analyzer-deadcode.DeadStores
    
    ...the odd setting of iconSize (to the same value inside the if as well as
    unconditionally afterwards) was introduced in
    17a5c8210349f9cd1943d0910fa281c6eac92701 "INTEGRATION: CWS vcl10: #109868# don't
    use ridiculously large icon sizes," together with the olwm comment, and olwm-
    specific code further down below that was removed again with
    b118d56c0b50d00822bdc2080e936709660edcc5 "Remove Olwm support and Windowmaker
    gravity handling;" so effectively revert the code to the state before
    17a5c8210349f9cd1943d0910fa281c6eac92701
    
    Change-Id: Ic68f6b5b44f48292a7a6983935427e529d8a5002

diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 8dacdd8..7efa871 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -1003,25 +1003,14 @@ void X11SalFrame::SetIcon( sal_uInt16 nIcon )
             fprintf(stderr, "X11SalFrame::SetIcon(): found %d IconSizes:\n", nSizes);
 #endif
 
-            const int ourLargestIconSize = 48;
-
             int i;
             for( i=0; i<nSizes; i++)
             {
                // select largest supported icon
-
-               // Note: olwm/olvwm reports a huge max icon size of
-               // 160x160 pixels; always choosing the max as the
-               // preferred icon size is apparently wrong under olvwm
-               // - so we keep the safe default |iconSize| when we see
-               // unreasonable large max icon sizes (> twice of our
-               // largest available icon) reported by XGetIconSizes.
-                if( pIconSize[i].max_width > iconSize
-                    && pIconSize[i].max_width <= 2*ourLargestIconSize )
+                if( pIconSize[i].max_width > iconSize )
                 {
                     iconSize = pIconSize[i].max_width;
                 }
-                iconSize = pIconSize[i].max_width;
 
 #if OSL_DEBUG_LEVEL > 1
                 fprintf(stderr, "min: %d, %d\nmax: %d, %d\ninc: %d, %d\n\n",