diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-09-07 17:41:50 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-09-07 17:51:22 +0200 |
| commit | 302963374d7d8597b6e11c3a6a537ae766656298 (patch) | |
| tree | ab4f9eb40c06f5e55f3795919b6eea5d6b73c654 | |
| parent | 455c12e06ceb729ee2d9b5a420a98a1b8fe68710 (diff) | |
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
| -rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 8dacdd8bf772..7efa8719da8a 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", |